[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "db2" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jun 21 13:46:55 CDT 2011
branch "db2" has been created
at 56b528b14638e626592bbe740f1086e96bfe6aef (commit)
- Log -----------------------------------------------------------------
commit 56b528b14638e626592bbe740f1086e96bfe6aef
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 accf48d..4a9c45f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ astscf_project(astscf-ice-util-cpp 3.4)
set(astscf-ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-include_directories(include)
include_directories(${logger_dir}/include)
add_subdirectory(src)
commit 8039a9686285c955e99623bfb50d51af15fb4340
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:54:34 2011 -0500
Add 'astscf' prefix to library name.
In order to ensure that Asterisk SCF libraries do not conflict with others
when installed, each library should have an 'astscf' prefix.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56c7240..accf48d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
-astscf_project(ice-util-cpp 3.4)
+astscf_project(astscf-ice-util-cpp 3.4)
-set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+set(astscf-ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${logger_dir}/include)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44cfc4b..082821e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,12 @@
-astscf_component_init(ice-util-cpp)
+astscf_component_init(astscf-ice-util-cpp)
file(GLOB_RECURSE project_headers ../include/*.h)
-astscf_component_add_files(ice-util-cpp ${project_headers})
+astscf_component_add_files(astscf-ice-util-cpp ${project_headers})
add_subdirectory(CollocatedIceStorm)
add_subdirectory(WorkQueue)
add_subdirectory(ThreadPool)
-astscf_component_add_ice_libraries(ice-util-cpp IceStorm IceBox)
-astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
-astscf_component_add_slice_collection_libraries(ice-util-cpp ASTSCF)
-astscf_component_build_library(ice-util-cpp)
-target_link_libraries(ice-util-cpp logging-client)
-astscf_component_install(ice-util-cpp)
+astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
+astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time)
+astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
+astscf_component_build_library(astscf-ice-util-cpp)
+target_link_libraries(astscf-ice-util-cpp logging-client)
+astscf_component_install(astscf-ice-util-cpp)
diff --git a/src/CollocatedIceStorm/CMakeLists.txt b/src/CollocatedIceStorm/CMakeLists.txt
index 7faa392..668f756 100644
--- a/src/CollocatedIceStorm/CMakeLists.txt
+++ b/src/CollocatedIceStorm/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(ice-util-cpp CollocatedIceStorm.cpp)
+astscf_component_add_files(astscf-ice-util-cpp CollocatedIceStorm.cpp)
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index e8fdad5..f16403e 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_files(ice-util-cpp ThreadPool.cpp)
-astscf_component_add_files(ice-util-cpp WorkerThread.cpp)
+astscf_component_add_files(astscf-ice-util-cpp ThreadPool.cpp)
+astscf_component_add_files(astscf-ice-util-cpp WorkerThread.cpp)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index 70fbe2c..a016def 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,3 +1,3 @@
-astscf_component_add_files(ice-util-cpp WorkQueue.cpp)
-astscf_component_add_files(ice-util-cpp SuspendableWorkQueue.cpp)
-astscf_component_add_files(ice-util-cpp DefaultQueueListener.cpp)
+astscf_component_add_files(astscf-ice-util-cpp WorkQueue.cpp)
+astscf_component_add_files(astscf-ice-util-cpp SuspendableWorkQueue.cpp)
+astscf_component_add_files(astscf-ice-util-cpp DefaultQueueListener.cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d4784bc..ef44216 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,18 +1,18 @@
-astscf_component_init(ice-util-cpp-test)
+astscf_component_init(astscf-ice-util-cpp-test)
astscf_slice_collection(LOCAL PATH .)
-astscf_component_add_slices(ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
-astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-astscf_component_add_files(ice-util-cpp-test UtilityTests.cpp)
-astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
-astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
-astscf_component_add_slice_collection_libraries(ice-util-cpp-test ASTSCF)
-astscf_component_build_icebox(ice-util-cpp-test)
-astscf_test_icebox(ice-util-cpp-test IceUtilCppTests.conf)
+astscf_component_add_slices(astscf-ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
+astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_files(astscf-ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_files(astscf-ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_files(astscf-ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_files(astscf-ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_files(astscf-ice-util-cpp-test UtilityTests.cpp)
+astscf_component_add_ice_libraries(astscf-ice-util-cpp-test IceBox)
+astscf_component_add_boost_libraries(astscf-ice-util-cpp-test unit_test_framework date_time thread)
+astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp-test ASTSCF)
+astscf_component_build_icebox(astscf-ice-util-cpp-test)
+astscf_test_icebox(astscf-ice-util-cpp-test IceUtilCppTests.conf)
add_subdirectory(Async)
add_subdirectory(Replication)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index e20835b..949333e 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -4,5 +4,5 @@ astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
astscf_component_add_slice_collection_libraries(ThreadPoolTest ASTSCF)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest ice-util-cpp)
+target_link_libraries(ThreadPoolTest astscf-ice-util-cpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index 5b37d9f..9a7abb5 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -4,7 +4,7 @@ astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
astscf_component_add_slice_collection_libraries(WorkQueueTest ASTSCF)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest ice-util-cpp)
+target_link_libraries(WorkQueueTest astscf-ice-util-cpp)
astscf_test_boost(WorkQueueTest)
astscf_component_init(SuspendableWorkQueueTest)
@@ -13,5 +13,5 @@ astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
astscf_component_add_slice_collection_libraries(SuspendableWorkQueueTest ASTSCF)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
+target_link_libraries(SuspendableWorkQueueTest astscf-ice-util-cpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit dca005359d6ebef1ec64a22cd27b6c98dce34fbd
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 97f4a13..56c7240 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ astscf_project(ice-util-cpp 3.4)
set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
-include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52679ea..44cfc4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(WorkQueue)
add_subdirectory(ThreadPool)
astscf_component_add_ice_libraries(ice-util-cpp IceStorm IceBox)
astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
+astscf_component_add_slice_collection_libraries(ice-util-cpp ASTSCF)
astscf_component_build_library(ice-util-cpp)
target_link_libraries(ice-util-cpp logging-client)
-target_link_libraries(ice-util-cpp astscf-api)
astscf_component_install(ice-util-cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1a9c251..d4784bc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
astscf_component_init(ice-util-cpp-test)
-astscf_slice_collection(local .)
-astscf_component_add_slices(ice-util-cpp-test local ProxyHelper/SimpleIf.ice)
+astscf_slice_collection(LOCAL PATH .)
+astscf_component_add_slices(ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
@@ -10,8 +10,8 @@ astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
astscf_component_add_files(ice-util-cpp-test UtilityTests.cpp)
astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
+astscf_component_add_slice_collection_libraries(ice-util-cpp-test ASTSCF)
astscf_component_build_icebox(ice-util-cpp-test)
-target_link_libraries(ice-util-cpp-test astscf-api)
astscf_test_icebox(ice-util-cpp-test IceUtilCppTests.conf)
add_subdirectory(Async)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 5eefb35..62758f2 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,9 +1,9 @@
astscf_component_init(StateReplicatorTest)
-astscf_slice_collection(local slice)
+astscf_slice_collection(LOCAL PATH slice)
astscf_component_add_files(StateReplicatorTest TestStateReplicator.cpp)
astscf_component_add_files(StateReplicatorTest SharedTestData.h)
astscf_component_add_files(StateReplicatorTest MockStateReplicatorListener.h)
-astscf_component_add_slices(StateReplicatorTest local StateReplicatorTestIf.ice)
+astscf_component_add_slices(StateReplicatorTest LOCAL StateReplicatorTestIf.ice)
astscf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
astscf_component_build_standalone(StateReplicatorTest)
astscf_test_boost(StateReplicatorTest)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index eb02604..e20835b 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -2,7 +2,7 @@ astscf_component_init(ThreadPoolTest)
astscf_component_add_files(ThreadPoolTest TestThreadPool.cpp)
astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
+astscf_component_add_slice_collection_libraries(ThreadPoolTest ASTSCF)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest astscf-api)
target_link_libraries(ThreadPoolTest ice-util-cpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index 9585e85..5b37d9f 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -2,8 +2,8 @@ astscf_component_init(WorkQueueTest)
astscf_component_add_files(WorkQueueTest TestWorkQueue.cpp)
astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
+astscf_component_add_slice_collection_libraries(WorkQueueTest ASTSCF)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest astscf-api)
target_link_libraries(WorkQueueTest ice-util-cpp)
astscf_test_boost(WorkQueueTest)
@@ -11,7 +11,7 @@ astscf_component_init(SuspendableWorkQueueTest)
astscf_component_add_files(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
+astscf_component_add_slice_collection_libraries(SuspendableWorkQueueTest ASTSCF)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest astscf-api)
target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit a215b14cccc535c3e770bc9af4760979b8d68e28
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 c710520..97f4a13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
-astscf_slice_include_directories(${API_SLICE_DIR})
add_subdirectory(src)
if(BUILD_TESTING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b60669..52679ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,38 +1,12 @@
-# Ice Utilities for C++
-
astscf_component_init(ice-util-cpp)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
-astscf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
-astscf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
-astscf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
-astscf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
-astscf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
-astscf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
-#
-# Note, strictly speaking this isn't for component development, but as it is part of this
-# library it sort of belongs here.
-#
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
-astscf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
-astscf_component_add_ice_libraries(ice-util-cpp IceStorm)
-astscf_component_add_ice_libraries(ice-util-cpp IceBox)
+file(GLOB_RECURSE project_headers ../include/*.h)
+astscf_component_add_files(ice-util-cpp ${project_headers})
+add_subdirectory(CollocatedIceStorm)
+add_subdirectory(WorkQueue)
+add_subdirectory(ThreadPool)
+astscf_component_add_ice_libraries(ice-util-cpp IceStorm IceBox)
astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
astscf_component_build_library(ice-util-cpp)
target_link_libraries(ice-util-cpp logging-client)
-target_link_libraries(ice-util-cpp asterisk-scf-api)
+target_link_libraries(ice-util-cpp astscf-api)
astscf_component_install(ice-util-cpp)
-
diff --git a/src/CollocatedIceStorm/CMakeLists.txt b/src/CollocatedIceStorm/CMakeLists.txt
new file mode 100644
index 0000000..7faa392
--- /dev/null
+++ b/src/CollocatedIceStorm/CMakeLists.txt
@@ -0,0 +1 @@
+astscf_component_add_files(ice-util-cpp CollocatedIceStorm.cpp)
diff --git a/src/IceUtilCpp.cpp b/src/IceUtilCpp.cpp
deleted file mode 100644
index d05edd5..0000000
--- a/src/IceUtilCpp.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Asterisk SCF -- An open-source communications framework.
- *
- * Copyright (C) 2010, Digium, Inc.
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk SCF project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE.txt file
- * at the top of the source tree.
- */
-#include <Ice/Ice.h>
-#include <AsteriskSCF/Utilities.h>
-
-//
-// This .cpp is a temporary solution to get a CMakeProject that consists only of header files.
-//
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index 476e3dd..e8fdad5 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,10 +1,2 @@
-astscf_component_init(ThreadPool)
-astscf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
-astscf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
-astscf_component_add_file(ThreadPool ThreadPool.cpp)
-astscf_component_add_file(ThreadPool WorkerThread.cpp)
-astscf_component_add_boost_libraries(ThreadPool thread date_time)
-astscf_component_build_library(ThreadPool)
-target_link_libraries(ThreadPool WorkQueue)
-target_link_libraries(ThreadPool asterisk-scf-api)
-astscf_component_install(ThreadPool)
+astscf_component_add_files(ice-util-cpp ThreadPool.cpp)
+astscf_component_add_files(ice-util-cpp WorkerThread.cpp)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index a80baa4..70fbe2c 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,11 +1,3 @@
-astscf_component_init(WorkQueue)
-astscf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
-astscf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
-astscf_component_add_file(WorkQueue ../include/AsteriskSCF/DefaultQueueListener.h)
-astscf_component_add_file(WorkQueue WorkQueue.cpp)
-astscf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
-astscf_component_add_file(WorkQueue DefaultQueueListener.cpp)
-astscf_component_add_boost_libraries(WorkQueue thread date_time)
-astscf_component_build_library(WorkQueue)
-target_link_libraries(WorkQueue asterisk-scf-api)
-astscf_component_install(WorkQueue)
+astscf_component_add_files(ice-util-cpp WorkQueue.cpp)
+astscf_component_add_files(ice-util-cpp SuspendableWorkQueue.cpp)
+astscf_component_add_files(ice-util-cpp DefaultQueueListener.cpp)
diff --git a/test/Async/CMakeLists.txt b/test/Async/CMakeLists.txt
index d61ae7d..9367567 100644
--- a/test/Async/CMakeLists.txt
+++ b/test/Async/CMakeLists.txt
@@ -1,8 +1,8 @@
astscf_component_init(ami-collector-test)
-astscf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
-astscf_component_add_file(ami-collector-test IceIntegration-test.cpp)
-astscf_component_add_file(ami-collector-test TestAmiCollector.h)
-astscf_component_add_file(ami-collector-test test.cpp)
+astscf_component_add_files(ami-collector-test ResponseCollector-test.cpp)
+astscf_component_add_files(ami-collector-test IceIntegration-test.cpp)
+astscf_component_add_files(ami-collector-test TestAmiCollector.h)
+astscf_component_add_files(ami-collector-test test.cpp)
astscf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
astscf_component_build_standalone(ami-collector-test)
astscf_test_boost(ami-collector-test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 084a866..1a9c251 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,16 +1,18 @@
astscf_component_init(ice-util-cpp-test)
-astscf_component_add_slice(ice-util-cpp-test ProxyHelper/SimpleIf.ice)
-astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-astscf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
+astscf_slice_collection(local .)
+astscf_component_add_slices(ice-util-cpp-test local ProxyHelper/SimpleIf.ice)
+astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_files(ice-util-cpp-test UtilityTests.cpp)
astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
astscf_component_build_icebox(ice-util-cpp-test)
-target_link_libraries(ice-util-cpp-test asterisk-scf-api)
+target_link_libraries(ice-util-cpp-test astscf-api)
+astscf_test_icebox(ice-util-cpp-test IceUtilCppTests.conf)
add_subdirectory(Async)
add_subdirectory(Replication)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 1abce94..5eefb35 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,8 +1,9 @@
astscf_component_init(StateReplicatorTest)
-astscf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
-astscf_component_add_file(StateReplicatorTest SharedTestData.h)
-astscf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
-astscf_component_add_slice(StateReplicatorTest ./slice/StateReplicatorTestIf.ice)
+astscf_slice_collection(local slice)
+astscf_component_add_files(StateReplicatorTest TestStateReplicator.cpp)
+astscf_component_add_files(StateReplicatorTest SharedTestData.h)
+astscf_component_add_files(StateReplicatorTest MockStateReplicatorListener.h)
+astscf_component_add_slices(StateReplicatorTest local StateReplicatorTestIf.ice)
astscf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
astscf_component_build_standalone(StateReplicatorTest)
astscf_test_boost(StateReplicatorTest)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index 6f7015c..eb02604 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -1,8 +1,8 @@
astscf_component_init(ThreadPoolTest)
-astscf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
-astscf_component_add_file(ThreadPoolTest test.cpp)
+astscf_component_add_files(ThreadPoolTest TestThreadPool.cpp)
+astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest asterisk-scf-api)
+target_link_libraries(ThreadPoolTest astscf-api)
target_link_libraries(ThreadPoolTest ice-util-cpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index cb4769b..9585e85 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -1,17 +1,17 @@
astscf_component_init(WorkQueueTest)
-astscf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
-astscf_component_add_file(WorkQueueTest test.cpp)
+astscf_component_add_files(WorkQueueTest TestWorkQueue.cpp)
+astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest asterisk-scf-api)
+target_link_libraries(WorkQueueTest astscf-api)
target_link_libraries(WorkQueueTest ice-util-cpp)
astscf_test_boost(WorkQueueTest)
astscf_component_init(SuspendableWorkQueueTest)
-astscf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
-astscf_component_add_file(SuspendableWorkQueueTest test2.cpp)
+astscf_component_add_files(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
+astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest asterisk-scf-api)
+target_link_libraries(SuspendableWorkQueueTest astscf-api)
target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit 4c7d07abae76081c71d2c3e3ba12be0366916aed
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/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h b/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h
index 02ea2b4..4cac3e1 100644
--- a/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h
+++ b/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h
@@ -32,7 +32,7 @@ namespace CollocatedIceStorm
* a separate process to access IceStorm services.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT CollocatedIceStorm : public IceUtil::Shared
+class ASTSCF_DLL_EXPORT CollocatedIceStorm : public IceUtil::Shared
{
public:
CollocatedIceStorm(const std::string&, const Ice::PropertiesPtr&);
diff --git a/include/AsteriskSCF/Testing/IceBoxBoostTest.h b/include/AsteriskSCF/Testing/IceBoxBoostTest.h
index 8819dc3..8e39521 100644
--- a/include/AsteriskSCF/Testing/IceBoxBoostTest.h
+++ b/include/AsteriskSCF/Testing/IceBoxBoostTest.h
@@ -78,7 +78,7 @@ public:
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new IceBoxTest;
}
diff --git a/include/AsteriskSCF/ThreadPool/ThreadPool.h b/include/AsteriskSCF/ThreadPool/ThreadPool.h
index 47e9527..93846c0 100644
--- a/include/AsteriskSCF/ThreadPool/ThreadPool.h
+++ b/include/AsteriskSCF/ThreadPool/ThreadPool.h
@@ -48,7 +48,7 @@ public:
* For more information on these methods, see
* AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
*/
-class ASTERISK_SCF_ICEBOX_EXPORT ThreadPoolFactory : public AsteriskSCF::System::ThreadPool::V1::PoolFactory
+class ASTSCF_DLL_EXPORT ThreadPoolFactory : public AsteriskSCF::System::ThreadPool::V1::PoolFactory
{
public:
ThreadPoolFactory();
diff --git a/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h b/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
index 01b4090..5d01d78 100644
--- a/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
+++ b/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
@@ -40,7 +40,7 @@ class DefaultQueueListenerPriv;
* as a matter of convenience.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
+class ASTSCF_DLL_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
{
public:
DefaultQueueListener(const AsteriskSCF::System::WorkQueue::V1::QueuePtr& queue);
diff --git a/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h b/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
index d2b79be..046b5cf 100644
--- a/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
+++ b/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
@@ -27,7 +27,7 @@ namespace WorkQueue
class SuspendableWorkQueuePriv;
-class ASTERISK_SCF_ICEBOX_EXPORT SuspendableWorkQueue : public AsteriskSCF::System::WorkQueue::V1::SuspendableQueue
+class ASTSCF_DLL_EXPORT SuspendableWorkQueue : public AsteriskSCF::System::WorkQueue::V1::SuspendableQueue
{
public:
SuspendableWorkQueue();
diff --git a/include/AsteriskSCF/WorkQueue/WorkQueue.h b/include/AsteriskSCF/WorkQueue/WorkQueue.h
index 0365537..598ef18 100644
--- a/include/AsteriskSCF/WorkQueue/WorkQueue.h
+++ b/include/AsteriskSCF/WorkQueue/WorkQueue.h
@@ -26,7 +26,7 @@ namespace WorkQueue
class WorkQueuePriv;
-class ASTERISK_SCF_ICEBOX_EXPORT WorkQueue : public AsteriskSCF::System::WorkQueue::V1::Queue
+class ASTSCF_DLL_EXPORT WorkQueue : public AsteriskSCF::System::WorkQueue::V1::Queue
{
public:
WorkQueue();
diff --git a/src/CollocatedIceStorm/CollocatedIceStorm.cpp b/src/CollocatedIceStorm/CollocatedIceStorm.cpp
index e3fe6c2..cd37418 100644
--- a/src/CollocatedIceStorm/CollocatedIceStorm.cpp
+++ b/src/CollocatedIceStorm/CollocatedIceStorm.cpp
@@ -69,7 +69,7 @@ CollocatedIceStorm::~CollocatedIceStorm()
}
}
-ASTERISK_SCF_ICEBOX_EXPORT void CollocatedIceStorm::stop()
+ASTSCF_DLL_EXPORT void CollocatedIceStorm::stop()
{
//
// NOTE: there isn't any mutex protection here. It can be added later if needed, but at the moment multiple threads
diff --git a/test/UtilityTests.cpp b/test/UtilityTests.cpp
index 1ce10c8..b3bf3ec 100644
--- a/test/UtilityTests.cpp
+++ b/test/UtilityTests.cpp
@@ -127,7 +127,7 @@ public:
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new AsteriskSCF::UtilityTests::TestService;
}
commit 2fcfaefe97cb6410798a8f953d1d0e8d3bc86c84
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 4973497..c710520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_project(ice-util-cpp 3.4)
+astscf_project(ice-util-cpp 3.4)
set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
-asterisk_scf_headers_install(include/)
+astscf_headers_install(include/)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6cc0d8..6b60669 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,38 +1,38 @@
# Ice Utilities for C++
-asterisk_scf_component_init(ice-util-cpp)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
-asterisk_scf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
-asterisk_scf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
-asterisk_scf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
-asterisk_scf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
-asterisk_scf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
-asterisk_scf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
+astscf_component_init(ice-util-cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
+astscf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
+astscf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
+astscf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
+astscf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
+astscf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
+astscf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
#
# Note, strictly speaking this isn't for component development, but as it is part of this
# library it sort of belongs here.
#
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
-asterisk_scf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
-asterisk_scf_component_add_ice_libraries(ice-util-cpp IceStorm)
-asterisk_scf_component_add_ice_libraries(ice-util-cpp IceBox)
-asterisk_scf_component_add_boost_libraries(ice-util-cpp core thread date_time)
-asterisk_scf_component_build_library(ice-util-cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
+astscf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
+astscf_component_add_ice_libraries(ice-util-cpp IceStorm)
+astscf_component_add_ice_libraries(ice-util-cpp IceBox)
+astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
+astscf_component_build_library(ice-util-cpp)
target_link_libraries(ice-util-cpp logging-client)
target_link_libraries(ice-util-cpp asterisk-scf-api)
-asterisk_scf_component_install(ice-util-cpp)
+astscf_component_install(ice-util-cpp)
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index f20e468..476e3dd 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,10 +1,10 @@
-asterisk_scf_component_init(ThreadPool)
-asterisk_scf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
-asterisk_scf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
-asterisk_scf_component_add_file(ThreadPool ThreadPool.cpp)
-asterisk_scf_component_add_file(ThreadPool WorkerThread.cpp)
-asterisk_scf_component_add_boost_libraries(ThreadPool thread date_time)
-asterisk_scf_component_build_library(ThreadPool)
+astscf_component_init(ThreadPool)
+astscf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
+astscf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
+astscf_component_add_file(ThreadPool ThreadPool.cpp)
+astscf_component_add_file(ThreadPool WorkerThread.cpp)
+astscf_component_add_boost_libraries(ThreadPool thread date_time)
+astscf_component_build_library(ThreadPool)
target_link_libraries(ThreadPool WorkQueue)
target_link_libraries(ThreadPool asterisk-scf-api)
-asterisk_scf_component_install(ThreadPool)
+astscf_component_install(ThreadPool)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index 6ca491d..a80baa4 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,11 +1,11 @@
-asterisk_scf_component_init(WorkQueue)
-asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
-asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
-asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/DefaultQueueListener.h)
-asterisk_scf_component_add_file(WorkQueue WorkQueue.cpp)
-asterisk_scf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
-asterisk_scf_component_add_file(WorkQueue DefaultQueueListener.cpp)
-asterisk_scf_component_add_boost_libraries(WorkQueue thread date_time)
-asterisk_scf_component_build_library(WorkQueue)
+astscf_component_init(WorkQueue)
+astscf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
+astscf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
+astscf_component_add_file(WorkQueue ../include/AsteriskSCF/DefaultQueueListener.h)
+astscf_component_add_file(WorkQueue WorkQueue.cpp)
+astscf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
+astscf_component_add_file(WorkQueue DefaultQueueListener.cpp)
+astscf_component_add_boost_libraries(WorkQueue thread date_time)
+astscf_component_build_library(WorkQueue)
target_link_libraries(WorkQueue asterisk-scf-api)
-asterisk_scf_component_install(WorkQueue)
+astscf_component_install(WorkQueue)
diff --git a/test/Async/CMakeLists.txt b/test/Async/CMakeLists.txt
index 5477439..d61ae7d 100644
--- a/test/Async/CMakeLists.txt
+++ b/test/Async/CMakeLists.txt
@@ -1,8 +1,8 @@
-asterisk_scf_component_init(ami-collector-test)
-asterisk_scf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
-asterisk_scf_component_add_file(ami-collector-test IceIntegration-test.cpp)
-asterisk_scf_component_add_file(ami-collector-test TestAmiCollector.h)
-asterisk_scf_component_add_file(ami-collector-test test.cpp)
-asterisk_scf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
-asterisk_scf_component_build_standalone(ami-collector-test)
-asterisk_scf_test_boost(ami-collector-test)
+astscf_component_init(ami-collector-test)
+astscf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
+astscf_component_add_file(ami-collector-test IceIntegration-test.cpp)
+astscf_component_add_file(ami-collector-test TestAmiCollector.h)
+astscf_component_add_file(ami-collector-test test.cpp)
+astscf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
+astscf_component_build_standalone(ami-collector-test)
+astscf_test_boost(ami-collector-test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b26ab49..084a866 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_component_init(ice-util-cpp-test)
-asterisk_scf_component_add_slice(ice-util-cpp-test ProxyHelper/SimpleIf.ice)
-asterisk_scf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-asterisk_scf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-asterisk_scf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-asterisk_scf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-asterisk_scf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-asterisk_scf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-asterisk_scf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
-asterisk_scf_component_add_ice_libraries(ice-util-cpp-test IceBox)
-asterisk_scf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
-asterisk_scf_component_build_icebox(ice-util-cpp-test)
+astscf_component_init(ice-util-cpp-test)
+astscf_component_add_slice(ice-util-cpp-test ProxyHelper/SimpleIf.ice)
+astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
+astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
+astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
+astscf_component_build_icebox(ice-util-cpp-test)
target_link_libraries(ice-util-cpp-test asterisk-scf-api)
add_subdirectory(Async)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 829e50d..1abce94 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,8 +1,8 @@
-asterisk_scf_component_init(StateReplicatorTest)
-asterisk_scf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
-asterisk_scf_component_add_file(StateReplicatorTest SharedTestData.h)
-asterisk_scf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
-asterisk_scf_component_add_slice(StateReplicatorTest ./slice/StateReplicatorTestIf.ice)
-asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
-asterisk_scf_component_build_standalone(StateReplicatorTest)
-asterisk_scf_test_boost(StateReplicatorTest)
+astscf_component_init(StateReplicatorTest)
+astscf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
+astscf_component_add_file(StateReplicatorTest SharedTestData.h)
+astscf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
+astscf_component_add_slice(StateReplicatorTest ./slice/StateReplicatorTestIf.ice)
+astscf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
+astscf_component_build_standalone(StateReplicatorTest)
+astscf_test_boost(StateReplicatorTest)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index ec1a786..6f7015c 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -1,8 +1,8 @@
-asterisk_scf_component_init(ThreadPoolTest)
-asterisk_scf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
-asterisk_scf_component_add_file(ThreadPoolTest test.cpp)
-asterisk_scf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
-asterisk_scf_component_build_standalone(ThreadPoolTest)
+astscf_component_init(ThreadPoolTest)
+astscf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
+astscf_component_add_file(ThreadPoolTest test.cpp)
+astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
+astscf_component_build_standalone(ThreadPoolTest)
target_link_libraries(ThreadPoolTest asterisk-scf-api)
target_link_libraries(ThreadPoolTest ice-util-cpp)
-asterisk_scf_test_boost(ThreadPoolTest)
+astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index c0006f4..cb4769b 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -1,17 +1,17 @@
-asterisk_scf_component_init(WorkQueueTest)
-asterisk_scf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
-asterisk_scf_component_add_file(WorkQueueTest test.cpp)
-asterisk_scf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
-asterisk_scf_component_build_standalone(WorkQueueTest)
+astscf_component_init(WorkQueueTest)
+astscf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
+astscf_component_add_file(WorkQueueTest test.cpp)
+astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
+astscf_component_build_standalone(WorkQueueTest)
target_link_libraries(WorkQueueTest asterisk-scf-api)
target_link_libraries(WorkQueueTest ice-util-cpp)
-asterisk_scf_test_boost(WorkQueueTest)
+astscf_test_boost(WorkQueueTest)
-asterisk_scf_component_init(SuspendableWorkQueueTest)
-asterisk_scf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
-asterisk_scf_component_add_file(SuspendableWorkQueueTest test2.cpp)
-asterisk_scf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
-asterisk_scf_component_build_standalone(SuspendableWorkQueueTest)
+astscf_component_init(SuspendableWorkQueueTest)
+astscf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
+astscf_component_add_file(SuspendableWorkQueueTest test2.cpp)
+astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
+astscf_component_build_standalone(SuspendableWorkQueueTest)
target_link_libraries(SuspendableWorkQueueTest asterisk-scf-api)
target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
-asterisk_scf_test_boost(SuspendableWorkQueueTest)
+astscf_test_boost(SuspendableWorkQueueTest)
commit a2ce516dc00012b7af5ce5e2b33880ea07d219cb
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/CMakeLists.txt b/CMakeLists.txt
index 3690011..4973497 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@ include_directories(${logger_dir}/include)
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
asterisk_scf_headers_install(include/)
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list