Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
91971da6
Commit
91971da6
authored
7 years ago
by
Michael Davis
Browse files
Options
Downloads
Patches
Plain Diff
[kill-bash] Don't compile or package eoscta_stub
parent
96b4bd68
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmdline/CMakeLists.txt
+3
-18
3 additions, 18 deletions
cmdline/CMakeLists.txt
cta.spec.in
+0
-2
0 additions, 2 deletions
cta.spec.in
with
3 additions
and
20 deletions
cmdline/CMakeLists.txt
+
3
−
18
View file @
91971da6
...
...
@@ -19,34 +19,16 @@ cmake_minimum_required (VERSION 2.6)
find_package
(
xrootdclient REQUIRED
)
find_package
(
xrootd REQUIRED
)
find_package
(
Protobuf3 REQUIRED
)
# Cryptopp can be dropped when we get rid of eoscta_stub
find_package
(
cryptopp REQUIRED
)
#
# XRootD SSI
#
include_directories
(
${
XROOTD_INCLUDE_DIR
}
${
XROOTD_INCLUDE_DIR
}
/private
)
#
# XRootD SSI Protocol Buffer bindings
#
include_directories
(
${
XRD_SSI_PB_DIR
}
/include
${
XRD_SSI_PB_DIR
}
/eos_cta/include
)
#
# Compiled protocol buffers
#
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>"
#
...
...
@@ -57,6 +39,9 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
#target_compile_definitions(cta-admin PUBLIC XRDSSI_DEBUG)
install
(
TARGETS cta-admin DESTINATION usr/bin
)
#
# Old cta is scheduled for deletion
#
add_executable
(
cta.deprecated CTACmdMain.cpp Configuration.cpp
)
target_link_libraries
(
cta.deprecated
${
XROOTD_XRDCL_LIB
}
cryptopp
)
install
(
TARGETS cta.deprecated DESTINATION usr/bin
)
...
...
This diff is collapsed.
Click to expand it.
cta.spec.in
+
0
−
2
View file @
91971da6
...
...
@@ -115,7 +115,6 @@ The xroot plugin
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/cta.deprecated
%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
%else
...
...
@@ -180,7 +179,6 @@ The xroot plugin
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/cta.deprecated
%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
%package -n cta-lib
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment