Skip to content
Snippets Groups Projects
Commit 91971da6 authored by Michael Davis's avatar Michael Davis
Browse files

[kill-bash] Don't compile or package eoscta_stub

parent 96b4bd68
No related branches found
No related tags found
No related merge requests found
...@@ -19,34 +19,16 @@ cmake_minimum_required (VERSION 2.6) ...@@ -19,34 +19,16 @@ cmake_minimum_required (VERSION 2.6)
find_package(xrootdclient REQUIRED) find_package(xrootdclient REQUIRED)
find_package(xrootd REQUIRED) find_package(xrootd REQUIRED)
find_package(Protobuf3 REQUIRED) find_package(Protobuf3 REQUIRED)
# Cryptopp can be dropped when we get rid of eoscta_stub
find_package(cryptopp REQUIRED)
#
# XRootD SSI # XRootD SSI
#
include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_INCLUDE_DIR}/private) include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_INCLUDE_DIR}/private)
#
# XRootD SSI Protocol Buffer bindings # XRootD SSI Protocol Buffer bindings
#
include_directories(${XRD_SSI_PB_DIR}/include ${XRD_SSI_PB_DIR}/eos_cta/include) include_directories(${XRD_SSI_PB_DIR}/include ${XRD_SSI_PB_DIR}/eos_cta/include)
#
# Compiled protocol buffers # Compiled protocol buffers
#
include_directories(${CMAKE_BINARY_DIR}/eos_cta ${PROTOBUF3_INCLUDE_DIRS}) include_directories(${CMAKE_BINARY_DIR}/eos_cta ${PROTOBUF3_INCLUDE_DIRS})
#
# eoscta_stub is a drop-in replacement for "cta archive|retrieve|delete"
#
add_executable(eoscta_stub EosCtaStub.cpp Configuration.cpp)
target_link_libraries(eoscta_stub cryptopp ctacommon XrdSsiPbEosCta XrdSsi-4 XrdSsiLib)
set_property (TARGET eoscta_stub APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
# Get some extra debug messages on stdout
#target_compile_definitions(eoscta_stub PUBLIC XRDSSI_DEBUG)
install(TARGETS eoscta_stub DESTINATION usr/bin)
# #
# cta-admin <admin_command> is the SSI version of "cta <admin_command>" # cta-admin <admin_command> is the SSI version of "cta <admin_command>"
# #
...@@ -57,6 +39,9 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) ...@@ -57,6 +39,9 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
#target_compile_definitions(cta-admin PUBLIC XRDSSI_DEBUG) #target_compile_definitions(cta-admin PUBLIC XRDSSI_DEBUG)
install(TARGETS cta-admin DESTINATION usr/bin) install(TARGETS cta-admin DESTINATION usr/bin)
#
# Old cta is scheduled for deletion
#
add_executable(cta.deprecated CTACmdMain.cpp Configuration.cpp) add_executable(cta.deprecated CTACmdMain.cpp Configuration.cpp)
target_link_libraries(cta.deprecated ${XROOTD_XRDCL_LIB} cryptopp) target_link_libraries(cta.deprecated ${XROOTD_XRDCL_LIB} cryptopp)
install(TARGETS cta.deprecated DESTINATION usr/bin) install(TARGETS cta.deprecated DESTINATION usr/bin)
......
...@@ -115,7 +115,6 @@ The xroot plugin ...@@ -115,7 +115,6 @@ The xroot plugin
%defattr(-,root,root) %defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/cta.deprecated %attr(0755,root,root) %{_bindir}/cta.deprecated
%attr(0755,root,root) %{_bindir}/cta-admin %attr(0755,root,root) %{_bindir}/cta-admin
%attr(0755,root,root) %{_bindir}/eoscta_stub
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf
%else %else
...@@ -180,7 +179,6 @@ The xroot plugin ...@@ -180,7 +179,6 @@ The xroot plugin
%defattr(-,root,root) %defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/cta.deprecated %attr(0755,root,root) %{_bindir}/cta.deprecated
%attr(0755,root,root) %{_bindir}/cta-admin %attr(0755,root,root) %{_bindir}/cta-admin
%attr(0755,root,root) %{_bindir}/eoscta_stub
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf
%package -n cta-lib %package -n cta-lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment