Commit 414772e9 authored by Steven Murray's avatar Steven Murray
Browse files

Removed the redundant libs directory by bringing the middletier sub-directory up

parent d200b7ae
...@@ -29,9 +29,7 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON) ...@@ -29,9 +29,7 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include_directories(${CMAKE_SOURCE_DIR}) add_subdirectory(middletier)
add_subdirectory(libs)
add_subdirectory(objectstore) add_subdirectory(objectstore)
add_subdirectory(objectstore_middletier) add_subdirectory(objectstore_middletier)
add_subdirectory(tests) add_subdirectory(tests)
......
cmake_minimum_required (VERSION 2.6)
add_subdirectory(middletier)
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
find_package (sqlite REQUIRED) find_package (sqlite REQUIRED)
include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}) include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
set (MIDDLE_TIER_LIB_SRC_FILES set (MIDDLE_TIER_LIB_SRC_FILES
AdminHost.cpp cta/AdminHost.cpp
AdminUser.cpp cta/AdminUser.cpp
ArchivalJob.cpp cta/ArchivalJob.cpp
ArchivalJobState.cpp cta/ArchivalJobState.cpp
ArchiveRoute.cpp cta/ArchiveRoute.cpp
ArchiveRouteId.cpp cta/ArchiveRouteId.cpp
DirectoryEntry.cpp cta/DirectoryEntry.cpp
DirectoryIterator.cpp cta/DirectoryIterator.cpp
Exception.cpp cta/Exception.cpp
FileAttribute.cpp cta/FileAttribute.cpp
FileSystemDirectoryEntry.cpp cta/FileSystemDirectoryEntry.cpp
FileSystemNode.cpp cta/FileSystemNode.cpp
FileSystemStorageClass.cpp cta/FileSystemStorageClass.cpp
FileSystemStorageClasses.cpp cta/FileSystemStorageClasses.cpp
LogicalLibrary.cpp cta/LogicalLibrary.cpp
MiddleTierAdmin.cpp cta/MiddleTierAdmin.cpp
MiddleTierUser.cpp cta/MiddleTierUser.cpp
RetrievalJob.cpp cta/RetrievalJob.cpp
RetrievalJobState.cpp cta/RetrievalJobState.cpp
SecurityIdentity.cpp cta/SecurityIdentity.cpp
SqliteDatabase.cpp cta/SqliteDatabase.cpp
SqliteMiddleTierAdmin.cpp cta/SqliteMiddleTierAdmin.cpp
SqliteMiddleTierUser.cpp cta/SqliteMiddleTierUser.cpp
StorageClass.cpp cta/StorageClass.cpp
Tape.cpp cta/Tape.cpp
TapePool.cpp cta/TapePool.cpp
UserIdentity.cpp cta/UserIdentity.cpp
Utils.cpp cta/Utils.cpp
Vfs.cpp) cta/Vfs.cpp)
add_library (ctamiddletier SHARED add_library (ctamiddletier SHARED
${MIDDLE_TIER_LIB_SRC_FILES}) ${MIDDLE_TIER_LIB_SRC_FILES})
...@@ -40,10 +40,10 @@ add_library (ctamiddletier SHARED ...@@ -40,10 +40,10 @@ add_library (ctamiddletier SHARED
target_link_libraries (ctamiddletier ${SQLITE3_LIBRARY_RELEASE}) target_link_libraries (ctamiddletier ${SQLITE3_LIBRARY_RELEASE})
set (MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES set (MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES
SqliteMiddleTierAdminTest.cpp cta/SqliteMiddleTierAdminTest.cpp
SqliteMiddleTierUserTest.cpp cta/SqliteMiddleTierUserTest.cpp
UtilsTest.cpp cta/UtilsTest.cpp
VfsTest.cpp) cta/VfsTest.cpp)
add_library (ctamiddletierunittests SHARED add_library (ctamiddletierunittests SHARED
${MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES}) ${MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES})
......
#include "AdminHost.hpp" #include "cta/AdminHost.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
#pragma once #pragma once
#include "UserIdentity.hpp" #include "cta/UserIdentity.hpp"
#include <string> #include <string>
......
#include "AdminUser.hpp" #include "cta/AdminUser.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
#pragma once #pragma once
#include "UserIdentity.hpp" #include "cta/UserIdentity.hpp"
#include <string> #include <string>
......
#include "ArchivalJob.hpp" #include "cta/ArchivalJob.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
#pragma once #pragma once
#include "ArchivalJobState.hpp" #include "cta/ArchivalJobState.hpp"
#include "UserIdentity.hpp" #include "cta/UserIdentity.hpp"
#include <string> #include <string>
#include <time.h> #include <time.h>
......
#include "ArchivalJob.hpp" #include "cta/ArchivalJob.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// toStr // toStr
......
#include "ArchiveRoute.hpp" #include "cta/ArchiveRoute.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
#pragma once #pragma once
#include "UserIdentity.hpp" #include "cta/UserIdentity.hpp"
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
......
#include "ArchiveRouteId.hpp" #include "cta/ArchiveRouteId.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
#include "DirectoryEntry.hpp" #include "cta/DirectoryEntry.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// entryTypeToStr // entryTypeToStr
......
#include "DirectoryIterator.hpp" #include "cta/DirectoryIterator.hpp"
#include "Exception.hpp" #include "cta/Exception.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
#pragma once #pragma once
#include "DirectoryEntry.hpp" #include "cta/DirectoryEntry.hpp"
#include <list> #include <list>
......
#include "Exception.hpp" #include "cta/Exception.hpp"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructor // constructor
......
Supports Markdown
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