[asterisk-scf-commits] asterisk-scf/integration/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 3fb739a4e7ae3e804835148a09c5b15361ac3d8e (commit)
- Log -----------------------------------------------------------------
commit 3fb739a4e7ae3e804835148a09c5b15361ac3d8e
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 1d66e12..9d64218 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ astscf_project(util-cpp 3.4)
set(util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-include_directories(include)
include_directories(${logger_dir}/include)
add_subdirectory(src)
commit 0bb0b78c91a8bd0c50613ee3dc609b3624e32ff3
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:50:06 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/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e3cac6..803dee6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
-astscf_component_init(util-cpp)
+astscf_component_init(astscf-util-cpp)
file(GLOB_RECURSE project_headers ../include/*.h)
-astscf_component_add_files(util-cpp ${project_headers})
+astscf_component_add_files(astscf-util-cpp ${project_headers})
add_subdirectory(StateMachine)
add_subdirectory(Threading)
-astscf_component_add_ice_libraries(util-cpp IceStorm IceBox)
-astscf_component_add_boost_libraries(util-cpp core thread date_time)
-astscf_component_add_slice_collection_libraries(util-cpp ASTSCF)
-astscf_component_build_library(util-cpp)
-target_link_libraries(util-cpp logging-client)
-astscf_component_install(util-cpp)
+astscf_component_add_ice_libraries(astscf-util-cpp IceStorm IceBox)
+astscf_component_add_boost_libraries(astscf-util-cpp core thread date_time)
+astscf_component_add_slice_collection_libraries(astscf-util-cpp ASTSCF)
+astscf_component_build_library(astscf-util-cpp)
+target_link_libraries(astscf-util-cpp logging-client)
+astscf_component_install(astscf-util-cpp)
diff --git a/src/StateMachine/CMakeLists.txt b/src/StateMachine/CMakeLists.txt
index 15495cb..eb2698b 100644
--- a/src/StateMachine/CMakeLists.txt
+++ b/src/StateMachine/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_slices(util-cpp ASTSCF AsteriskSCF/System/Logger/LoggerIf.ice)
-astscf_component_add_files(util-cpp SimpleStateMachine.cpp)
+astscf_component_add_slices(astscf-util-cpp ASTSCF AsteriskSCF/System/Logger/LoggerIf.ice)
+astscf_component_add_files(astscf-util-cpp SimpleStateMachine.cpp)
diff --git a/src/Threading/CMakeLists.txt b/src/Threading/CMakeLists.txt
index c106ebc..63641d1 100644
--- a/src/Threading/CMakeLists.txt
+++ b/src/Threading/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_slices(util-cpp ASTSCF AsteriskSCF/System/Logger/LoggerIf.ice)
-astscf_component_add_files(util-cpp SimpleWorkQueue.cpp)
+astscf_component_add_slices(astscf-util-cpp ASTSCF AsteriskSCF/System/Logger/LoggerIf.ice)
+astscf_component_add_files(astscf-util-cpp SimpleWorkQueue.cpp)
diff --git a/test/Threading/CMakeLists.txt b/test/Threading/CMakeLists.txt
index fb9a5d8..da012d5 100644
--- a/test/Threading/CMakeLists.txt
+++ b/test/Threading/CMakeLists.txt
@@ -2,5 +2,5 @@ astscf_component_init(SimpleWorkQueueTest)
astscf_component_add_files(SimpleWorkQueueTest SimpleWorkQueueTest.cpp)
astscf_component_add_boost_libraries(SimpleWorkQueueTest unit_test_framework)
astscf_component_build_standalone(SimpleWorkQueueTest)
-target_link_libraries(SimpleWorkQueueTest logging-client util-cpp)
+target_link_libraries(SimpleWorkQueueTest logging-client astscf-util-cpp)
astscf_test_boost(SimpleWorkQueueTest)
commit 66f55188c0b2c7d01deacca72c4ec4cfb5300dd1
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 87b8f5f..1d66e12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ astscf_project(util-cpp 3.4)
set(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 4ec70bf..7e3cac6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(StateMachine)
add_subdirectory(Threading)
astscf_component_add_ice_libraries(util-cpp IceStorm IceBox)
astscf_component_add_boost_libraries(util-cpp core thread date_time)
+astscf_component_add_slice_collection_libraries(util-cpp ASTSCF)
astscf_component_build_library(util-cpp)
-target_link_libraries(util-cpp logging-client astscf-api)
+target_link_libraries(util-cpp logging-client)
astscf_component_install(util-cpp)
diff --git a/src/StateMachine/CMakeLists.txt b/src/StateMachine/CMakeLists.txt
index 8386835..15495cb 100644
--- a/src/StateMachine/CMakeLists.txt
+++ b/src/StateMachine/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_slices(util-cpp ASTSCF LoggerIf)
+astscf_component_add_slices(util-cpp ASTSCF AsteriskSCF/System/Logger/LoggerIf.ice)
astscf_component_add_files(util-cpp SimpleStateMachine.cpp)
diff --git a/src/Threading/CMakeLists.txt b/src/Threading/CMakeLists.txt
index 37e6197..c106ebc 100644
--- a/src/Threading/CMakeLists.txt
+++ b/src/Threading/CMakeLists.txt
@@ -1,3 +1,2 @@
-astscf_component_add_slices(util-cpp ASTSCF LoggerIf)
+astscf_component_add_slices(util-cpp ASTSCF AsteriskSCF/System/Logger/LoggerIf.ice)
astscf_component_add_files(util-cpp SimpleWorkQueue.cpp)
-
commit 0fa4cb4ac6ac89a52a573f5dd99c75904ec4f4f5
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 590f348..87b8f5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ set(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 e68379d..4ec70bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,2 +1,10 @@
+astscf_component_init(util-cpp)
+file(GLOB_RECURSE project_headers ../include/*.h)
+astscf_component_add_files(util-cpp ${project_headers})
add_subdirectory(StateMachine)
add_subdirectory(Threading)
+astscf_component_add_ice_libraries(util-cpp IceStorm IceBox)
+astscf_component_add_boost_libraries(util-cpp core thread date_time)
+astscf_component_build_library(util-cpp)
+target_link_libraries(util-cpp logging-client astscf-api)
+astscf_component_install(util-cpp)
diff --git a/src/StateMachine/CMakeLists.txt b/src/StateMachine/CMakeLists.txt
index 9f27af0..8386835 100644
--- a/src/StateMachine/CMakeLists.txt
+++ b/src/StateMachine/CMakeLists.txt
@@ -1,7 +1,2 @@
-astscf_component_init(StateMachine)
-astscf_component_add_slice(StateMachine LoggerIf)
-astscf_component_add_file(StateMachine ../../include/AsteriskSCF/StateMachine/SimpleStateMachine.h)
-astscf_component_add_file(StateMachine SimpleStateMachine.cpp)
-astscf_component_add_boost_libraries(StateMachine core)
-astscf_component_build_library(StateMachine)
-astscf_component_install(StateMachine)
+astscf_component_add_slices(util-cpp ASTSCF LoggerIf)
+astscf_component_add_files(util-cpp SimpleStateMachine.cpp)
diff --git a/src/Threading/CMakeLists.txt b/src/Threading/CMakeLists.txt
index 987023e..37e6197 100644
--- a/src/Threading/CMakeLists.txt
+++ b/src/Threading/CMakeLists.txt
@@ -1,10 +1,3 @@
-astscf_component_init(Threading)
-astscf_component_add_slice(Threading LoggerIf)
-astscf_component_add_file(Threading ../../include/AsteriskSCF/Threading/WorkQueue.h)
-astscf_component_add_file(Threading ../../include/AsteriskSCF/Threading/SimpleWorkQueue.h)
-astscf_component_add_file(Threading ../../include/AsteriskSCF/Threading/PausibleWorkQueue.h)
-astscf_component_add_file(Threading SimpleWorkQueue.cpp)
-astscf_component_add_boost_libraries(Threading core thread)
-astscf_component_build_library(Threading)
-target_link_libraries(Threading logging-client)
-astscf_component_install(Threading)
+astscf_component_add_slices(util-cpp ASTSCF LoggerIf)
+astscf_component_add_files(util-cpp SimpleWorkQueue.cpp)
+
diff --git a/test/StateMachine/CMakeLists.txt b/test/StateMachine/CMakeLists.txt
index a38eaf6..f49eee7 100644
--- a/test/StateMachine/CMakeLists.txt
+++ b/test/StateMachine/CMakeLists.txt
@@ -1,5 +1,5 @@
astscf_component_init(StateMachineTest)
-astscf_component_add_file(StateMachineTest StateMachineTest.cpp)
+astscf_component_add_files(StateMachineTest StateMachineTest.cpp)
astscf_component_add_boost_libraries(StateMachineTest unit_test_framework thread date_time)
astscf_component_build_standalone(StateMachineTest)
astscf_test_boost(StateMachineTest)
diff --git a/test/Threading/CMakeLists.txt b/test/Threading/CMakeLists.txt
index f6529ab..fb9a5d8 100644
--- a/test/Threading/CMakeLists.txt
+++ b/test/Threading/CMakeLists.txt
@@ -1,7 +1,6 @@
astscf_component_init(SimpleWorkQueueTest)
-astscf_component_add_file(SimpleWorkQueueTest SimpleWorkQueueTest.cpp)
+astscf_component_add_files(SimpleWorkQueueTest SimpleWorkQueueTest.cpp)
astscf_component_add_boost_libraries(SimpleWorkQueueTest unit_test_framework)
astscf_component_build_standalone(SimpleWorkQueueTest)
-target_link_libraries(SimpleWorkQueueTest logging-client)
-target_link_libraries(SimpleWorkQueueTest Threading)
+target_link_libraries(SimpleWorkQueueTest logging-client util-cpp)
astscf_test_boost(SimpleWorkQueueTest)
commit f5abb38121a0968d1359885d1b80cf38f3899496
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/Threading/PausibleWorkQueue.h b/include/AsteriskSCF/Threading/PausibleWorkQueue.h
index 153042a..f65c77b 100644
--- a/include/AsteriskSCF/Threading/PausibleWorkQueue.h
+++ b/include/AsteriskSCF/Threading/PausibleWorkQueue.h
@@ -25,7 +25,7 @@ namespace Threading
* is not derived, so implementations of this interface should derive from
* both WorkQueue and PausibleWorkQueue.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT PausibleWorkQueue
+class ASTSCF_DLL_EXPORT PausibleWorkQueue
{
public:
virtual bool isRunning() = 0;
diff --git a/include/AsteriskSCF/Threading/SimpleWorkQueue.h b/include/AsteriskSCF/Threading/SimpleWorkQueue.h
index a03be58..c25f353 100644
--- a/include/AsteriskSCF/Threading/SimpleWorkQueue.h
+++ b/include/AsteriskSCF/Threading/SimpleWorkQueue.h
@@ -34,7 +34,7 @@ namespace Threading
*/
class SimpleWorkQueuePriv;
-class ASTERISK_SCF_ICEBOX_EXPORT SimpleWorkQueue : public WorkQueue, public PausibleWorkQueue
+class ASTSCF_DLL_EXPORT SimpleWorkQueue : public WorkQueue, public PausibleWorkQueue
{
public:
diff --git a/include/AsteriskSCF/Threading/WorkQueue.h b/include/AsteriskSCF/Threading/WorkQueue.h
index 262b437..1f3301a 100644
--- a/include/AsteriskSCF/Threading/WorkQueue.h
+++ b/include/AsteriskSCF/Threading/WorkQueue.h
@@ -26,7 +26,7 @@ namespace Threading
* This class defines an interface to a work queue. A work queue manages one or
* more processing threads, and allows work to be enqueued.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT WorkQueue
+class ASTSCF_DLL_EXPORT WorkQueue
{
public:
commit 83b446c2d61a8fbfa36efd04f9be82779bef57da
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 ba223d6..590f348 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_project(util-cpp 3.4)
+astscf_project(util-cpp 3.4)
set(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/StateMachine/CMakeLists.txt b/src/StateMachine/CMakeLists.txt
index 0ed5b57..9f27af0 100644
--- a/src/StateMachine/CMakeLists.txt
+++ b/src/StateMachine/CMakeLists.txt
@@ -1,7 +1,7 @@
-asterisk_scf_component_init(StateMachine)
-asterisk_scf_component_add_slice(StateMachine LoggerIf)
-asterisk_scf_component_add_file(StateMachine ../../include/AsteriskSCF/StateMachine/SimpleStateMachine.h)
-asterisk_scf_component_add_file(StateMachine SimpleStateMachine.cpp)
-asterisk_scf_component_add_boost_libraries(StateMachine core)
-asterisk_scf_component_build_library(StateMachine)
-asterisk_scf_component_install(StateMachine)
+astscf_component_init(StateMachine)
+astscf_component_add_slice(StateMachine LoggerIf)
+astscf_component_add_file(StateMachine ../../include/AsteriskSCF/StateMachine/SimpleStateMachine.h)
+astscf_component_add_file(StateMachine SimpleStateMachine.cpp)
+astscf_component_add_boost_libraries(StateMachine core)
+astscf_component_build_library(StateMachine)
+astscf_component_install(StateMachine)
diff --git a/src/Threading/CMakeLists.txt b/src/Threading/CMakeLists.txt
index 6fb7862..987023e 100644
--- a/src/Threading/CMakeLists.txt
+++ b/src/Threading/CMakeLists.txt
@@ -1,10 +1,10 @@
-asterisk_scf_component_init(Threading)
-asterisk_scf_component_add_slice(Threading LoggerIf)
-asterisk_scf_component_add_file(Threading ../../include/AsteriskSCF/Threading/WorkQueue.h)
-asterisk_scf_component_add_file(Threading ../../include/AsteriskSCF/Threading/SimpleWorkQueue.h)
-asterisk_scf_component_add_file(Threading ../../include/AsteriskSCF/Threading/PausibleWorkQueue.h)
-asterisk_scf_component_add_file(Threading SimpleWorkQueue.cpp)
-asterisk_scf_component_add_boost_libraries(Threading core thread)
-asterisk_scf_component_build_library(Threading)
+astscf_component_init(Threading)
+astscf_component_add_slice(Threading LoggerIf)
+astscf_component_add_file(Threading ../../include/AsteriskSCF/Threading/WorkQueue.h)
+astscf_component_add_file(Threading ../../include/AsteriskSCF/Threading/SimpleWorkQueue.h)
+astscf_component_add_file(Threading ../../include/AsteriskSCF/Threading/PausibleWorkQueue.h)
+astscf_component_add_file(Threading SimpleWorkQueue.cpp)
+astscf_component_add_boost_libraries(Threading core thread)
+astscf_component_build_library(Threading)
target_link_libraries(Threading logging-client)
-asterisk_scf_component_install(Threading)
+astscf_component_install(Threading)
diff --git a/test/StateMachine/CMakeLists.txt b/test/StateMachine/CMakeLists.txt
index e243501..a38eaf6 100644
--- a/test/StateMachine/CMakeLists.txt
+++ b/test/StateMachine/CMakeLists.txt
@@ -1,5 +1,5 @@
-asterisk_scf_component_init(StateMachineTest)
-asterisk_scf_component_add_file(StateMachineTest StateMachineTest.cpp)
-asterisk_scf_component_add_boost_libraries(StateMachineTest unit_test_framework thread date_time)
-asterisk_scf_component_build_standalone(StateMachineTest)
-asterisk_scf_test_boost(StateMachineTest)
+astscf_component_init(StateMachineTest)
+astscf_component_add_file(StateMachineTest StateMachineTest.cpp)
+astscf_component_add_boost_libraries(StateMachineTest unit_test_framework thread date_time)
+astscf_component_build_standalone(StateMachineTest)
+astscf_test_boost(StateMachineTest)
diff --git a/test/Threading/CMakeLists.txt b/test/Threading/CMakeLists.txt
index 73d1de7..f6529ab 100644
--- a/test/Threading/CMakeLists.txt
+++ b/test/Threading/CMakeLists.txt
@@ -1,7 +1,7 @@
-asterisk_scf_component_init(SimpleWorkQueueTest)
-asterisk_scf_component_add_file(SimpleWorkQueueTest SimpleWorkQueueTest.cpp)
-asterisk_scf_component_add_boost_libraries(SimpleWorkQueueTest unit_test_framework)
-asterisk_scf_component_build_standalone(SimpleWorkQueueTest)
+astscf_component_init(SimpleWorkQueueTest)
+astscf_component_add_file(SimpleWorkQueueTest SimpleWorkQueueTest.cpp)
+astscf_component_add_boost_libraries(SimpleWorkQueueTest unit_test_framework)
+astscf_component_build_standalone(SimpleWorkQueueTest)
target_link_libraries(SimpleWorkQueueTest logging-client)
target_link_libraries(SimpleWorkQueueTest Threading)
-asterisk_scf_test_boost(SimpleWorkQueueTest)
+astscf_test_boost(SimpleWorkQueueTest)
commit fee6f7f4d27f57f3e8ddba42f7d4833f76722e9e
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 9ef647c..ba223d6 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/util-cpp.git
More information about the asterisk-scf-commits
mailing list