Commit b8125718 authored by Eric Cano's avatar Eric Cano
Browse files

Reverted the split of ctacommon library and spun it into its own rpm.

A previous commit had spun part of the code into a base library, but the split of the library was not helping.
Replaced the cta-lib-base RPM with a cta-lib-common RPM.
parent d7618f16
......@@ -33,7 +33,7 @@ include_directories(${CMAKE_BINARY_DIR}/eos_cta ${PROTOBUF3_INCLUDE_DIRS})
# cta-admin <admin_command> is the SSI version of "cta <admin_command>"
#
add_executable(cta-admin CtaAdminCmd.cpp CtaAdminCmdParse.cpp CtaAdminTextFormatter.cpp)
target_link_libraries(cta-admin XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils ctabase)
target_link_libraries(cta-admin XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils ctacommon)
set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
#
......@@ -44,7 +44,7 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
#
find_package(cryptopp REQUIRED)
add_executable(cta-wfe-test EosCtaStub.cpp)
target_link_libraries(cta-wfe-test cryptopp ctabase XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils)
target_link_libraries(cta-wfe-test cryptopp ctacommon XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils)
set_property (TARGET cta-wfe-test APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
install(TARGETS cta-admin DESTINATION usr/bin)
......
......@@ -30,7 +30,9 @@ include_directories (${XROOTD_INCLUDE_DIR})
#
include_directories(${CMAKE_BINARY_DIR}/eos_cta ${PROTOBUF3_INCLUDE_DIRS})
set (BASE_LIB_SRC_FILES
set_source_files_properties(CRC.cpp PROPERTIES COMPILE_FLAGS -O2)
set (COMMON_LIB_SRC_FILES
dataStructures/ActivitiesFairShareWeights.cpp
dataStructures/AdminUser.cpp
dataStructures/ArchiveFile.cpp
......@@ -74,27 +76,15 @@ set (BASE_LIB_SRC_FILES
dataStructures/WriteTestResult.cpp
dataStructures/utils.cpp
checksum/ChecksumBlob.cpp
exception/Backtrace.cpp
exception/Exception.cpp
)
add_library (ctabase SHARED
${BASE_LIB_SRC_FILES})
set_property(TARGET ctabase PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET ctabase PROPERTY VERSION "${CTA_LIBVERSION}")
install (TARGETS ctabase DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
set_source_files_properties(CRC.cpp PROPERTIES COMPILE_FLAGS -O2)
set (COMMON_LIB_SRC_FILES
exception/AcceptConnectionInterrupted.cpp
exception/AcsQueryVolumeCmd.cpp
exception/Backtrace.cpp
exception/BadAlloc.cpp
exception/CommandLineNotParsed.cpp
exception/DismountFailed.cpp
exception/ForceDismountFailed.cpp
exception/Errnum.cpp
exception/Exception.cpp
exception/InvalidArgument.cpp
exception/InvalidConfigEntry.cpp
exception/LostDatabaseConnection.cpp
......@@ -167,7 +157,6 @@ set_property(TARGET ctacommon PROPERTY VERSION "${CTA_LIBVERSION}")
install (TARGETS ctacommon DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
target_link_libraries (ctacommon
ctabase
XrdSsiPbEosCta
pthread
uuid
......
......@@ -175,7 +175,7 @@ The xroot plugin
%package -n cta-cli
Summary: CERN Tape Archive: command line interface
Group: Application/CTA
Requires: cta-lib-base = %{version}-%{release}
Requires: cta-lib-common = %{version}-%{release}
%description -n cta-cli
CERN Tape Archive:
The xroot plugin
......@@ -186,7 +186,7 @@ The xroot plugin
%attr(0755,root,root) %{_bindir}/cta-wfe-test
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf
%package -n cta-lib-base
%package -n cta-lib-common
Summary: CERN Tape Archive libraries
Group: Application/CTA
# Explicity require protobuf3 to avoid clash with eos-protobuf3
......@@ -196,7 +196,7 @@ CERN Tape Archive:
The shared libraries base
%files -n cta-lib-base
%defattr(0755,root,root,-)
%{_libdir}/libctabase.so*
%{_libdir}/libctacommon.so*
%package -n cta-lib
Summary: CERN Tape Archive libraries
......@@ -208,14 +208,13 @@ Requires: postgresql-libs
# Explicity require protobuf3 to avoid clash with eos-protobuf3
Requires: protobuf3
Requires: zeromq
Requires: cta-lib-base = %{version}-%{release}
Requires: cta-lib-common = %{version}-%{release}
%description -n cta-lib
CERN Tape Archive:
The shared libraries
%files -n cta-lib
%defattr(0755,root,root,-)
%{_libdir}/libctacatalogue.so*
%{_libdir}/libctacommon.so*
#TODO: merge util and common
%{_libdir}/libctascheduler.so*
%{_libdir}/libctaobjectstore.so*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment