You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2020/02/09 14:46:38 UTC
[celix] 01/01: Updates mainly travis config to support building on
Ubuntu 18
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/#121_update_travis
in repository https://gitbox.apache.org/repos/asf/celix.git
commit e95e0057430eff9cec3753ab223a19165cba9116
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Sun Feb 9 15:45:48 2020 +0100
Updates mainly travis config to support building on Ubuntu 18
- Linking for celix container/docker is also updated to that libraries
are always linked and not only when used. Note that most library
will be used by bundles instead of the executable, so this as-needed
linking option does not for Celix container/docker.
---
.travis.yml | 60 +++++++++++++-----------------
CMakeLists.txt | 2 +
cmake/cmake_celix/BundlePackaging.cmake | 8 ++--
cmake/cmake_celix/ContainerPackaging.cmake | 5 +++
cmake/cmake_celix/DockerPackaging.cmake | 5 +++
libs/framework/CMakeLists.txt | 2 +-
6 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8936920..2980ab1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,19 +19,31 @@ env:
matrix:
include:
- os: linux
- dist: trusty
+ dist: bionic
compiler: gcc
+ name: "Ubuntu Bionic (18) gcc"
- os: linux
- dist: trusty
+ dist: bionic
compiler: clang
+ name: "Ubuntu Bionic (18) clang"
- os: osx
osx_image: xcode10.2
compiler: clang
env: MACOSX_DEPLOYMENT_TARGET=10.14
+ name: "OSX (10.14) clang"
- os: linux
- dist: trusty
+ dist: bionic
compiler: gcc
env: SANITIZE=1
+ name: "Ubuntu Bionic (18) gcc; address sanitizer"
+ - os: linux
+ dist: bionic
+ compiler: gcc
+ env:
+ - USE_ZIP_INSTEAD_OF_JAR=1
+ - ONLY_V3_API=1
+ name: "Ubuntu Bionic (18) gcc; only v3 api"
+
#DISABLED ANDROID BUILD
# - os: linux
@@ -41,27 +53,10 @@ matrix:
#services: docker
before_install:
- - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt-get -qq update && sudo apt-get install -y uuid-dev libxml2-dev lcov libffi-dev gcc-4.8 g++-4.8; fi
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi zeromq czmq openssl && brew link --force libffi; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then sudo apt-get -qq update && sudo apt-get install -y build-essential cmake libcurl4-openssl-dev uuid-dev libxml2-dev lcov libffi-dev libczmq-dev libcpputest-dev libjansson-dev; fi
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi zeromq czmq openssl jansson cpputest && brew link --force libffi; fi
before_script:
- - wget https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz -O /tmp/cpputest.tar.gz
- - tar -xzvf /tmp/cpputest.tar.gz -C /tmp
- - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install && cd -
- - cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install && cd -
- - wget https://github.com/zeromq/libzmq/releases/download/v4.3.1/zeromq-4.3.1.tar.gz -O /tmp/zeromq.tar.gz
- - tar -xzvf /tmp/zeromq.tar.gz -C /tmp && cd /tmp/zeromq-* && mkdir build && cd build
- - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_CURVE=ON .. && make && sudo make install; fi
- - cd $TRAVIS_BUILD_DIR
- - wget https://github.com/zeromq/czmq/releases/download/v4.2.0/czmq-4.2.0.tar.gz -O /tmp/czmq.tar.gz
- - tar -xzvf /tmp/czmq.tar.gz -C /tmp && cd /tmp/czmq-* && mkdir build && cd build
- - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && make && sudo make install; fi
- - cd $TRAVIS_BUILD_DIR
- - git clone https://github.com/akheron/jansson.git jansson-build
- - cd jansson-build && git checkout 2.7
- - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local . && make
- - sudo make install
- - cd -
- mkdir build install
- export BUILD_OPTIONS=" \
-DBUILD_REMOTE_SERVICE_ADMIN=ON \
@@ -89,20 +84,17 @@ before_script:
-DBUILD_PUBSUB=OFF \
-DBUILD_PUBSUB_PSA_ZMQ=OFF \
-DBUILD_RSA_DISCOVERY_SHM=OFF "
- - export BUILD_OPTIONS_SANITIZE=" -DENABLE_ADDRESS_SANITIZER=ON"
script:
- #- if [ "$SANITIZE" == 1 ]; then export CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 CFLAGS="-lasan -fsanitize=address" CXXFLAGS="-lasan -fsanitize=address" ASAN_OPTIONS="symbolize=1" ASAN_SYMBOLIZER_PATH="/usr/local/clang-3.4/bin/llvm-symbolizer"; fi
- - if [ "$SANITIZE" == 1 ]; then export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_SANITIZE}"; fi
- # the following setup is broken:
- # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see CELIX-277)
- # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
- - cd build
- - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi
- - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
- - if [ -z "$ANDROID" ]; then make all && make deploy && sudo make install; else cd .. && docker build -t celixandroid - < misc/Dockerfile.Android ; fi
- - if [ -z "$ANDROID" ]; then export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi && make test ARGS="-V"; else docker run celixandroid; fi
+ - if [ "$SANITIZE" == 1 ]; then export BUILD_OPTIONS="${BUILD_OPTIONS} DENABLE_ADDRESS_SANITIZER=ON"; fi
+ - if [ "$USE_ZIP_INSTEAD_OF_JAR" == 1 ]; then export BUILD_OPTIONS="${BUILD_OPTIONS} -DDCELIX_USE_ZIP_INSTEAD_OF_JAR=ON"; fi
+ - if [ "$ONLY_V3_API" == 1 ]; then export BUILD_OPTIONS="${BUILD_OPTIONS} -DCELIX_ADD_DEPRECATED_API=OFF"; fi
+ - cd build
+ - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
+ - if [ -z "$ANDROID" ]; then make all && make deploy && sudo make install; else cd .. && docker build -t celixandroid - < misc/Dockerfile.Android ; fi
+ - if [ -z "$ANDROID" ]; then export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi && make test ARGS="-V"; else docker run celixandroid; fi
after_success:
- if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d96f25..d742a15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,8 @@ if (CELIX_ADD_OPENSSL_DEP)
set(CELIX_OPTIONAL_EXTRA_LIBS "OpenSSL::lib")
endif ()
+option(CELIX_USE_ZIP_INSTEAD_OF_JAR "Default Celix cmake command will use jar to package bundle (if found). This option enforces Celix to use zip instead." OFF)
+
#Libraries and Launcher
add_subdirectory(libs)
diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake
index fe477be..a1b2c5b 100644
--- a/cmake/cmake_celix/BundlePackaging.cmake
+++ b/cmake/cmake_celix/BundlePackaging.cmake
@@ -17,7 +17,7 @@
find_program(JAR_COMMAND jar NO_CMAKE_FIND_ROOT_PATH)
-if(JAR_COMMAND)
+if(JAR_COMMAND AND NOT CELIX_USE_ZIP_INSTEAD_OF_JAR)
message(STATUS "Using jar to create bundles")
else()
find_program(ZIP_COMMAND zip NO_CMAKE_FIND_ROOT_PATH)
@@ -257,15 +257,13 @@ function(add_celix_bundle)
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
elseif(ZIP_COMMAND)
- add_custom_command(OUTPUT ${BUNDLE_CONTENT_DIR}
- COMMAND ${CMAKE_COMMAND} -E make_directory ${BUNDLE_CONTENT_DIR}
- )
+ file(MAKE_DIRECTORY ${BUNDLE_CONTENT_DIR})
add_custom_command(OUTPUT ${BUNDLE_FILE}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BUNDLE_GEN_DIR}/MANIFEST.MF META-INF/MANIFEST.MF
COMMAND ${ZIP_COMMAND} -rq ${BUNDLE_FILE} *
COMMENT "Packaging ${BUNDLE_TARGET_NAME}"
- DEPENDS ${BUNDLE_CONTENT_DIR} ${BUNDLE_TARGET_NAME} "$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_DEPEND_TARGETS>" ${BUNDLE_GEN_DIR}/MANIFEST.MF
+ DEPENDS ${BUNDLE_TARGET_NAME} "$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_DEPEND_TARGETS>" ${BUNDLE_GEN_DIR}/MANIFEST.MF
WORKING_DIRECTORY ${BUNDLE_CONTENT_DIR}
)
else()
diff --git a/cmake/cmake_celix/ContainerPackaging.cmake b/cmake/cmake_celix/ContainerPackaging.cmake
index 41d8e1e..27fa7bc 100644
--- a/cmake/cmake_celix/ContainerPackaging.cmake
+++ b/cmake/cmake_celix/ContainerPackaging.cmake
@@ -199,6 +199,11 @@ $<JOIN:$<TARGET_PROPERTY:${CONTAINER_TARGET},CONTAINER_EMBEDDED_PROPERTIES>,\\n\
set_target_properties(${CONTAINER_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CONTAINER_LOC})
set_target_properties(${CONTAINER_TARGET} PROPERTIES OUTPUT_NAME ${CONTAINER_NAME})
target_link_libraries(${CONTAINER_TARGET} PRIVATE Celix::framework)
+ if(NOT APPLE)
+ #Add --no-as-needed options, to ensure that libraries are always linked.
+ #This is needed because most libraries are not used by the executable, but by the bundle libraries instead.
+ set_target_properties(${CONTAINER_TARGET} PROPERTIES LINK_FLAGS -Wl,--no-as-needed)
+ endif()
set(LAUNCHER "$<TARGET_FILE:${CONTAINER_TARGET}>")
else ()
#LAUNCHER already set
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index 5aa2d1f..d51310c 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -207,6 +207,11 @@ $<JOIN:$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_EMBEDDED_PROPERTIES>,\\n\\
add_executable(${DOCKER_TARGET} EXCLUDE_FROM_ALL ${LAUNCHER_SRC})
target_link_libraries(${DOCKER_TARGET} PRIVATE Celix::framework)
+ if(NOT APPLE)
+ #Add --no-as-needed options, to ensure that libraries are always linked.
+ #This is needed because most libraries are not used by the executable, but by the bundle libraries instead.
+ set_target_properties(${DOCKER_TARGET} PROPERTIES LINK_FLAGS -Wl,--no-as-needed)
+ endif()
set(LAUNCHER "$<TARGET_FILE:${DOCKER_TARGET}>")
set(DOCKER_ENTRYPOINT "ENTRYPOINT [\"/bin/$<TARGET_FILE_NAME:${DOCKER_TARGET}>\"]")
endif ()
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index 04e726e..1649173 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -41,7 +41,7 @@ target_include_directories(framework PUBLIC
target_compile_options(framework PRIVATE -DUSE_FILE32API)
set_target_properties(framework PROPERTIES "SOVERSION" 2)
-target_link_libraries(framework PUBLIC Celix::utils ${CELIX_OPTIONAL_EXTRA_LIBS})
+target_link_libraries(framework PUBLIC Celix::utils Celix::dfi ${CELIX_OPTIONAL_EXTRA_LIBS})
target_link_libraries(framework PUBLIC UUID::lib CURL::libcurl ZLIB::ZLIB)
install(TARGETS framework EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT framework)