From 52b579ae3c28d7f2b53700c69705c387ea0e8169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Sat, 21 Oct 2017 15:13:56 +0200 Subject: [PATCH 1/5] Finalize removal of liblog4cxx dependency --- README.md | 1 - src/tnlp.hh | 3 --- src/tnlp.hxx | 4 ---- tests/shared-tests | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 530216e..4016cdd 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,5 @@ Available packages [Eigen]: http://eigen.tuxfamily.org/ [Git]: http://git-scm.com/ [Libtool]: https://www.gnu.org/software/libtool/ -[log4cxx]: https://logging.apache.org/log4cxx/ [pkg-config]: http://www.freedesktop.org/wiki/Software/pkg-config/ [RobotPkg]: http://robotpkg.openrobots.org/ diff --git a/src/tnlp.hh b/src/tnlp.hh index 72be185..f42b671 100644 --- a/src/tnlp.hh +++ b/src/tnlp.hh @@ -136,9 +136,6 @@ namespace roboptim Number obj_factor, const Number* lambda); - /// \brief Pointer to function logger (see log4cxx documentation). - static log4cxx::LoggerPtr logger; - private: /// \brief Non-linear function type. /// diff --git a/src/tnlp.hxx b/src/tnlp.hxx index 38ed707..5446d2c 100644 --- a/src/tnlp.hxx +++ b/src/tnlp.hxx @@ -41,10 +41,6 @@ namespace roboptim namespace detail { - template - log4cxx::LoggerPtr Tnlp::logger - (log4cxx::Logger::getLogger ("roboptim.ipopt")); - /// \internal #ifdef ROBOPTIM_CORE_IPOPT_PLUGIN_CHECK_GRADIENT template diff --git a/tests/shared-tests b/tests/shared-tests index 37d1bac..bc512d2 160000 --- a/tests/shared-tests +++ b/tests/shared-tests @@ -1 +1 @@ -Subproject commit 37d1bac588c7a9e265c27b98aaa041e95e8556b1 +Subproject commit bc512d24ceccfd43f0834016e97a6bf6972ae734 From c5f3ece89c2d88e2306b1ee8815bc42c3357e351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Sat, 21 Oct 2017 15:14:52 +0200 Subject: [PATCH 2/5] [travis] Synchronize --- .travis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis b/.travis index f13ddca..bad6dbd 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit f13ddca9ee0cf0be480ad41333415c86063cf38d +Subproject commit bad6dbd29cf70e852e5e427e876390d954ca7d6b From 8b778508f5e370552ecc4618fc0fedd5171fe78d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Sat, 21 Oct 2017 15:14:58 +0200 Subject: [PATCH 3/5] [cmake] Synchronize --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 54177e4..d869404 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 54177e44a1440222184865f1449c40b708eeaaa4 +Subproject commit d8694045bd7da779d2360c950404c6583174b40a From fdc20ea4ebc513b1fcf6e7f30cf939f5b0fa21ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Sat, 21 Oct 2017 16:24:12 +0200 Subject: [PATCH 4/5] [ci] Avoid bug with OSX build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2cb35db..e18b0f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,8 @@ after_success: - codecov --gcov-root=/tmp/_ci/build after_failure: ./.travis/run after_failure before_install: + # Avoid bug on CI with OSX, see https://github.com/travis-ci/travis-ci/issues/8552 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - pip install --user codecov - ./.travis/dependencies/eigen-${EIGEN_MAJOR} - ./.travis/run before_install From 4466b724824367d3efb1d3e181ff60e59b514af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Sat, 21 Oct 2017 16:54:21 +0200 Subject: [PATCH 5/5] [ci] Add appveyor.yml (WIP) --- appveyor.yml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..161bd8a --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,56 @@ +version: 3.2-{branch}-{build} +branches: + only: + - master + - dev + +configuration: +- Debug + +platform: +- x64 + +# Disable automatic builds for now +build: off + +os: Visual Studio 2015 +clone_folder: C:\devel-src\roboptim-core-plugin-ipopt +environment: + CI_OS_NAME: win32 + CI_TOOL: appveyor +# Dependencies should be a list of dependencies separated by spaces + CHOCO_DEPENDENCIES: "doxygen.portable" + GIT_DEPENDENCIES: "gergondet/ltdl-win32 roboptim/roboptim-core" +# Should be the same as clone_folder + PROJECT_SOURCE_DIR: C:\devel-src\roboptim-core-plugin-ipopt +# Do not tinker with the variables below unless you know what you are doing + SOURCE_FOLDER: C:\devel-src + CMAKE_INSTALL_PREFIX: C:/devel + PATH: C:/devel/bin;C:\Libraries\boost_1_60_0\lib64-msvc-14.0;C:\msys64\mingw64\bin;%PATH% + PKG_CONFIG_PATH: C:/devel/lib/pkgconfig + BOOST_ROOT: C:\Libraries\boost_1_60_0 + BOOST_LIBRARYDIR: C:\Libraries\boost_1_60_0\lib64-msvc-14.0 + MINGW_GFORTRAN: C:\msys64\mingw64\bin\gfortran.exe +# N.B: empty lines here and in test_script are VERY important +build_script: +- ps: >- + Set-PSDebug -Trace 2 + + iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aescande/testAppveyor/master/installAsAppveyorDependency.ps1')) + + git submodule update --init --recursive + + . ./.travis/functions.ps1 + + setup_build + + ./.travis/dependencies/eigen-3.2.ps1 + + install_dependencies + + build_project +test_script: +- cmd: >- + cd %PROJECT_SOURCE_DIR%/build + + ctest --build-config %CONFIGURATION% --exclude-regex example