[irods/irods_capability_indexing#128] Remove elasticlient and CPR

irods · Aug 18, 2023 · e454ad1 · e454ad1
1 parent adedb7f
commit e454ad1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 65 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-all : avro aws-sdk-cpp boost catch2 clang clang-runtime cmake cppzmq cpr elasticlient fmt imagemagick json libarchive libs3 mungefs nanodbc pistache qpid-proton redis spdlog zeromq4-1
+all : avro aws-sdk-cpp boost catch2 clang clang-runtime cmake cppzmq fmt imagemagick json libarchive libs3 mungefs nanodbc pistache qpid-proton redis spdlog zeromq4-1
 
 
 server : avro boost catch2 clang-runtime cppzmq fmt json libarchive nanodbc spdlog zeromq4-1
@@ -78,22 +78,6 @@ cppzmq_clean :
 	@rm -rf cppzmq*
 	@rm -rf $(CPPZMQ_PACKAGE)
 
-$(CPR_PACKAGE) : $(ELASTICLIENT_PACKAGE)
-	./build.py $(BUILD_OPTIONS) cpr > cpr.log 2>&1
-cpr : $(CPR_PACKAGE)
-cpr_clean :
-	@echo "Cleaning cpr..."
-	@rm -rf cpr*
-	@rm -rf $(CPR_PACKAGE)
-
-$(ELASTICLIENT_PACKAGE) : $(CLANG_PACKAGE) $(BOOST_PACKAGE)
-	./build.py $(BUILD_OPTIONS) elasticlient > elasticlient.log 2>&1
-elasticlient : $(ELASTICLIENT_PACKAGE)
-elasticlient_clean :
-	@echo "Cleaning elasticlient..."
-	@rm -rf elasticlient*
-	@rm -rf $(ELASTICLIENT_PACKAGE)
-
 $(FMT_PACKAGE) : $(CLANG_PACKAGE)
 	./build.py $(BUILD_OPTIONS) fmt > fmt.log 2>&1
 fmt : $(FMT_PACKAGE)
@@ -198,7 +182,7 @@ zeromq4-1_clean :
 	@rm -rf zeromq4-1*
 	@rm -rf $(ZEROMQ4-1_PACKAGE)
 
-clean : avro_clean aws-sdk-cpp_clean boost_clean catch2_clean clang_clean clang-runtime_clean cmake_clean cppzmq_clean cpr_clean elasticlient_clean fmt_clean imagemagick_clean jansson_clean json_clean libarchive_clean libs3_clean mungefs_clean nanodbc_clean pistache_clean qpid-proton_clean redis_clean spdlog_clean zeromq4-1_clean
+clean : avro_clean aws-sdk-cpp_clean boost_clean catch2_clean clang_clean clang-runtime_clean cmake_clean cppzmq_clean fmt_clean imagemagick_clean jansson_clean json_clean libarchive_clean libs3_clean mungefs_clean nanodbc_clean pistache_clean qpid-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
@@ -219,11 +219,6 @@ def build_package(target, build_native_package):
     zmq_install_prefix = os.path.join(zmq_info['externals_root'], zmq_subdirectory)
     zmq_rpath = os.path.join(zmq_install_prefix, 'lib')
 
-    cpr_info = get_versions()['cpr']
-    cpr_subdirectory = '{0}{1}-{2}'.format('cpr', cpr_info['version_string'], cpr_info['consortium_build_number'])
-    cpr_install_prefix = os.path.join(cpr_info['externals_root'], cpr_subdirectory)
-    cpr_rpath = os.path.join(cpr_install_prefix, 'lib')
-
     clang_info = get_versions()['clang']
     clang_subdirectory = '{0}{1}-{2}'.format('clang', clang_info['version_string'], clang_info['consortium_build_number'])
     clang_executable = os.path.join(script_path, '{0}'.format(clang_subdirectory), 'bin', 'clang')
@@ -325,7 +320,6 @@ def build_package(target, build_native_package):
         i = re.sub("TEMPLATE_LIBARCHIVE_RPATH", libarchive_rpath, i)
         i = re.sub("TEMPLATE_AVRO_RPATH", avro_rpath, i)
         i = re.sub("TEMPLATE_AVRO_PATH", avro_root, i)
-        i = re.sub("TEMPLATE_CPR_RPATH", cpr_rpath, i)
         i = re.sub("TEMPLATE_ZMQ_RPATH", zmq_rpath, i)
         i = re.sub("TEMPLATE_ZMQ_PATH", zmq_root, i)
         i = re.sub("TEMPLATE_CPPZMQ_PATH", cppzmq_root, i)

diff --git a/versions.json b/versions.json
@@ -135,47 +135,6 @@
         ],
         "fpm_directories": ["include","lib"]
     },
