Skip to content

Commit d5c597d

Browse files
authored
Merge pull request #38 from bchretien/feat/log4cxx-removal
Finalize removal of liblog4cxx dependency
2 parents 2e04f69 + 4466b72 commit d5c597d

File tree

8 files changed

+61
-11
lines changed

8 files changed

+61
-11
lines changed

.travis

Submodule .travis updated 1 file

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ after_success:
3636
- codecov --gcov-root=/tmp/_ci/build
3737
after_failure: ./.travis/run after_failure
3838
before_install:
39+
# Avoid bug on CI with OSX, see https://github.com/travis-ci/travis-ci/issues/8552
40+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
3941
- pip install --user codecov
4042
- ./.travis/dependencies/eigen-${EIGEN_MAJOR}
4143
- ./.travis/run before_install

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,5 @@ Available packages
7777
[Eigen]: http://eigen.tuxfamily.org/
7878
[Git]: http://git-scm.com/
7979
[Libtool]: https://www.gnu.org/software/libtool/
80-
[log4cxx]: https://logging.apache.org/log4cxx/
8180
[pkg-config]: http://www.freedesktop.org/wiki/Software/pkg-config/
8281
[RobotPkg]: http://robotpkg.openrobots.org/

appveyor.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
version: 3.2-{branch}-{build}
2+
branches:
3+
only:
4+
- master
5+
- dev
6+
7+
configuration:
8+
- Debug
9+
10+
platform:
11+
- x64
12+
13+
# Disable automatic builds for now
14+
build: off
15+
16+
os: Visual Studio 2015
17+
clone_folder: C:\devel-src\roboptim-core-plugin-ipopt
18+
environment:
19+
CI_OS_NAME: win32
20+
CI_TOOL: appveyor
21+
# Dependencies should be a list of dependencies separated by spaces
22+
CHOCO_DEPENDENCIES: "doxygen.portable"
23+
GIT_DEPENDENCIES: "gergondet/ltdl-win32 roboptim/roboptim-core"
24+
# Should be the same as clone_folder
25+
PROJECT_SOURCE_DIR: C:\devel-src\roboptim-core-plugin-ipopt
26+
# Do not tinker with the variables below unless you know what you are doing
27+
SOURCE_FOLDER: C:\devel-src
28+
CMAKE_INSTALL_PREFIX: C:/devel
29+
PATH: C:/devel/bin;C:\Libraries\boost_1_60_0\lib64-msvc-14.0;C:\msys64\mingw64\bin;%PATH%
30+
PKG_CONFIG_PATH: C:/devel/lib/pkgconfig
31+
BOOST_ROOT: C:\Libraries\boost_1_60_0
32+
BOOST_LIBRARYDIR: C:\Libraries\boost_1_60_0\lib64-msvc-14.0
33+
MINGW_GFORTRAN: C:\msys64\mingw64\bin\gfortran.exe
34+
# N.B: empty lines here and in test_script are VERY important
35+
build_script:
36+
- ps: >-
37+
Set-PSDebug -Trace 2
38+
39+
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aescande/testAppveyor/master/installAsAppveyorDependency.ps1'))
40+
41+
git submodule update --init --recursive
42+
43+
. ./.travis/functions.ps1
44+
45+
setup_build
46+
47+
./.travis/dependencies/eigen-3.2.ps1
48+
49+
install_dependencies
50+
51+
build_project
52+
test_script:
53+
- cmd: >-
54+
cd %PROJECT_SOURCE_DIR%/build
55+
56+
ctest --build-config %CONFIGURATION% --exclude-regex example

src/tnlp.hh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ namespace roboptim
136136
Number obj_factor,
137137
const Number* lambda);
138138

139-
/// \brief Pointer to function logger (see log4cxx documentation).
140-
static log4cxx::LoggerPtr logger;
141-
142139
private:
143140
/// \brief Non-linear function type.
144141
///

src/tnlp.hxx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ namespace roboptim
4141

4242
namespace detail
4343
{
44-
template <typename T>
45-
log4cxx::LoggerPtr Tnlp<T>::logger
46-
(log4cxx::Logger::getLogger ("roboptim.ipopt"));
47-
4844
/// \internal
4945
#ifdef ROBOPTIM_CORE_IPOPT_PLUGIN_CHECK_GRADIENT
5046
template <typename T, typename F>

tests/shared-tests

Submodule shared-tests updated 2 files

0 commit comments

Comments
 (0)