[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "db2" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jun 21 13:46:54 CDT 2011
branch "db2" has been created
at b3083c7ff5e8441eab7de7022e1b77e57ee50983 (commit)
- Log -----------------------------------------------------------------
commit b3083c7ff5e8441eab7de7022e1b77e57ee50983
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:46:51 2011 -0500
Rely on automatic inclusion of project's 'include' directory.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6508369..dc8dc34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
astscf_project(Logger 3.4)
-include_directories(include)
-
add_subdirectory(server)
add_subdirectory(client)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index 91de2d9..9e4fd16 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -1,5 +1,4 @@
include_directories(../src)
-include_directories(../../include)
astscf_component_init(logging-client-test)
astscf_component_add_files(logging-client-test Logger-test.cpp)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 76ba736..cba9221 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(../../include)
-
astscf_component_init(logging-service-lib)
# an icebox module cannot be used as a shared lib, so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 754624a..9273009 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -1,5 +1,4 @@
include_directories(../src)
-include_directories(../../include)
astscf_component_init(logging-service-test)
astscf_component_add_files(logging-service-test LoggingServer-test.cpp)
commit b4d811c8aab8dadbdcb0daca2c6c1253678834f5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:40:16 2011 -0500
Install component-specific Slice files.
Use astscf_slice_collection_install() to install the Slice files provided
by each component, that define its interfaces. As part of this change, many
of these Slice files were renamed and moved into different namespaces, to
provide consistency.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adcf01e..6508369 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(include)
add_subdirectory(server)
add_subdirectory(client)
+astscf_slice_collection_install(PROJECT)
astscf_headers_install(include/)
set(logger_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index fe8579d..76ba736 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -14,7 +14,7 @@ astscf_component_add_files(logging-service-lib FileChainedLogOut.h)
astscf_component_add_files(logging-service-lib OstreamChainedLogOut.h)
astscf_component_add_files(logging-service-lib LoggingServer.h)
astscf_component_add_files(logging-service-lib Configuration.h)
-astscf_component_add_slices(logging-service-lib PROJECT LoggingConfigurationIf.ice)
+astscf_component_add_slices(logging-service-lib PROJECT AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(logging-service-lib core)
astscf_component_add_ice_libraries(logging-service-lib IceStorm)
astscf_component_add_slice_collection_libraries(logging-service-lib ASTSCF)
diff --git a/server/src/Configuration.cpp b/server/src/Configuration.cpp
index 09efb98..faba577 100644
--- a/server/src/Configuration.cpp
+++ b/server/src/Configuration.cpp
@@ -27,7 +27,7 @@ namespace Logging
{
using namespace AsteriskSCF::System::Configuration::V1;
-using namespace AsteriskSCF::System::Logger::V1;
+using namespace AsteriskSCF::Configuration::LoggingService::V1;
class FileItemI : public FileItem
{
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index ad3bc6c..754624a 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -14,7 +14,7 @@ astscf_component_init(LoggingConfigurationTest)
astscf_component_add_files(LoggingConfigurationTest ConfigurationTest.cpp)
astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.h)
-astscf_component_add_slices(LoggingConfigurationTest PROJECT LoggingConfigurationIf.ice)
+astscf_component_add_slices(LoggingConfigurationTest PROJECT AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework)
astscf_component_add_slice_collection_libraries(LoggingConfigurationTest ASTSCF)
astscf_component_build_icebox(LoggingConfigurationTest)
diff --git a/server/test/ConfigurationTest.cpp b/server/test/ConfigurationTest.cpp
index f0e9dcc..5209ebc 100644
--- a/server/test/ConfigurationTest.cpp
+++ b/server/test/ConfigurationTest.cpp
@@ -30,7 +30,7 @@
#include "LoggingConfigurationHelper.h"
using namespace AsteriskSCF::System::Configuration::V1;
-using namespace AsteriskSCF::System::Logger::V1;
+using namespace AsteriskSCF::Configuration::LoggingService::V1;
/* Cache the command line arguments so that Ice can be initialized within the global fixture. */
struct ArgCacheType
diff --git a/server/test/LoggingConfigurationHelper.cpp b/server/test/LoggingConfigurationHelper.cpp
index 52dceba..11ed9cb 100644
--- a/server/test/LoggingConfigurationHelper.cpp
+++ b/server/test/LoggingConfigurationHelper.cpp
@@ -27,7 +27,7 @@ namespace
};
using namespace AsteriskSCF::System::Configuration::V1;
-using namespace AsteriskSCF::System::Logger::V1;
+using namespace AsteriskSCF::Configuration::LoggingService::V1;
LoggingConfigurationHelper::LoggingConfigurationHelper(const ConfigurationServicePrx &config)
: mConfigPrx(config) { }
@@ -55,7 +55,7 @@ void LoggingConfigurationHelper::removeLogOutFile(const std::string &fileName)
mConfigPrx->removeConfigurationItems(groups);
}
-AsteriskSCF::System::Logger::V1::FileItemPtr LoggingConfigurationHelper::getConfiguredOutputFile()
+AsteriskSCF::Configuration::LoggingService::V1::FileItemPtr LoggingConfigurationHelper::getConfiguredOutputFile()
{
//Part 1: Retrieval from the configuration service.
ConfigurationGroupSeq queryGroups;
diff --git a/server/test/LoggingConfigurationHelper.h b/server/test/LoggingConfigurationHelper.h
index 228fc36..255ea54 100644
--- a/server/test/LoggingConfigurationHelper.h
+++ b/server/test/LoggingConfigurationHelper.h
@@ -27,7 +27,7 @@ public:
LoggingConfigurationHelper(const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx &config);
void setLogOutFile(const std::string &fileName, int serialNumber);
void removeLogOutFile(const std::string &fileName);
- AsteriskSCF::System::Logger::V1::FileItemPtr getConfiguredOutputFile();
+ AsteriskSCF::Configuration::LoggingService::V1::FileItemPtr getConfiguredOutputFile();
private:
AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx mConfigPrx;
};
diff --git a/slice/LoggingConfigurationIf.ice b/slice/AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice
similarity index 94%
rename from slice/LoggingConfigurationIf.ice
rename to slice/AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice
index 964c61f..4a1aeea 100644
--- a/slice/LoggingConfigurationIf.ice
+++ b/slice/AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice
@@ -19,9 +19,11 @@
module AsteriskSCF
{
-module System
+
+module Configuration
{
-module Logger
+
+module LoggingService
{
["suppress"]
module V1
@@ -74,6 +76,9 @@ module V1
};
}; //end module V1
-}; //end module Logger
-}; //end module System
+
+}; //end module LoggingService
+
+}; //end module Configuration
+
}; //end module AsteriskSCF
commit 5f7081e4175eba7f0675829b8a56357fe157cc0f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:44:48 2011 -0500
Update to specify library type to astscf_build_library().
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index a89a9e3..fe8579d 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -4,7 +4,6 @@ astscf_component_init(logging-service-lib)
# an icebox module cannot be used as a shared lib, so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
# the unit tests
-astscf_set_libtype(logging-service-lib STATIC)
astscf_component_add_files(logging-service-lib ChainedLogOut.cpp)
astscf_component_add_files(logging-service-lib FileChainedLogOut.cpp)
astscf_component_add_files(logging-service-lib LoggingServer.cpp)
@@ -19,7 +18,7 @@ astscf_component_add_slices(logging-service-lib PROJECT LoggingConfigurationIf.i
astscf_component_add_boost_libraries(logging-service-lib core)
astscf_component_add_ice_libraries(logging-service-lib IceStorm)
astscf_component_add_slice_collection_libraries(logging-service-lib ASTSCF)
-astscf_component_build_library(logging-service-lib)
+astscf_component_build_library(logging-service-lib STATIC)
target_link_libraries(logging-service-lib)
# This lib is compiled into a .so, so it needs -fPIC set
commit 1f20d8d966097bc051e1b3b4e31b587611c3e7b9
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:24:31 2011 -0500
Use Slice collections support in AsteriskSCF.cmake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70a5d58..adcf01e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
astscf_project(Logger 3.4)
include_directories(include)
-include_directories(${API_INCLUDE_DIR})
add_subdirectory(server)
add_subdirectory(client)
diff --git a/client/src/CMakeLists.txt b/client/src/CMakeLists.txt
index 51ea521..9cfff78 100644
--- a/client/src/CMakeLists.txt
+++ b/client/src/CMakeLists.txt
@@ -12,6 +12,6 @@ astscf_component_add_files(logging-client ../../include/AsteriskSCF/Logger/IceLo
astscf_component_add_files(logging-client ../../include/AsteriskSCF/Logger/Level.h)
astscf_component_add_boost_libraries(logging-client thread date_time)
astscf_component_add_ice_libraries(logging-client IceStorm)
+astscf_component_add_slice_collection_libraries(logging-client ASTSCF)
astscf_component_build_library(logging-client)
-target_link_libraries(logging-client astscf-api)
astscf_component_install(logging-client)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index 920ef6a..91de2d9 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -1,6 +1,5 @@
include_directories(../src)
include_directories(../../include)
-include_directories(${API_INCLUDE_DIR})
astscf_component_init(logging-client-test)
astscf_component_add_files(logging-client-test Logger-test.cpp)
@@ -9,9 +8,9 @@ astscf_component_add_files(logging-client-test LogBuf-test.cpp)
astscf_component_add_files(logging-client-test IceConfigurator-test.cpp)
astscf_component_add_files(logging-client-test client-test.cpp)
astscf_component_add_boost_libraries(logging-client-test unit_test_framework)
+astscf_component_add_slice_collection_libraries(logging-client-test ASTSCF)
astscf_component_build_standalone(logging-client-test)
target_link_libraries(logging-client-test logging-client)
-target_link_libraries(logging-client-test astscf-api)
astscf_test_boost(logging-client-test)
astscf_component_init(scf-log)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 7c0fb7e..a89a9e3 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -1,8 +1,7 @@
include_directories(../../include)
-include_directories(${API_INCLUDE_DIR})
astscf_component_init(logging-service-lib)
-# an icebox module cannot be used as a shared lib. so build the bulk of the
+# an icebox module cannot be used as a shared lib, so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
# the unit tests
astscf_set_libtype(logging-service-lib STATIC)
@@ -19,8 +18,9 @@ astscf_component_add_files(logging-service-lib Configuration.h)
astscf_component_add_slices(logging-service-lib PROJECT LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(logging-service-lib core)
astscf_component_add_ice_libraries(logging-service-lib IceStorm)
+astscf_component_add_slice_collection_libraries(logging-service-lib ASTSCF)
astscf_component_build_library(logging-service-lib)
-target_link_libraries(logging-service-lib astscf-api)
+target_link_libraries(logging-service-lib)
# This lib is compiled into a .so, so it needs -fPIC set
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 205f293..ad3bc6c 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -1,13 +1,13 @@
include_directories(../src)
include_directories(../../include)
-include_directories(${API_INCLUDE_DIR})
astscf_component_init(logging-service-test)
astscf_component_add_files(logging-service-test LoggingServer-test.cpp)
astscf_component_add_files(logging-service-test server-test.cpp)
astscf_component_add_boost_libraries(logging-service-test unit_test_framework)
+astscf_component_add_slice_collection_libraries(logging-service-test ASTSCF)
astscf_component_build_standalone(logging-service-test)
-target_link_libraries(logging-service-test astscf-api logging-service-lib)
+target_link_libraries(logging-service-test logging-service-lib)
astscf_test_boost(logging-service-test)
astscf_component_init(LoggingConfigurationTest)
@@ -16,6 +16,7 @@ astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.c
astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.h)
astscf_component_add_slices(LoggingConfigurationTest PROJECT LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework)
+astscf_component_add_slice_collection_libraries(LoggingConfigurationTest ASTSCF)
astscf_component_build_icebox(LoggingConfigurationTest)
-target_link_libraries(LoggingConfigurationTest astscf-api)
+target_link_libraries(LoggingConfigurationTest)
astscf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
commit aef8f5bb2a49ff17519e6131625f1e0f5a371f34
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:27 2011 -0500
Slice collections, and consistency of naming in various places.
* Support Slice file 'collections'.
* Make all Slice directories in repositories be called 'slice' and at the
top level in the repository, so the automatic 'PROJECT' collection will
be generated for them.
* Build ice-util-cpp and util-cpp as single libraries.
* Enable building and execution of ice-util-cpp top-level unit tests.
Conflicts:
cmake/example/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9ff8c2..70a5d58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,31 +1,10 @@
astscf_project(Logger 3.4)
-add_subdirectory(server)
-add_subdirectory(client)
-
-# The client component is built here, so as to be able to add files
-# from both src and include directories.
-
include_directories(include)
include_directories(${API_INCLUDE_DIR})
-astscf_component_init(logging-client)
-astscf_component_add_file(logging-client client/src/Logger.cpp)
-astscf_component_add_file(logging-client client/src/LoggerFactory.cpp)
-astscf_component_add_file(logging-client client/src/LogOut.cpp)
-astscf_component_add_file(logging-client client/src/IceConfigurator.cpp)
-astscf_component_add_file(logging-client client/src/IceLogger.cpp)
-astscf_component_add_file(logging-client client/src/OstreamLogger.cpp)
-astscf_component_add_file(logging-client client/src/IceConfigurator.h)
-astscf_component_add_file(logging-client include/AsteriskSCF/logger.h)
-astscf_component_add_file(logging-client include/AsteriskSCF/Logger/LogOut.h)
-astscf_component_add_file(logging-client include/AsteriskSCF/Logger/IceLogger.h)
-astscf_component_add_file(logging-client include/AsteriskSCF/Logger/Level.h)
-astscf_component_add_boost_libraries(logging-client thread date_time)
-astscf_component_add_ice_libraries(logging-client IceStorm)
-astscf_component_build_library(logging-client)
-target_link_libraries(logging-client asterisk-scf-api)
-astscf_component_install(logging-client)
+add_subdirectory(server)
+add_subdirectory(client)
astscf_headers_install(include/)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e672f72..3273627 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
diff --git a/client/src/CMakeLists.txt b/client/src/CMakeLists.txt
new file mode 100644
index 0000000..51ea521
--- /dev/null
+++ b/client/src/CMakeLists.txt
@@ -0,0 +1,17 @@
+astscf_component_init(logging-client)
+astscf_component_add_files(logging-client Logger.cpp)
+astscf_component_add_files(logging-client LoggerFactory.cpp)
+astscf_component_add_files(logging-client LogOut.cpp)
+astscf_component_add_files(logging-client IceConfigurator.cpp)
+astscf_component_add_files(logging-client IceLogger.cpp)
+astscf_component_add_files(logging-client OstreamLogger.cpp)
+astscf_component_add_files(logging-client IceConfigurator.h)
+astscf_component_add_files(logging-client ../../include/AsteriskSCF/logger.h)
+astscf_component_add_files(logging-client ../../include/AsteriskSCF/Logger/LogOut.h)
+astscf_component_add_files(logging-client ../../include/AsteriskSCF/Logger/IceLogger.h)
+astscf_component_add_files(logging-client ../../include/AsteriskSCF/Logger/Level.h)
+astscf_component_add_boost_libraries(logging-client thread date_time)
+astscf_component_add_ice_libraries(logging-client IceStorm)
+astscf_component_build_library(logging-client)
+target_link_libraries(logging-client astscf-api)
+astscf_component_install(logging-client)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index c0ae4a8..920ef6a 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -3,20 +3,19 @@ include_directories(../../include)
include_directories(${API_INCLUDE_DIR})
astscf_component_init(logging-client-test)
-astscf_component_add_file(logging-client-test Logger-test.cpp)
-astscf_component_add_file(logging-client-test LoggerFactory-test.cpp)
-astscf_component_add_file(logging-client-test LogBuf-test.cpp)
-astscf_component_add_file(logging-client-test IceConfigurator-test.cpp)
-astscf_component_add_file(logging-client-test client-test.cpp)
+astscf_component_add_files(logging-client-test Logger-test.cpp)
+astscf_component_add_files(logging-client-test LoggerFactory-test.cpp)
+astscf_component_add_files(logging-client-test LogBuf-test.cpp)
+astscf_component_add_files(logging-client-test IceConfigurator-test.cpp)
+astscf_component_add_files(logging-client-test client-test.cpp)
astscf_component_add_boost_libraries(logging-client-test unit_test_framework)
astscf_component_build_standalone(logging-client-test)
target_link_libraries(logging-client-test logging-client)
-target_link_libraries(logging-client-test asterisk-scf-api)
-
+target_link_libraries(logging-client-test astscf-api)
astscf_test_boost(logging-client-test)
astscf_component_init(scf-log)
-astscf_component_add_file(scf-log scf-log.cpp)
+astscf_component_add_files(scf-log scf-log.cpp)
astscf_component_add_boost_libraries(scf-log program_options)
astscf_component_build_standalone(scf-log)
target_link_libraries(scf-log logging-client)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 6fc1486..7c0fb7e 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -1,28 +1,26 @@
include_directories(../../include)
include_directories(${API_INCLUDE_DIR})
-astscf_slice_include_directories(${API_SLICE_DIR})
-
astscf_component_init(logging-service-lib)
# an icebox module cannot be used as a shared lib. so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
# the unit tests
astscf_set_libtype(logging-service-lib STATIC)
-astscf_component_add_file(logging-service-lib ChainedLogOut.cpp)
-astscf_component_add_file(logging-service-lib FileChainedLogOut.cpp)
-astscf_component_add_file(logging-service-lib LoggingServer.cpp)
-astscf_component_add_file(logging-service-lib OstreamChainedLogOut.cpp)
-astscf_component_add_file(logging-service-lib Configuration.cpp)
-astscf_component_add_file(logging-service-lib ChainedLogOut.h)
-astscf_component_add_file(logging-service-lib FileChainedLogOut.h)
-astscf_component_add_file(logging-service-lib OstreamChainedLogOut.h)
-astscf_component_add_file(logging-service-lib LoggingServer.h)
-astscf_component_add_file(logging-service-lib Configuration.h)
-astscf_component_add_slice(logging-service-lib ../local-slice/LoggingConfigurationIf.ice)
+astscf_component_add_files(logging-service-lib ChainedLogOut.cpp)
+astscf_component_add_files(logging-service-lib FileChainedLogOut.cpp)
+astscf_component_add_files(logging-service-lib LoggingServer.cpp)
+astscf_component_add_files(logging-service-lib OstreamChainedLogOut.cpp)
+astscf_component_add_files(logging-service-lib Configuration.cpp)
+astscf_component_add_files(logging-service-lib ChainedLogOut.h)
+astscf_component_add_files(logging-service-lib FileChainedLogOut.h)
+astscf_component_add_files(logging-service-lib OstreamChainedLogOut.h)
+astscf_component_add_files(logging-service-lib LoggingServer.h)
+astscf_component_add_files(logging-service-lib Configuration.h)
+astscf_component_add_slices(logging-service-lib PROJECT LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(logging-service-lib core)
astscf_component_add_ice_libraries(logging-service-lib IceStorm)
astscf_component_build_library(logging-service-lib)
-target_link_libraries(logging-service-lib asterisk-scf-api)
+target_link_libraries(logging-service-lib astscf-api)
# This lib is compiled into a .so, so it needs -fPIC set
if(CMAKE_COMPILER_IS_GNUCXX)
@@ -31,7 +29,7 @@ endif()
# icebox module
astscf_component_init(logging-service)
-astscf_component_add_file(logging-service main.cpp)
+astscf_component_add_files(logging-service main.cpp)
astscf_component_build_icebox(logging-service)
target_link_libraries(logging-service logging-service-lib)
astscf_component_install(logging-service)
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 2ba96e0..205f293 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -2,24 +2,20 @@ include_directories(../src)
include_directories(../../include)
include_directories(${API_INCLUDE_DIR})
-astscf_slice_include_directories(${API_SLICE_DIR})
-
astscf_component_init(logging-service-test)
-astscf_component_add_file(logging-service-test LoggingServer-test.cpp)
-astscf_component_add_file(logging-service-test server-test.cpp)
+astscf_component_add_files(logging-service-test LoggingServer-test.cpp)
+astscf_component_add_files(logging-service-test server-test.cpp)
astscf_component_add_boost_libraries(logging-service-test unit_test_framework)
astscf_component_build_standalone(logging-service-test)
-target_link_libraries(logging-service-test asterisk-scf-api)
-target_link_libraries(logging-service-test logging-service-lib)
+target_link_libraries(logging-service-test astscf-api logging-service-lib)
astscf_test_boost(logging-service-test)
astscf_component_init(LoggingConfigurationTest)
-astscf_component_add_file(LoggingConfigurationTest ConfigurationTest.cpp)
-astscf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
-astscf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.h)
-astscf_component_add_slice(LoggingConfigurationTest ../local-slice/LoggingConfigurationIf.ice)
+astscf_component_add_files(LoggingConfigurationTest ConfigurationTest.cpp)
+astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
+astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.h)
+astscf_component_add_slices(LoggingConfigurationTest PROJECT LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework)
astscf_component_build_icebox(LoggingConfigurationTest)
-target_link_libraries(LoggingConfigurationTest asterisk-scf-api)
-
+target_link_libraries(LoggingConfigurationTest astscf-api)
astscf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
diff --git a/server/local-slice/LoggingConfigurationIf.ice b/slice/LoggingConfigurationIf.ice
similarity index 100%
rename from server/local-slice/LoggingConfigurationIf.ice
rename to slice/LoggingConfigurationIf.ice
commit 4dfa3a17fcb66d956b329574832b60a4276ba5b2
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 3 15:20:33 2011 -0500
Accommodate change from ASTERISK_SCF_ICEBOX_EXPORT to ASTSCF_DLL_EXPORT.
diff --git a/client/src/IceConfigurator.h b/client/src/IceConfigurator.h
index 1742cb0..404a46e 100644
--- a/client/src/IceConfigurator.h
+++ b/client/src/IceConfigurator.h
@@ -37,15 +37,15 @@ public:
{
}
- ASTERISK_SCF_ICEBOX_EXPORT void configured(const Configuration& logConfiguration, const Ice::Current&);
- ASTERISK_SCF_ICEBOX_EXPORT void configured(const Configuration& logConfiguration);
+ ASTSCF_DLL_EXPORT void configured(const Configuration& logConfiguration, const Ice::Current&);
+ ASTSCF_DLL_EXPORT void configured(const Configuration& logConfiguration);
private:
LoggerFactory& mFactory;
};
typedef IceUtil::Handle<IceConfigurator> IceConfiguratorPtr;
-ASTERISK_SCF_ICEBOX_EXPORT IceConfiguratorPtr createIceConfigurator(const Ice::ObjectAdapterPtr& adapter,
+ASTSCF_DLL_EXPORT IceConfiguratorPtr createIceConfigurator(const Ice::ObjectAdapterPtr& adapter,
LoggerFactory& factory);
} // Logging
diff --git a/include/AsteriskSCF/Logger/IceLogger.h b/include/AsteriskSCF/Logger/IceLogger.h
index 3719f99..02b7169 100644
--- a/include/AsteriskSCF/Logger/IceLogger.h
+++ b/include/AsteriskSCF/Logger/IceLogger.h
@@ -111,7 +111,7 @@ typedef IceUtil::Handle<ConfiguredIceLogger> ConfiguredIceLoggerPtr;
* @param adapter ObjectAdapter to use for listening to the Discovery topic.
* @return Smart pointer to a new ConfiguredIceLogger. Will never return null.
*/
-ASTERISK_SCF_ICEBOX_EXPORT ConfiguredIceLoggerPtr createIceLogger(
+ASTSCF_DLL_EXPORT ConfiguredIceLoggerPtr createIceLogger(
const Ice::ObjectAdapterPtr& adapter);
} // Logging
diff --git a/include/AsteriskSCF/Logger/LogOut.h b/include/AsteriskSCF/Logger/LogOut.h
index 482612f..4a93165 100644
--- a/include/AsteriskSCF/Logger/LogOut.h
+++ b/include/AsteriskSCF/Logger/LogOut.h
@@ -33,8 +33,8 @@ namespace Logging
class LogOut
{
public:
- ASTERISK_SCF_ICEBOX_EXPORT virtual ~LogOut();
- ASTERISK_SCF_ICEBOX_EXPORT virtual void logs(const std::string& name, Level logLevel,
+ ASTSCF_DLL_EXPORT virtual ~LogOut();
+ ASTSCF_DLL_EXPORT virtual void logs(const std::string& name, Level logLevel,
const std::string& message) = 0;
};
diff --git a/include/AsteriskSCF/logger.h b/include/AsteriskSCF/logger.h
index 67065ab..800c7d9 100644
--- a/include/AsteriskSCF/logger.h
+++ b/include/AsteriskSCF/logger.h
@@ -44,15 +44,15 @@ namespace Logging
class LogBuf : public std::streambuf
{
public:
- ASTERISK_SCF_ICEBOX_EXPORT LogBuf(LogOut& out, const std::string& name, Level logLevel);
+ ASTSCF_DLL_EXPORT LogBuf(LogOut& out, const std::string& name, Level logLevel);
/**
* Copy ctor.
* @param orig Original.
*/
- ASTERISK_SCF_ICEBOX_EXPORT LogBuf(const LogBuf& orig);
+ ASTSCF_DLL_EXPORT LogBuf(const LogBuf& orig);
- ASTERISK_SCF_ICEBOX_EXPORT ~LogBuf();
+ ASTSCF_DLL_EXPORT ~LogBuf();
protected:
int overflow(int c);
@@ -235,16 +235,16 @@ public:
/**
* Construct a root Logger.
*/
- ASTERISK_SCF_ICEBOX_EXPORT LoggerImpl(const std::string& name, LogOut& out,
+ ASTSCF_DLL_EXPORT LoggerImpl(const std::string& name, LogOut& out,
Level logLevel = Debug);
/**
* Construct a child Logger.
*/
- ASTERISK_SCF_ICEBOX_EXPORT LoggerImpl(
+ ASTSCF_DLL_EXPORT LoggerImpl(
const boost::shared_ptr<LoggerImpl>& parent, const std::string& name);
- ASTERISK_SCF_ICEBOX_EXPORT ~LoggerImpl();
+ ASTSCF_DLL_EXPORT ~LoggerImpl();
/**
* If true, this Logger would log messages of the given Level.
@@ -263,12 +263,12 @@ public:
* @param level Level for messages sent to this stream.
* @return LogStream that logs at the given level.
*/
- ASTERISK_SCF_ICEBOX_EXPORT CondStream operator()(Level level) const;
+ ASTSCF_DLL_EXPORT CondStream operator()(Level level) const;
/**
* Log a single message.
*/
- ASTERISK_SCF_ICEBOX_EXPORT void logs(Level level, const std::string& message) const;
+ ASTSCF_DLL_EXPORT void logs(Level level, const std::string& message) const;
/**
* Log a single vprintf-formatted message.
@@ -276,11 +276,11 @@ public:
#ifdef __GNUC__
__attribute__((format(printf, 3, 0)))
#endif
- ASTERISK_SCF_ICEBOX_EXPORT void vlogf(Level level, char const *fmt, va_list ap) const;
+ ASTSCF_DLL_EXPORT void vlogf(Level level, char const *fmt, va_list ap) const;
- ASTERISK_SCF_ICEBOX_EXPORT Logger getChild(
+ ASTSCF_DLL_EXPORT Logger getChild(
const boost::shared_ptr<LoggerImpl>& self, const std::string& childName);
- ASTERISK_SCF_ICEBOX_EXPORT std::vector<Logger> getChildren() const;
+ ASTSCF_DLL_EXPORT std::vector<Logger> getChildren() const;
const std::string& getName() const
{
@@ -292,23 +292,23 @@ public:
return *mOut;
}
- ASTERISK_SCF_ICEBOX_EXPORT void setOutput(LogOut& out);
+ ASTSCF_DLL_EXPORT void setOutput(LogOut& out);
/**
* Set's the current logLevel. Until unsetLevel() is called, we are no
* longer affected by changes to our parent's log level.
*/
- ASTERISK_SCF_ICEBOX_EXPORT void setLevel(Level logLevel);
+ ASTSCF_DLL_EXPORT void setLevel(Level logLevel);
/**
* Changes our logLevel to now inherit from out parent.
*/
- ASTERISK_SCF_ICEBOX_EXPORT void unsetLevel();
+ ASTSCF_DLL_EXPORT void unsetLevel();
/**
* Returns the effective level of this Logger.
*/
- ASTERISK_SCF_ICEBOX_EXPORT Level getEffectiveLevel() const;
+ ASTSCF_DLL_EXPORT Level getEffectiveLevel() const;
private:
// non-copyable
@@ -442,7 +442,7 @@ inline Level Logger::getEffectiveLevel() const
class LoggerFactory
{
public:
- ASTERISK_SCF_ICEBOX_EXPORT LoggerFactory(LogOut& out);
+ ASTSCF_DLL_EXPORT LoggerFactory(LogOut& out);
/**
* Will get the Logger with the given name. If the Logger does not exist,
@@ -452,15 +452,15 @@ public:
* @return Ref to the Logger.
* @thread-safe
*/
- ASTERISK_SCF_ICEBOX_EXPORT Logger getLogger(const std::string& name);
+ ASTSCF_DLL_EXPORT Logger getLogger(const std::string& name);
/**
* Returns a vector of the names of all currently configured Logger's.
* @return Vector of Logger names.
*/
- ASTERISK_SCF_ICEBOX_EXPORT std::vector<std::string> getLoggerNames() const;
+ ASTSCF_DLL_EXPORT std::vector<std::string> getLoggerNames() const;
- ASTERISK_SCF_ICEBOX_EXPORT void setLogOutput(LogOut& out);
+ ASTSCF_DLL_EXPORT void setLogOutput(LogOut& out);
private:
Logger mRoot;
@@ -468,12 +468,12 @@ private:
static void accumulateLoggerNames(Logger logger, std::vector<std::string>& out);
};
-ASTERISK_SCF_ICEBOX_EXPORT boost::shared_ptr<LogOut> buildOstreamLogger(std::ostream& out);
+ASTSCF_DLL_EXPORT boost::shared_ptr<LogOut> buildOstreamLogger(std::ostream& out);
/**
* Returns the default configured LoggerFactory.
*/
-ASTERISK_SCF_ICEBOX_EXPORT LoggerFactory& getLoggerFactory();
+ASTSCF_DLL_EXPORT LoggerFactory& getLoggerFactory();
} // Logging
} // System
diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index 3d68d71..1d5536b 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -62,21 +62,21 @@ private:
class LoggingServerI : public LoggingServer
{
public:
- ASTERISK_SCF_ICEBOX_EXPORT LoggingServerI();
+ ASTSCF_DLL_EXPORT LoggingServerI();
- ASTERISK_SCF_ICEBOX_EXPORT void logs(const std::string&, Level,
+ ASTSCF_DLL_EXPORT void logs(const std::string&, Level,
const std::string&, const Ice::Current&) const;
Configuration getConfiguration(const Ice::Current&) const
{
return getConfiguration();
}
- ASTERISK_SCF_ICEBOX_EXPORT Configuration getConfiguration() const;
+ ASTSCF_DLL_EXPORT Configuration getConfiguration() const;
- ASTERISK_SCF_ICEBOX_EXPORT bool isEnabledFor(const std::string& name, Level level) const;
- ASTERISK_SCF_ICEBOX_EXPORT Level getEffectiveLevel(const std::string& name) const;
- ASTERISK_SCF_ICEBOX_EXPORT void setLevel(const std::string& name, Level level);
+ ASTSCF_DLL_EXPORT bool isEnabledFor(const std::string& name, Level level) const;
+ ASTSCF_DLL_EXPORT Level getEffectiveLevel(const std::string& name) const;
+ ASTSCF_DLL_EXPORT void setLevel(const std::string& name, Level level);
- ASTERISK_SCF_ICEBOX_EXPORT void configure(const ServerConfigurationListenerPrx& configurationListener, const Ice::PropertiesPtr& props);
+ ASTSCF_DLL_EXPORT void configure(const ServerConfigurationListenerPrx& configurationListener, const Ice::PropertiesPtr& props);
void removeLogOut(const boost::shared_ptr<ChainedLogOut> &out);
void addLogOut(const boost::shared_ptr<ChainedLogOut> &out);
diff --git a/server/src/main.cpp b/server/src/main.cpp
index f4c5cf7..1cc3ecc 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -186,7 +186,7 @@ void LoggingService::stop()
}
}
-extern "C" ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* createLoggingService(
+extern "C" ASTSCF_DLL_EXPORT IceBox::Service* createLoggingService(
Ice::CommunicatorPtr)
{
return new LoggingService;
diff --git a/server/test/ConfigurationTest.cpp b/server/test/ConfigurationTest.cpp
index 08a7dce..f0e9dcc 100644
--- a/server/test/ConfigurationTest.cpp
+++ b/server/test/ConfigurationTest.cpp
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(PurposefulSerialConflict)
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new LoggerConfigurationTest;
}
commit 6f5047143d4452ee0bf389a7c6db9a5229f66241
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 18:02:07 2011 -0500
Update to use 'astscf' prefix in CMake scripts instead of 'asterisk_scf'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc9bdf4..a9ff8c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-asterisk_scf_project(Logger 3.4)
+astscf_project(Logger 3.4)
add_subdirectory(server)
add_subdirectory(client)
@@ -9,24 +9,24 @@ add_subdirectory(client)
include_directories(include)
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_component_init(logging-client)
-asterisk_scf_component_add_file(logging-client client/src/Logger.cpp)
-asterisk_scf_component_add_file(logging-client client/src/LoggerFactory.cpp)
-asterisk_scf_component_add_file(logging-client client/src/LogOut.cpp)
-asterisk_scf_component_add_file(logging-client client/src/IceConfigurator.cpp)
-asterisk_scf_component_add_file(logging-client client/src/IceLogger.cpp)
-asterisk_scf_component_add_file(logging-client client/src/OstreamLogger.cpp)
-asterisk_scf_component_add_file(logging-client client/src/IceConfigurator.h)
-asterisk_scf_component_add_file(logging-client include/AsteriskSCF/logger.h)
-asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/LogOut.h)
-asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/IceLogger.h)
-asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/Level.h)
-asterisk_scf_component_add_boost_libraries(logging-client thread date_time)
-asterisk_scf_component_add_ice_libraries(logging-client IceStorm)
-asterisk_scf_component_build_library(logging-client)
+astscf_component_init(logging-client)
+astscf_component_add_file(logging-client client/src/Logger.cpp)
+astscf_component_add_file(logging-client client/src/LoggerFactory.cpp)
+astscf_component_add_file(logging-client client/src/LogOut.cpp)
+astscf_component_add_file(logging-client client/src/IceConfigurator.cpp)
+astscf_component_add_file(logging-client client/src/IceLogger.cpp)
+astscf_component_add_file(logging-client client/src/OstreamLogger.cpp)
+astscf_component_add_file(logging-client client/src/IceConfigurator.h)
+astscf_component_add_file(logging-client include/AsteriskSCF/logger.h)
+astscf_component_add_file(logging-client include/AsteriskSCF/Logger/LogOut.h)
+astscf_component_add_file(logging-client include/AsteriskSCF/Logger/IceLogger.h)
+astscf_component_add_file(logging-client include/AsteriskSCF/Logger/Level.h)
+astscf_component_add_boost_libraries(logging-client thread date_time)
+astscf_component_add_ice_libraries(logging-client IceStorm)
+astscf_component_build_library(logging-client)
target_link_libraries(logging-client asterisk-scf-api)
-asterisk_scf_component_install(logging-client)
+astscf_component_install(logging-client)
-asterisk_scf_headers_install(include/)
+astscf_headers_install(include/)
set(logger_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index 400625a..c0ae4a8 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -2,21 +2,21 @@ include_directories(../src)
include_directories(../../include)
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_component_init(logging-client-test)
-asterisk_scf_component_add_file(logging-client-test Logger-test.cpp)
-asterisk_scf_component_add_file(logging-client-test LoggerFactory-test.cpp)
-asterisk_scf_component_add_file(logging-client-test LogBuf-test.cpp)
-asterisk_scf_component_add_file(logging-client-test IceConfigurator-test.cpp)
-asterisk_scf_component_add_file(logging-client-test client-test.cpp)
-asterisk_scf_component_add_boost_libraries(logging-client-test unit_test_framework)
-asterisk_scf_component_build_standalone(logging-client-test)
+astscf_component_init(logging-client-test)
+astscf_component_add_file(logging-client-test Logger-test.cpp)
+astscf_component_add_file(logging-client-test LoggerFactory-test.cpp)
+astscf_component_add_file(logging-client-test LogBuf-test.cpp)
+astscf_component_add_file(logging-client-test IceConfigurator-test.cpp)
+astscf_component_add_file(logging-client-test client-test.cpp)
+astscf_component_add_boost_libraries(logging-client-test unit_test_framework)
+astscf_component_build_standalone(logging-client-test)
target_link_libraries(logging-client-test logging-client)
target_link_libraries(logging-client-test asterisk-scf-api)
-asterisk_scf_test_boost(logging-client-test)
+astscf_test_boost(logging-client-test)
-asterisk_scf_component_init(scf-log)
-asterisk_scf_component_add_file(scf-log scf-log.cpp)
-asterisk_scf_component_add_boost_libraries(scf-log program_options)
-asterisk_scf_component_build_standalone(scf-log)
+astscf_component_init(scf-log)
+astscf_component_add_file(scf-log scf-log.cpp)
+astscf_component_add_boost_libraries(scf-log program_options)
+astscf_component_build_standalone(scf-log)
target_link_libraries(scf-log logging-client)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index b0dbb03..6fc1486 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -1,27 +1,27 @@
include_directories(../../include)
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(logging-service-lib)
+astscf_component_init(logging-service-lib)
# an icebox module cannot be used as a shared lib. so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
# the unit tests
-asterisk_scf_set_libtype(logging-service-lib STATIC)
-asterisk_scf_component_add_file(logging-service-lib ChainedLogOut.cpp)
-asterisk_scf_component_add_file(logging-service-lib FileChainedLogOut.cpp)
-asterisk_scf_component_add_file(logging-service-lib LoggingServer.cpp)
-asterisk_scf_component_add_file(logging-service-lib OstreamChainedLogOut.cpp)
-asterisk_scf_component_add_file(logging-service-lib Configuration.cpp)
-asterisk_scf_component_add_file(logging-service-lib ChainedLogOut.h)
-asterisk_scf_component_add_file(logging-service-lib FileChainedLogOut.h)
-asterisk_scf_component_add_file(logging-service-lib OstreamChainedLogOut.h)
-asterisk_scf_component_add_file(logging-service-lib LoggingServer.h)
-asterisk_scf_component_add_file(logging-service-lib Configuration.h)
-asterisk_scf_component_add_slice(logging-service-lib ../local-slice/LoggingConfigurationIf.ice)
-asterisk_scf_component_add_boost_libraries(logging-service-lib core)
-asterisk_scf_component_add_ice_libraries(logging-service-lib IceStorm)
-asterisk_scf_component_build_library(logging-service-lib)
+astscf_set_libtype(logging-service-lib STATIC)
+astscf_component_add_file(logging-service-lib ChainedLogOut.cpp)
+astscf_component_add_file(logging-service-lib FileChainedLogOut.cpp)
+astscf_component_add_file(logging-service-lib LoggingServer.cpp)
+astscf_component_add_file(logging-service-lib OstreamChainedLogOut.cpp)
+astscf_component_add_file(logging-service-lib Configuration.cpp)
+astscf_component_add_file(logging-service-lib ChainedLogOut.h)
+astscf_component_add_file(logging-service-lib FileChainedLogOut.h)
+astscf_component_add_file(logging-service-lib OstreamChainedLogOut.h)
+astscf_component_add_file(logging-service-lib LoggingServer.h)
+astscf_component_add_file(logging-service-lib Configuration.h)
+astscf_component_add_slice(logging-service-lib ../local-slice/LoggingConfigurationIf.ice)
+astscf_component_add_boost_libraries(logging-service-lib core)
+astscf_component_add_ice_libraries(logging-service-lib IceStorm)
+astscf_component_build_library(logging-service-lib)
target_link_libraries(logging-service-lib asterisk-scf-api)
# This lib is compiled into a .so, so it needs -fPIC set
@@ -30,8 +30,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
endif()
# icebox module
-asterisk_scf_component_init(logging-service)
-asterisk_scf_component_add_file(logging-service main.cpp)
-asterisk_scf_component_build_icebox(logging-service)
+astscf_component_init(logging-service)
+astscf_component_add_file(logging-service main.cpp)
+astscf_component_build_icebox(logging-service)
target_link_libraries(logging-service logging-service-lib)
-asterisk_scf_component_install(logging-service)
+astscf_component_install(logging-service)
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 2c45ea8..2ba96e0 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -2,24 +2,24 @@ include_directories(../src)
include_directories(../../include)
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(logging-service-test)
-asterisk_scf_component_add_file(logging-service-test LoggingServer-test.cpp)
-asterisk_scf_component_add_file(logging-service-test server-test.cpp)
-asterisk_scf_component_add_boost_libraries(logging-service-test unit_test_framework)
-asterisk_scf_component_build_standalone(logging-service-test)
+astscf_component_init(logging-service-test)
+astscf_component_add_file(logging-service-test LoggingServer-test.cpp)
+astscf_component_add_file(logging-service-test server-test.cpp)
+astscf_component_add_boost_libraries(logging-service-test unit_test_framework)
+astscf_component_build_standalone(logging-service-test)
target_link_libraries(logging-service-test asterisk-scf-api)
target_link_libraries(logging-service-test logging-service-lib)
-asterisk_scf_test_boost(logging-service-test)
+astscf_test_boost(logging-service-test)
-asterisk_scf_component_init(LoggingConfigurationTest)
-asterisk_scf_component_add_file(LoggingConfigurationTest ConfigurationTest.cpp)
-asterisk_scf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
-asterisk_scf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.h)
-asterisk_scf_component_add_slice(LoggingConfigurationTest ../local-slice/LoggingConfigurationIf.ice)
-asterisk_scf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework)
-asterisk_scf_component_build_icebox(LoggingConfigurationTest)
+astscf_component_init(LoggingConfigurationTest)
+astscf_component_add_file(LoggingConfigurationTest ConfigurationTest.cpp)
+astscf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
+astscf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.h)
+astscf_component_add_slice(LoggingConfigurationTest ../local-slice/LoggingConfigurationIf.ice)
+astscf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework)
+astscf_component_build_icebox(LoggingConfigurationTest)
target_link_libraries(LoggingConfigurationTest asterisk-scf-api)
-asterisk_scf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
+astscf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
commit f861a6cec86aa87a3d08ec72b8ebbc084c3da6f7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 16:04:55 2011 -0500
Allow user to disable building of tests.
The CTest module offers a BUILD_TESTING option; if the user turns this option
off, we shouldn't bother building any of our tests.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 552439e..e672f72 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1 +1,3 @@
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 47f2510..3273627 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -1,2 +1,4 @@
add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
commit b8acb9323ba84cbd97fe01cd76780df10e0330c2
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 15:11:11 2011 -0500
Remove directories used for submodules.
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4efe8ad..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "cmake"]
- path = cmake
- url = git at git.asterisk.org:asterisk-scf/release/cmake
-[submodule "slice"]
- path = slice
- url = git at git.asterisk.org:asterisk-scf/integration/slice
diff --git a/cmake b/cmake
deleted file mode 160000
index 17066de..0000000
--- a/cmake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17066de364794f3befcdcca030ca31d349e83eea
diff --git a/slice b/slice
deleted file mode 160000
index 03ea08a..0000000
--- a/slice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
-----------------------------------------------------------------------
--
asterisk-scf/integration/logger.git
More information about the asterisk-scf-commits
mailing list