Merge pull request #2 from MaastrichtUniversity/DHS-2762

Merge DHS-2762 into DHS-2751
MaastrichtUniversity · Nov 24, 2022 · ab2f336 · ab2f336
2 parents fc09b9c + 8146dab
commit ab2f336
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 1,188 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,45 +82,24 @@ include_directories("/usr/include/irods")
 # Generate the shared Library (= binary) from the source code
 # Note: unlike an Executable, a library does not contain a main method. It just contains the classes
 add_library(msi_getenv SHARED msi_getenv/msi_getenv.cpp)
-#add_library(msi_http_send_file SHARED msi_http_send_file/msi_http_send_file.cpp)
 add_library(msi_json_arrayops SHARED msi_json_arrayops/libmsi_json_arrayops.cpp)
 add_library(msi_json_objops SHARED msi_json_objops/libmsi_json_objops.cpp)
 #add_library(msi_time_ts2str SHARED msi_time_ts2str/libmsi_time_ts2str.cpp)
-#add_library(msi_unmount SHARED msi_unmount/unmount.cpp)
-#add_library(msiput_dataobj_or_coll SHARED msiput_dataobj_or_coll/libmsiput_dataobj_or_coll.cpp)
-#add_library(msi_amqp_basic_publish SHARED msi_amqp_basic_publish/msi_amqp_basic_publish.cpp)
-add_library(msi_set_avu SHARED msi_set_avu/msi_set_avu.cpp)
-add_library(msi_add_avu SHARED msi_add_avu/msi_add_avu.cpp)
-add_library(msi_rmw_avu SHARED msi_rmw_avu/msi_rmw_avu.cpp)
 
 # Link the generated library to dependency libraries
 target_link_libraries(msi_getenv LINK_PUBLIC ${Boost_LIBRARIES})
-#target_link_libraries(msi_http_send_file LINK_PUBLIC ${Boost_LIBRARIES} ${CURL_LIBRARIES})
 target_link_libraries(msi_json_arrayops LINK_PUBLIC ${JANSSON_LIBRARIES} ${Boost_LIBRARIES})
 target_link_libraries(msi_json_objops LINK_PUBLIC ${JANSSON_LIBRARIES} ${Boost_LIBRARIES})
 #target_link_libraries(msi_time_ts2str LINK_PUBLIC ${Boost_LIBRARIES})
-#target_link_libraries(msi_unmount LINK_PUBLIC ${Boost_LIBRARIES})
-#target_link_libraries(msiput_dataobj_or_coll LINK_PUBLIC ${Boost_LIBRARIES})
-#target_link_libraries(msi_amqp_basic_publish LINK_PUBLIC ${Boost_LIBRARIES} ${RABBITMQ_LIBRARIES})
-target_link_libraries(msi_set_avu LINK_PUBLIC ${Boost_LIBRARIES})
-target_link_libraries(msi_add_avu LINK_PUBLIC ${Boost_LIBRARIES})
-target_link_libraries(msi_rmw_avu LINK_PUBLIC ${Boost_LIBRARIES})
 
 
 # Set the location for library installation
 install(CODE "MESSAGE(\"Installing microservices to iRODS plugins folder...\")")
 install(TARGETS
  msi_getenv
-# msi_http_send_file
  msi_json_arrayops
  msi_json_objops
 # msi_time_ts2str
- # msi_unmount
-# msiput_dataobj_or_coll
-# msi_amqp_basic_publish
- msi_set_avu
- msi_add_avu
- msi_rmw_avu
  DESTINATION
  /usr/lib/irods/plugins/microservices)
 

diff --git a/msi_add_avu/msi_add_avu.cpp b/msi_add_avu/msi_add_avu.cpp
diff --git a/msi_add_avu/msi_add_avu_test.r b/msi_add_avu/msi_add_avu_test.r
diff --git a/msi_amqp_basic_publish/Makefile b/msi_amqp_basic_publish/Makefile
diff --git a/msi_amqp_basic_publish/msi_amqp_basic_publish.cpp b/msi_amqp_basic_publish/msi_amqp_basic_publish.cpp
diff --git a/msi_amqp_basic_publish/msi_amqp_basic_publish_test.r b/msi_amqp_basic_publish/msi_amqp_basic_publish_test.r