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
daa4825d
Commit
daa4825d
authored
5 years ago
by
Eric Cano
Browse files
Options
Downloads
Patches
Plain Diff
#656: created a bare-minimum cta-lib-base for cli.
parent
73051240
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmdline/CMakeLists.txt
+2
-2
2 additions, 2 deletions
cmdline/CMakeLists.txt
common/CMakeLists.txt
+16
-5
16 additions, 5 deletions
common/CMakeLists.txt
cta.spec.in
+12
-0
12 additions, 0 deletions
cta.spec.in
with
30 additions
and
7 deletions
cmdline/CMakeLists.txt
+
2
−
2
View file @
daa4825d
...
...
@@ -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 cta
common
)
target_link_libraries
(
cta-admin XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils cta
base
)
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 cta
common
XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils
)
target_link_libraries
(
cta-wfe-test cryptopp cta
base
XrdSsiPbEosCta XrdSsi-4 XrdSsiLib XrdUtils
)
set_property
(
TARGET cta-wfe-test APPEND PROPERTY INSTALL_RPATH
${
PROTOBUF3_RPATH
}
)
install
(
TARGETS cta-admin DESTINATION usr/bin
)
...
...
This diff is collapsed.
Click to expand it.
common/CMakeLists.txt
+
16
−
5
View file @
daa4825d
...
...
@@ -30,9 +30,7 @@ include_directories (${XROOTD_INCLUDE_DIR})
#
include_directories
(
${
CMAKE_BINARY_DIR
}
/eos_cta
${
PROTOBUF3_INCLUDE_DIRS
}
)
set_source_files_properties
(
CRC.cpp PROPERTIES COMPILE_FLAGS -O2
)
set
(
COMMON_LIB_SRC_FILES
set
(
BASE_LIB_SRC_FILES
dataStructures/ActivitiesFairShareWeights.cpp
dataStructures/AdminUser.cpp
dataStructures/ArchiveFile.cpp
...
...
@@ -76,15 +74,27 @@ set (COMMON_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
...
...
@@ -157,6 +167,7 @@ set_property(TARGET ctacommon PROPERTY VERSION "${CTA_LIBVERSION}")
install
(
TARGETS ctacommon DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
target_link_libraries
(
ctacommon
ctabase
XrdSsiPbEosCta
pthread
uuid
...
...
This diff is collapsed.
Click to expand it.
cta.spec.in
+
12
−
0
View file @
daa4825d
...
...
@@ -186,6 +186,18 @@ 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
Summary: CERN Tape Archive libraries
Group: Application/CTA
# Explicity require protobuf3 to avoid clash with eos-protobuf3
Requires: protobuf3
%description -n cta-lib-base
CERN Tape Archive:
The shared libraries base
%files -n cta-lib-base
%defattr(0755,root,root,-)
%{_libdir}/libctabase.so*
%package -n cta-lib
Summary: CERN Tape Archive libraries
Group: Application/CTA
...
...
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