Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
2a8c3712
Commit
2a8c3712
authored
May 20, 2015
by
Steven Murray
Browse files
Renamed the utils directory to common
parent
bf6e61fe
Changes
53
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
2a8c3712
...
...
@@ -31,7 +31,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include_directories
(
${
PROJECT_SOURCE_DIR
}
)
add_subdirectory
(
utils
)
add_subdirectory
(
common
)
add_subdirectory
(
objectstore
)
add_subdirectory
(
middletier
)
add_subdirectory
(
nameserver
)
...
...
utils
/CMakeLists.txt
→
common
/CMakeLists.txt
View file @
2a8c3712
cmake_minimum_required
(
VERSION 2.6
)
set
(
UTILS
_LIB_SRC_FILES
set
(
COMMON
_LIB_SRC_FILES
Timer.cpp
Utils.cpp
exception/Backtrace.cpp
...
...
@@ -11,15 +11,15 @@ set (UTILS_LIB_SRC_FILES
threading/Mutex.cpp
threading/Threading.cpp
)
add_library
(
cta
utils
SHARED
${
UTILS
_LIB_SRC_FILES
}
)
add_library
(
cta
common
SHARED
${
COMMON
_LIB_SRC_FILES
}
)
target_link_libraries
(
ctautils
${
SQLITE3_LIBRARY_RELEASE
}
target_link_libraries
(
ctacommon
${
SQLITE3_LIBRARY_RELEASE
}
pthread
)
set
(
UTILS
_UNIT_TESTS_LIB_SRC_FILES
set
(
COMMON
_UNIT_TESTS_LIB_SRC_FILES
UtilsTest.cpp
)
add_library
(
ctautilsunittests SHARED
${
UTILS_UNIT_TESTS_LIB_SRC_FILES
}
)
add_library
(
ctacommonunittests SHARED
${
COMMON_UNIT_TESTS_LIB_SRC_FILES
}
)
utils
/Timer.cpp
→
common
/Timer.cpp
View file @
2a8c3712
File moved
utils
/Timer.hpp
→
common
/Timer.hpp
View file @
2a8c3712
File moved
utils
/Utils.cpp
→
common
/Utils.cpp
View file @
2a8c3712
...
...
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include
"
utils
/exception/Exception.hpp"
#include
"
utils
/Utils.hpp"
#include
"
common
/exception/Exception.hpp"
#include
"
common
/Utils.hpp"
#include
<sstream>
...
...
utils
/Utils.hpp
→
common
/Utils.hpp
View file @
2a8c3712
File moved
utils
/UtilsTest.cpp
→
common
/UtilsTest.cpp
View file @
2a8c3712
...
...
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include
"
utils
/Utils.hpp"
#include
"
common
/Utils.hpp"
#include
<gtest/gtest.h>
...
...
utils
/exception/Backtrace.cpp
→
common
/exception/Backtrace.cpp
View file @
2a8c3712
File moved
utils
/exception/Backtrace.hpp
→
common
/exception/Backtrace.hpp
View file @
2a8c3712
File moved
utils
/exception/CMakeLists.txt
→
common
/exception/CMakeLists.txt
View file @
2a8c3712
File moved
utils
/exception/Errnum.cpp
→
common
/exception/Errnum.cpp
View file @
2a8c3712
...
...
@@ -40,8 +40,8 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"
utils
/exception/Errnum.hpp"
#include
"
utils
/exception/strerror_r_wrapper.h"
#include
"
common
/exception/Errnum.hpp"
#include
"
common
/exception/strerror_r_wrapper.h"
#include
<string.h>
#include
<errno.h>
...
...
utils
/exception/Errnum.hpp
→
common
/exception/Errnum.hpp
View file @
2a8c3712
File moved
utils
/exception/Exception.cpp
→
common
/exception/Exception.cpp
View file @
2a8c3712
...
...
@@ -40,7 +40,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"
utils
/exception/Exception.hpp"
#include
"
common
/exception/Exception.hpp"
//------------------------------------------------------------------------------
// constructor
...
...
utils
/exception/Exception.hpp
→
common
/exception/Exception.hpp
View file @
2a8c3712
...
...
@@ -42,7 +42,7 @@
#pragma once
#include
"
utils
/exception/Backtrace.hpp"
#include
"
common
/exception/Backtrace.hpp"
#include
<exception>
#include
<sstream>
...
...
utils
/exception/strerror_r_wrapper.cpp
→
common
/exception/strerror_r_wrapper.cpp
View file @
2a8c3712
File moved
utils
/exception/strerror_r_wrapper.h
→
common
/exception/strerror_r_wrapper.h
View file @
2a8c3712
File moved
utils
/threading/ChildProcess.cpp
→
common
/threading/ChildProcess.cpp
View file @
2a8c3712
File moved
utils
/threading/ChildProcess.hpp
→
common
/threading/ChildProcess.hpp
View file @
2a8c3712
...
...
@@ -40,8 +40,8 @@
*****************************************************************************/
#pragma once
#include
"
utils
/exception/Errnum.hpp"
#include
"
utils
/exception/Exception.hpp"
#include
"
common
/exception/Errnum.hpp"
#include
"
common
/exception/Exception.hpp"
#include
<unistd.h>
...
...
utils
/threading/Mutex.cpp
→
common
/threading/Mutex.cpp
View file @
2a8c3712
...
...
@@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include
"
utils
/threading/Mutex.hpp"
#include
"
utils
/exception/Errnum.hpp"
#include
"
utils
/exception/Exception.hpp"
#include
"
common
/threading/Mutex.hpp"
#include
"
common
/exception/Errnum.hpp"
#include
"
common
/exception/Exception.hpp"
//------------------------------------------------------------------------------
//constructor
...
...
utils
/threading/Mutex.hpp
→
common
/threading/Mutex.hpp
View file @
2a8c3712
File moved
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment