From c75d76545c10ca9e2c470439462e53497095951f Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Wed, 31 Jul 2019 08:43:06 -0400 Subject: [PATCH] [#23] build with latest cmake/clang/boost/qpid-proton, moved to qpid-cpp --- Makefile | 20 ++++++++++---------- build.py | 6 +++--- versions.json | 35 +++++++++++++++++------------------ 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 5a59bc8..0c91b21 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all : autoconf avro aws-sdk-cpp boost catch2 clang clang-runtime cmake cppzmq cpython imagemagick jansson json libarchive libs3 qpid qpid-proton qpid-with-proton redis spdlog zeromq4-1 +all : autoconf avro aws-sdk-cpp boost catch2 clang clang-runtime cmake cppzmq cpython imagemagick jansson json libarchive libs3 qpid-cpp qpid-proton qpid-with-proton redis spdlog zeromq4-1 server : avro boost catch2 clang-runtime cppzmq json libarchive spdlog zeromq4-1 @@ -133,13 +133,13 @@ libs3_clean : @rm -rf libs3* @rm -rf $(LIBS3_PACKAGE) -$(QPID_PACKAGE) : $(CLANG_PACKAGE) $(BOOST_PACKAGE) $(QPID-PROTON_PACKAGE) - ./build.py $(VERBOSITY) qpid > qpid.log 2>&1 -qpid : $(QPID_PACKAGE) -qpid_clean : - @echo "Cleaning qpid..." - @rm -rf qpid* - @rm -rf $(QPID_PACKAGE) +$(QPID-CPP_PACKAGE) : $(CLANG_PACKAGE) $(BOOST_PACKAGE) $(QPID-PROTON_PACKAGE) + ./build.py $(VERBOSITY) qpid-cpp > qpid-cpp.log 2>&1 +qpid-cpp : $(QPID-CPP_PACKAGE) +qpid-cpp_clean : + @echo "Cleaning qpid-cpp..." + @rm -rf qpid-cpp* + @rm -rf $(QPID-CPP_PACKAGE) $(QPID-PROTON_PACKAGE) : $(CLANG_PACKAGE) ./build.py $(VERBOSITY) qpid-proton > qpid-proton.log 2>&1 @@ -149,7 +149,7 @@ qpid-proton_clean : @rm -rf qpid-proton* @rm -rf $(QPID-PROTON_PACKAGE) -$(QPID-WITH-PROTON_PACKAGE) : $(QPID_PACKAGE) +$(QPID-WITH-PROTON_PACKAGE) : $(QPID-CPP_PACKAGE) ./build.py $(VERBOSITY) qpid-with-proton > qpid-with-proton.log 2>&1 qpid-with-proton : $(QPID-WITH-PROTON_PACKAGE) qpid-with-proton_clean : @@ -181,7 +181,7 @@ zeromq4-1_clean : @rm -rf zeromq4-1* @rm -rf $(ZEROMQ4-1_PACKAGE) -clean : autoconf_clean avro_clean aws-sdk-cpp_clean boost_clean catch2_clean clang_clean clang-runtime_clean cmake_clean cppzmq_clean cpython_clean imagemagick_clean jansson_clean json_clean libarchive_clean libs3_clean qpid_clean redis_clean spdlog_clean zeromq4-1_clean +clean : autoconf_clean avro_clean aws-sdk-cpp_clean boost_clean catch2_clean clang_clean clang-runtime_clean cmake_clean cppzmq_clean cpython_clean imagemagick_clean jansson_clean json_clean libarchive_clean libs3_clean qpid-cpp_clean qpid-proton_clean qpid-with-proton_clean redis_clean spdlog_clean zeromq4-1_clean @echo "Cleaning generated files..." @rm -rf packages.mk @echo "Done." diff --git a/build.py b/build.py index ec7ba44..d9a4b8a 100755 --- a/build.py +++ b/build.py @@ -170,8 +170,8 @@ def build_package(target): clang_runtime_install_prefix = os.path.join(clang_info['externals_root'], clang_runtime_subdirectory) clang_runtime_rpath = os.path.join(clang_runtime_install_prefix, 'lib') - qpid_info = get_versions()['qpid'] - qpid_subdirectory = '{0}{1}-{2}'.format('qpid', qpid_info['version_string'], qpid_info['consortium_build_number']) + qpidcpp_info = get_versions()['qpid-cpp'] + qpidcpp_subdirectory = '{0}{1}-{2}'.format('qpid-cpp', qpidcpp_info['version_string'], qpidcpp_info['consortium_build_number']) qpidproton_info = get_versions()['qpid-proton'] qpidproton_subdirectory = '{0}{1}-{2}'.format('qpid-proton', qpidproton_info['version_string'], qpidproton_info['consortium_build_number']) @@ -250,7 +250,7 @@ def build_package(target): i = re.sub("TEMPLATE_CLANG_EXECUTABLE", clang_executable, i) i = re.sub("TEMPLATE_CLANG_RUNTIME_RPATH", clang_runtime_rpath, i) i = re.sub("TEMPLATE_CMAKE_EXECUTABLE", cmake_executable, i) - i = re.sub("TEMPLATE_QPID_SUBDIRECTORY", qpid_subdirectory, i) + i = re.sub("TEMPLATE_QPID-CPP_SUBDIRECTORY", qpidcpp_subdirectory, i) i = re.sub("TEMPLATE_QPID-PROTON_SUBDIRECTORY", qpidproton_subdirectory, i) i = re.sub("TEMPLATE_PYTHON_EXECUTABLE", python_executable, i) i = re.sub("TEMPLATE_BOOST_ROOT", boost_root, i) diff --git a/versions.json b/versions.json index a0d0726..06d1e65 100644 --- a/versions.json +++ b/versions.json @@ -51,8 +51,8 @@ "fpm_directories": ["include","lib","lib64"] }, "boost": { - "commitish": "boost-1.67.0", - "version_string": "1.67.0", + "commitish": "boost-1.70.0", + "version_string": "1.70.0", "license": "Boost Software License 1.0", "consortium_build_number": "0", "externals_root": "opt/irods-externals", @@ -83,8 +83,8 @@ "fpm_directories": ["include"] }, "clang": { - "commitish": "release_60", - "version_string": "6.0", + "commitish": "release_80", + "version_string": "8.0", "license": "LLVM", "consortium_build_number": "0", "externals_root": "opt/irods-externals", @@ -103,7 +103,7 @@ }, "clang-runtime": { "commitish": "not-used-same-as-clang", - "version_string": "6.0", + "version_string": "8.0", "license": "LLVM", "consortium_build_number": "0", "externals_root": "opt/irods-externals", @@ -120,8 +120,8 @@ "fpm_directories": ["lib"] }, "cmake": { - "commitish": "v3.11.4", - "version_string": "3.11.4", + "commitish": "v3.15.1", + "version_string": "3.15.1", "license": "BSD 3-Clause", "consortium_build_number": "0", "externals_root": "opt/irods-externals", @@ -290,16 +290,15 @@ ], "fpm_directories": ["bin","include","lib"] }, - "qpid": { - "commitish": "qpid-cpp-0.34", - "version_string": "0.34", + "qpid-cpp": { + "commitish": "1.39.0", + "version_string": "1.39.0", "license": "Apache License 2.0", "consortium_build_number": "1", "externals_root": "opt/irods-externals", "build_steps": [ - "sed -i 's/BOOST_MESSAGE/BOOST_TEST_MESSAGE/g' ./qpid/cpp/src/tests/exception_test.cpp", "mkdir -p build", - "cd build; env LD_LIBRARY_PATH=TEMPLATE_CLANG_CPP_LIBRARIES TEMPLATE_CMAKE_EXECUTABLE -G 'Unix Makefiles' -DPKG_CONFIG_PATH=TEMPLATE_QPID-PROTON_INSTALL_PATH -DCMAKE_INSTALL_RPATH=/TEMPLATE_BOOST_RPATH\\;/TEMPLATE_CLANG_RUNTIME_RPATH -DCMAKE_INSTALL_PREFIX=TEMPLATE_INSTALL_PREFIX -DLIB_SUFFIX:STRING='' -DBOOST_ROOT=TEMPLATE_BOOST_ROOT -DBUILD_PROBES=no -DBUILD_BINDING_PERL=no -DBUILD_BINDING_RUBY=no -DBUILD_BINDING_PYTHON=no -DCMAKE_CXX_FLAGS='-std=c++14 -nostdinc++ -ITEMPLATE_CLANG_CPP_HEADERS' -DCMAKE_EXE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi -lpthread' -DCMAKE_SHARED_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_MODULE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_INSTALL_RPATH=/TEMPLATE_CLANG_RUNTIME_RPATH ../qpid/cpp", + "cd build; env LD_LIBRARY_PATH=TEMPLATE_CLANG_CPP_LIBRARIES TEMPLATE_CMAKE_EXECUTABLE -G 'Unix Makefiles' -DPKG_CONFIG_PATH=TEMPLATE_QPID-PROTON_INSTALL_PATH -DCMAKE_INSTALL_RPATH=/TEMPLATE_BOOST_RPATH\\;/TEMPLATE_CLANG_RUNTIME_RPATH -DCMAKE_INSTALL_PREFIX=TEMPLATE_INSTALL_PREFIX -DLIB_SUFFIX:STRING='' -DBOOST_ROOT=TEMPLATE_BOOST_ROOT -DBUILD_PROBES=no -DBUILD_BINDING_PERL=no -DBUILD_BINDING_RUBY=no -DBUILD_BINDING_PYTHON=no -DCMAKE_CXX_FLAGS='-std=c++14 -nostdinc++ -ITEMPLATE_CLANG_CPP_HEADERS' -DCMAKE_EXE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi -lpthread' -DCMAKE_SHARED_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_MODULE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_INSTALL_RPATH=/TEMPLATE_CLANG_RUNTIME_RPATH ..", "cd build; make -jTEMPLATE_JOBS; make install" ], "external_build_steps": [ @@ -308,15 +307,15 @@ "fpm_directories": [] }, "qpid-proton": { - "commitish": "0.23.0", - "version_string": "0.23.0", + "commitish": "0.28.0", + "version_string": "0.28.0", "license": "Apache License 2.0", "consortium_build_number": "0", "externals_root": "opt/irods-externals", "build_steps": [ "mkdir -p build", - "cd build; TEMPLATE_CMAKE_EXECUTABLE .. -DCMAKE_CXX_FLAGS='-nostdinc++ -ITEMPLATE_CLANG_CPP_HEADERS' -DCMAKE_SHARED_LINKER_FLAGS='-LTEMPLATE_CLANG_CPP_LIBRARIES -stdlib=libc++' -DCMAKE_EXE_LINKER_FLAGS='-LTEMPLATE_CLANG_CPP_LIBRARIES -stdlib=libc++' -DCMAKE_INSTALL_PREFIX=TEMPLATE_INSTALL_PREFIX -DBUILD_JAVA=OFF -DBUILD_RUBY=OFF -DBUILD_PYTHON=OFF -DSYSINSTALL_BINDINGS=OFF", - "cd build; make -jTEMPLATE_JOBS; make install" + "cd build; TEMPLATE_CMAKE_EXECUTABLE -DCMAKE_BUILD_CXX=ON -DCMAKE_CXX_FLAGS='-nostdinc++ -ITEMPLATE_CLANG_CPP_HEADERS' -DCMAKE_SHARED_LINKER_FLAGS='-LTEMPLATE_CLANG_CPP_LIBRARIES -stdlib=libc++' -DCMAKE_EXE_LINKER_FLAGS='-LTEMPLATE_CLANG_CPP_LIBRARIES -stdlib=libc++' -DCMAKE_INSTALL_PREFIX=TEMPLATE_INSTALL_PREFIX -DBUILD_RUBY=OFF -DBUILD_PYTHON=OFF -DSYSINSTALL_BINDINGS=OFF ..", + "cd build; make -jTEMPLATE_JOBS; make -jTEMPLATE_JOBS install" ], "external_build_steps": [ "ls -l TEMPLATE_INSTALL_PREFIX/../* ; cp -rf TEMPLATE_INSTALL_PREFIX/../* ../../ ; ls -l ../../" @@ -325,13 +324,13 @@ }, "qpid-with-proton": { "commitish": "not-used", - "version_string": "0.34", + "version_string": "1.39.0", "license": "Apache License 2.0", "consortium_build_number": "1", "externals_root": "opt/irods-externals", "build_steps": [ "mkdir -p TEMPLATE_INSTALL_PREFIX", - "cp -r ../../TEMPLATE_QPID_SUBDIRECTORY/* TEMPLATE_INSTALL_PREFIX/", + "cp -r ../../TEMPLATE_QPID-CPP_SUBDIRECTORY/* TEMPLATE_INSTALL_PREFIX/", "cp -r ../../TEMPLATE_QPID-PROTON_SUBDIRECTORY/* TEMPLATE_INSTALL_PREFIX/" ], "external_build_steps": [