This is an automated email from the ASF dual-hosted git repository. aldrin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit fa14ea18f74535a75c3e3d5c77340fec5f7813e1 Author: Marc Parisi <[email protected]> AuthorDate: Fri Mar 8 11:05:44 2019 -0500 MINIFICPP-759: Enable CoAP by default MINIFICPP-759: Make sure dependencies are installed for each distro MINIFICPP-759: fix targets for some travis platforms MINIFICPP-759: update aptitude scripts This closes #504. Signed-off-by: Aldrin Piri <[email protected]> --- aptitude.sh | 6 ++++++ bootstrap.sh | 2 +- darwin.sh | 1 + debian.sh | 2 ++ extensions/coap/CMakeLists.txt | 9 ++------- fedora.sh | 9 +++++---- rheldistro.sh | 6 ++++++ suse.sh | 6 ++++++ 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/aptitude.sh b/aptitude.sh index 061ea00..e5969da 100644 --- a/aptitude.sh +++ b/aptitude.sh @@ -59,6 +59,12 @@ build_deps(){ INSTALLED+=("bison") elif [ "$FOUND_VALUE" = "flex" ]; then INSTALLED+=("flex") + elif [ "$FOUND_VALUE" = "automake" ]; then + INSTALLED+=("automake") + elif [ "$FOUND_VALUE" = "autoconf" ]; then + INSTALLED+=("autoconf") + elif [ "$FOUND_VALUE" = "libtool" ]; then + INSTALLED+=("libtool") elif [ "$FOUND_VALUE" = "python" ]; then INSTALLED+=("libpython3-dev") elif [ "$FOUND_VALUE" = "lua" ]; then diff --git a/bootstrap.sh b/bootstrap.sh index 2a0ef15..4f78721 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -271,7 +271,7 @@ add_disabled_option MQTT_ENABLED ${FALSE} "ENABLE_MQTT" add_disabled_option PYTHON_ENABLED ${FALSE} "ENABLE_PYTHON" add_dependency PYTHON_ENABLED "python" -add_disabled_option COAP_ENABLED ${FALSE} "ENABLE_COAP" +add_disabled_option COAP_ENABLED ${TRUE} "ENABLE_COAP" add_dependency COAP_ENABLED "automake" add_dependency COAP_ENABLED "autoconf" add_dependency COAP_ENABLED "libtool" diff --git a/darwin.sh b/darwin.sh index d7d574a..086a105 100644 --- a/darwin.sh +++ b/darwin.sh @@ -106,6 +106,7 @@ build_deps(){ INSTALLED+=("libtool") elif [ "$FOUND_VALUE" = "automake" ]; then INSTALLED+=("automake") + INSTALLED+=("autoconf") elif [ "$FOUND_VALUE" = "gpsd" ]; then INSTALLED+=("gpsd") elif [ "$FOUND_VALUE" = "libarchive" ]; then diff --git a/debian.sh b/debian.sh index 170d822..12ba3a9 100644 --- a/debian.sh +++ b/debian.sh @@ -65,6 +65,8 @@ build_deps(){ INSTALLED+=("bison") elif [ "$FOUND_VALUE" = "flex" ]; then INSTALLED+=("flex") + elif [ "$FOUND_VALUE" = "libtool" ]; then + INSTALLED+=("libtool") elif [ "$FOUND_VALUE" = "python" ]; then INSTALLED+=("libpython3-dev") elif [ "$FOUND_VALUE" = "lua" ]; then diff --git a/extensions/coap/CMakeLists.txt b/extensions/coap/CMakeLists.txt index 1f0d03e..5a5c642 100644 --- a/extensions/coap/CMakeLists.txt +++ b/extensions/coap/CMakeLists.txt @@ -35,11 +35,7 @@ endif() set(BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}/extensions/coap") # determine version of GNUTLSs - if (APPLE) set(BYPRODUCT "${BASE_DIR}/extensions/coap/thirdparty/libcoap-src/.libs/libcoap-2.a") - else() - set(BYPRODUCT "${BASE_DIR}/extensions/coap/thirdparty/libcoap-src/.libs/libcoap-2.a") - endif() set(DIR "${BASE_DIR}/extensions/coap/thirdparty/libcoap-src") ExternalProject_Add( coap-external @@ -51,15 +47,14 @@ endif() BUILD_COMMAND make CMAKE_COMMAND "" UPDATE_COMMAND "" - BUILD_BYPRODUCTS ${BYPRODUCT} INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Skipping install step." CONFIGURE_COMMAND "" - PATCH_COMMAND ./autogen.sh && ./configure --disable-examples --disable-tests --disable-documentation + PATCH_COMMAND ./autogen.sh && ./configure --disable-examples --disable-dtls --disable-tests --disable-documentation STEP_TARGETS build EXCLUDE_FROM_ALL TRUE ) add_definitions("-DWITH_POSIX=1") - + add_library(coaplib STATIC IMPORTED) set_target_properties(coaplib PROPERTIES IMPORTED_LOCATION "${BYPRODUCT}") add_dependencies(coaplib coap-external) diff --git a/fedora.sh b/fedora.sh index 3e24730..b06a409 100644 --- a/fedora.sh +++ b/fedora.sh @@ -68,9 +68,12 @@ build_deps(){ INSTALLED+=("python3-devel") elif [ "$FOUND_VALUE" = "lua" ]; then INSTALLED+=("lua-devel") - elif [ "$FOUND_VALUE" = "automake" ]; then + elif [ "$FOUND_VALUE" = "libtool" ]; then + INSTALLED+=("libtool") + elif [ "$FOUND_VALUE" = "autoconf" ]; then INSTALLED+=("autoconf") - INSTALLED+=("automake") + elif [ "$FOUND_VALUE" = "automake" ]; then + INSTALLED+=("automake") elif [ "$FOUND_VALUE" = "gpsd" ]; then INSTALLED+=("gpsd-devel") elif [ "$FOUND_VALUE" = "libarchive" ]; then @@ -82,8 +85,6 @@ build_deps(){ fi done - INSTALLED+=("autoconf") - for option in "${INSTALLED[@]}" ; do COMMAND="${COMMAND} $option" done diff --git a/rheldistro.sh b/rheldistro.sh index 93ab352..79d6473 100644 --- a/rheldistro.sh +++ b/rheldistro.sh @@ -106,6 +106,12 @@ build_deps(){ install_bison elif [ "$FOUND_VALUE" = "flex" ]; then INSTALLED+=("flex") + elif [ "$FOUND_VALUE" = "automake" ]; then + INSTALLED+=("automake") + elif [ "$FOUND_VALUE" = "autoconf" ]; then + INSTALLED+=("autoconf") + elif [ "$FOUND_VALUE" = "libtool" ]; then + INSTALLED+=("libtool") elif [ "$FOUND_VALUE" = "python" ]; then INSTALLED+=("python34-devel") elif [ "$FOUND_VALUE" = "lua" ]; then diff --git a/suse.sh b/suse.sh index 7a40bd5..a0e827e 100644 --- a/suse.sh +++ b/suse.sh @@ -97,6 +97,12 @@ build_deps(){ install_bison elif [ "$FOUND_VALUE" = "flex" ]; then INSTALLED+=("flex") + elif [ "$FOUND_VALUE" = "automake" ]; then + INSTALLED+=("automake") + elif [ "$FOUND_VALUE" = "autoconf" ]; then + INSTALLED+=("autoconf") + elif [ "$FOUND_VALUE" = "libtool" ]; then + INSTALLED+=("libtool") elif [ "$FOUND_VALUE" = "python" ]; then INSTALLED+=("python3-devel") elif [ "$FOUND_VALUE" = "lua" ]; then