-    "cpr": {
-        "commitish": "1.4.0",
-        "version_string": "1.4.0",
-        "license": "MIT",
-        "consortium_build_number": "1",
-        "externals_root": "opt/irods-externals",
-        "build_steps": [
-            "git submodule update --init",
-            "rm -f CMakeCache.txt;TEMPLATE_CMAKE_EXECUTABLE -G 'Unix Makefiles' -DBUILD_SHARED_LIBS=True -DCMAKE_CXX_COMPILER=TEMPLATE_CLANGPP_EXECUTABLE -DCMAKE_C_COMPILER=TEMPLATE_CLANG_EXECUTABLE -DCMAKE_INSTALL_RPATH=/TEMPLATE_CPR_RPATH\\;/TEMPLATE_BOOST_RPATH\\;/TEMPLATE_CLANG_RUNTIME_RPATH -DCMAKE_BUILD_WITH_INSTALL_RPATH=True -DCMAKE_INSTALL_PREFIX=TEMPLATE_INSTALL_PREFIX -DBOOST_ROOT=TEMPLATE_BOOST_ROOT -DBUILD_CPR_TESTS=OFF -DUSE_SYSTEM_CURL=ON -DCMAKE_CXX_FLAGS='-std=c++14 -nostdinc++ -ITEMPLATE_CLANG_CPP_HEADERS' -DCMAKE_EXE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_SHARED_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_MODULE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' .",
-            "make -jTEMPLATE_JOBS"
-        ],
-        "external_build_steps": [
-            "ls -l ",
-            "mkdir -p TEMPLATE_INSTALL_PREFIX",
-            "cp -rf ./lib TEMPLATE_INSTALL_PREFIX",
-            "cp -rf ./include TEMPLATE_INSTALL_PREFIX",
-            "ls -l TEMPLATE_INSTALL_PREFIX"
-        ],
-        "fpm_directories": ["include","lib"]
-    },
-    "elasticlient" : {
-        "enable_sha": true,
-        "commitish": "d68e30e382b5f2817be8cd901494736b26d4896e",
-        "version_string": "d68e30e3",
-        "license": "MIT",
-        "consortium_build_number": "0",
-        "externals_root": "opt/irods-externals",
-        "build_steps": [
-            "cd external/cpr; git checkout 1.7.2 # Updates Git submodule to compatibile version.",
-            "cd external/jsoncpp; git checkout 1.9.5 # Updates Git submodule to compatibile version.",
-            "mkdir -p build",
-            "cd build; rm -f CMakeCache.txt;TEMPLATE_CMAKE_EXECUTABLE -G 'Unix Makefiles' -DCMAKE_CXX_COMPILER=TEMPLATE_CLANGPP_EXECUTABLE -DCMAKE_C_COMPILER=TEMPLATE_CLANG_EXECUTABLE -DCMAKE_INSTALL_RPATH=/TEMPLATE_BOOST_RPATH\\;/TEMPLATE_CLANG_RUNTIME_RPATH\\;\\$ORIGIN\\;/TEMPLATE_CPR_RPATH -DCMAKE_INSTALL_PREFIX=TEMPLATE_INSTALL_PREFIX -DCMAKE_INSTALL_LIBDIR=lib -DBOOST_ROOT=TEMPLATE_BOOST_ROOT -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='-Wl,--enable-new-dtags -Wl,-z,origin -stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' -DCMAKE_MODULE_LINKER_FLAGS='-stdlib=libc++ -LTEMPLATE_CLANG_CPP_LIBRARIES -lc++abi' ..",
-            "cd build && make",
-            "cd build && cp external/httpmockserver/libhttpmockserver.pc ./",
-            "cd build && make install"
-        ],
-        "external_build_steps": [
-            "ls -l TEMPLATE_INSTALL_PREFIX/../* ; cp -rf TEMPLATE_INSTALL_PREFIX/../* ../../ ; ls -l ../../"
-        ],
-        "fpm_directories": ["include","lib"]
-    },
     "fmt": {
         "commitish": "8.1.1",
         "version_string": "8.1.1",