[asterisk-scf-commits] asterisk-scf/release/util-cpp.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Jun 1 17:14:28 CDT 2011
branch "master" has been updated
via feb44834eeda62145215217084a59e777eb8aa0c (commit)
via 19fc422eb703a3769561031fdbefe59a657f5a53 (commit)
from b30186c143e74a53ee0408f2a0220981adcada82 (commit)
Summary of changes:
CMakeLists.txt | 27 +++++++--------
StateMachine/CMakeLists.txt | 10 -----
StateMachine/src/CMakeLists.txt | 13 -------
StateMachine/test/CMakeLists.txt | 16 ---------
Threading/CMakeLists.txt | 36 --------------------
Threading/test/CMakeLists.txt | 24 -------------
.../AsteriskSCF/StateMachine/SimpleStateMachine.h | 0
.../AsteriskSCF/Threading/PausibleWorkQueue.h | 0
.../AsteriskSCF/Threading/SimpleWorkQueue.h | 0
.../AsteriskSCF/Threading/WorkQueue.h | 0
src/CMakeLists.txt | 2 +
src/StateMachine/CMakeLists.txt | 7 ++++
.../StateMachine}/SimpleStateMachine.cpp | 0
src/Threading/CMakeLists.txt | 10 +++++
.../src => src/Threading}/SimpleWorkQueue.cpp | 0
test/CMakeLists.txt | 2 +
test/StateMachine/CMakeLists.txt | 5 +++
.../StateMachine}/StateMachineTest.cpp | 0
test/Threading/CMakeLists.txt | 7 ++++
.../Threading}/SimpleWorkQueueTest.cpp | 0
20 files changed, 46 insertions(+), 113 deletions(-)
delete mode 100644 StateMachine/CMakeLists.txt
delete mode 100644 StateMachine/src/CMakeLists.txt
delete mode 100644 StateMachine/test/CMakeLists.txt
delete mode 100644 Threading/CMakeLists.txt
delete mode 100644 Threading/test/CMakeLists.txt
rename {StateMachine/include => include}/AsteriskSCF/StateMachine/SimpleStateMachine.h (100%)
rename {Threading/include => include}/AsteriskSCF/Threading/PausibleWorkQueue.h (100%)
rename {Threading/include => include}/AsteriskSCF/Threading/SimpleWorkQueue.h (100%)
rename {Threading/include => include}/AsteriskSCF/Threading/WorkQueue.h (100%)
create mode 100644 src/CMakeLists.txt
create mode 100644 src/StateMachine/CMakeLists.txt
rename {StateMachine/src => src/StateMachine}/SimpleStateMachine.cpp (100%)
create mode 100644 src/Threading/CMakeLists.txt
rename {Threading/src => src/Threading}/SimpleWorkQueue.cpp (100%)
create mode 100644 test/CMakeLists.txt
create mode 100644 test/StateMachine/CMakeLists.txt
rename {StateMachine/test => test/StateMachine}/StateMachineTest.cpp (100%)
create mode 100644 test/Threading/CMakeLists.txt
rename {Threading/test => test/Threading}/SimpleWorkQueueTest.cpp (100%)
- Log -----------------------------------------------------------------
commit feb44834eeda62145215217084a59e777eb8aa0c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 1 16:58:44 2011 -0500
More CMake script cleanup.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6580c7..9ef647c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
asterisk_scf_project(util-cpp 3.4)
-if (integrated_build STREQUAL "true")
- set(util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-endif()
+set(util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${API_INCLUDE_DIR})
diff --git a/src/StateMachine/CMakeLists.txt b/src/StateMachine/CMakeLists.txt
index bf02e01..0ed5b57 100644
--- a/src/StateMachine/CMakeLists.txt
+++ b/src/StateMachine/CMakeLists.txt
@@ -4,4 +4,4 @@ asterisk_scf_component_add_file(StateMachine ../../include/AsteriskSCF/StateMach
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 LIBRARY lib "State Machine" StateMachine ARCHIVE DESTINATION lib)
+asterisk_scf_component_install(StateMachine)
diff --git a/src/Threading/CMakeLists.txt b/src/Threading/CMakeLists.txt
index 800bc63..6fb7862 100644
--- a/src/Threading/CMakeLists.txt
+++ b/src/Threading/CMakeLists.txt
@@ -7,4 +7,4 @@ asterisk_scf_component_add_file(Threading SimpleWorkQueue.cpp)
asterisk_scf_component_add_boost_libraries(Threading core thread)
asterisk_scf_component_build_library(Threading)
target_link_libraries(Threading logging-client)
-asterisk_scf_component_install(Threading LIBRARY lib "Threading" Threading ARCHIVE DESTINATION lib)
+asterisk_scf_component_install(Threading)
commit 19fc422eb703a3769561031fdbefe59a657f5a53
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 1 16:31:08 2011 -0500
Reorganize this repository along the lines of the new ice-util-cpp structure.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eebab3a..e6580c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,15 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010, 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
+asterisk_scf_project(util-cpp 3.4)
+
if (integrated_build STREQUAL "true")
- set(util_cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
- set(util_cpp_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+ set(util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
endif()
-add_subdirectory(Threading)
-add_subdirectory(StateMachine)
+include_directories(include)
+include_directories(${API_INCLUDE_DIR})
+include_directories(${logger_dir}/include)
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+
+add_subdirectory(src)
+add_subdirectory(test)
+
+asterisk_scf_headers_install(include/)
diff --git a/StateMachine/CMakeLists.txt b/StateMachine/CMakeLists.txt
deleted file mode 100644
index 0042652..0000000
--- a/StateMachine/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010, 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-add_subdirectory(src)
-add_subdirectory(test)
\ No newline at end of file
diff --git a/StateMachine/test/CMakeLists.txt b/StateMachine/test/CMakeLists.txt
deleted file mode 100644
index f0d3884..0000000
--- a/StateMachine/test/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Create State Machine test project.
-asterisk_scf_component_init(StateMachineTest CXX)
-
-include_directories(../include)
-
-asterisk_scf_component_add_file(StateMachineTest StateMachineTest.cpp)
-
-asterisk_scf_component_add_boost_libraries(StateMachineTest unit_test_framework thread date_time)
-
-include_directories(${util_cpp_dir}/StateMachine/include)
-
-asterisk_scf_component_build_standalone(StateMachineTest)
-
-if(integrated_build STREQUAL "true")
- asterisk_scf_test_boost(StateMachineTest)
-endif()
diff --git a/Threading/CMakeLists.txt b/Threading/CMakeLists.txt
deleted file mode 100644
index f00c977..0000000
--- a/Threading/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010, 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-asterisk_scf_component_init(Threading CXX)
-
-include_directories(include)
-
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-
-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 src/SimpleWorkQueue.cpp)
-asterisk_scf_component_add_boost_libraries(Threading core thread)
-
-if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-
-include_directories(${logger_dir}/include)
-include_directories(${logger_dir}/client/src)
-include_directories(${API_INCLUDE_DIR})
-
-asterisk_scf_component_build_library(Threading)
-
-target_link_libraries(Threading logging-client)
-
-asterisk_scf_component_install(Threading LIBRARY lib "Threading" Threading ARCHIVE DESTINATION lib)
-
-add_subdirectory(test)
\ No newline at end of file
diff --git a/Threading/test/CMakeLists.txt b/Threading/test/CMakeLists.txt
deleted file mode 100644
index 79825f2..0000000
--- a/Threading/test/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Create State Machine test project.
-asterisk_scf_component_init(SimpleWorkQueueTest CXX)
-
-include_directories(../include)
-
-asterisk_scf_component_add_file(SimpleWorkQueueTest SimpleWorkQueueTest.cpp)
-
-asterisk_scf_component_add_boost_libraries(SimpleWorkQueueTest unit_test_framework)
-
-include_directories(${util_cpp_dir}/Threading/include)
-
-if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
-
-asterisk_scf_component_build_standalone(SimpleWorkQueueTest)
-target_link_libraries(SimpleWorkQueueTest logging-client)
-
-target_link_libraries(SimpleWorkQueueTest Threading)
-
-if(integrated_build STREQUAL "true")
- asterisk_scf_test_boost(SimpleWorkQueueTest)
-endif()
diff --git a/StateMachine/include/AsteriskSCF/StateMachine/SimpleStateMachine.h b/include/AsteriskSCF/StateMachine/SimpleStateMachine.h
similarity index 100%
rename from StateMachine/include/AsteriskSCF/StateMachine/SimpleStateMachine.h
rename to include/AsteriskSCF/StateMachine/SimpleStateMachine.h
diff --git a/Threading/include/AsteriskSCF/Threading/PausibleWorkQueue.h b/include/AsteriskSCF/Threading/PausibleWorkQueue.h
similarity index 100%
rename from Threading/include/AsteriskSCF/Threading/PausibleWorkQueue.h
rename to include/AsteriskSCF/Threading/PausibleWorkQueue.h
diff --git a/Threading/include/AsteriskSCF/Threading/SimpleWorkQueue.h b/include/AsteriskSCF/Threading/SimpleWorkQueue.h
similarity index 100%
rename from Threading/include/AsteriskSCF/Threading/SimpleWorkQueue.h
rename to include/AsteriskSCF/Threading/SimpleWorkQueue.h
diff --git a/Threading/include/AsteriskSCF/Threading/WorkQueue.h b/include/AsteriskSCF/Threading/WorkQueue.h
similarity index 100%
rename from Threading/include/AsteriskSCF/Threading/WorkQueue.h
rename to include/AsteriskSCF/Threading/WorkQueue.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..e68379d
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(StateMachine)
+add_subdirectory(Threading)
diff --git a/StateMachine/src/CMakeLists.txt b/src/StateMachine/CMakeLists.txt
similarity index 65%
rename from StateMachine/src/CMakeLists.txt
rename to src/StateMachine/CMakeLists.txt
index 98bd14f..bf02e01 100644
--- a/StateMachine/src/CMakeLists.txt
+++ b/src/StateMachine/CMakeLists.txt
@@ -1,13 +1,7 @@
-
-asterisk_scf_component_init(StateMachine CXX)
-
-include_directories(../include)
-
+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 ../../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 LIBRARY lib "State Machine" StateMachine ARCHIVE DESTINATION lib)
diff --git a/StateMachine/src/SimpleStateMachine.cpp b/src/StateMachine/SimpleStateMachine.cpp
similarity index 100%
rename from StateMachine/src/SimpleStateMachine.cpp
rename to src/StateMachine/SimpleStateMachine.cpp
diff --git a/src/Threading/CMakeLists.txt b/src/Threading/CMakeLists.txt
new file mode 100644
index 0000000..800bc63
--- /dev/null
+++ b/src/Threading/CMakeLists.txt
@@ -0,0 +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)
+target_link_libraries(Threading logging-client)
+asterisk_scf_component_install(Threading LIBRARY lib "Threading" Threading ARCHIVE DESTINATION lib)
diff --git a/Threading/src/SimpleWorkQueue.cpp b/src/Threading/SimpleWorkQueue.cpp
similarity index 100%
rename from Threading/src/SimpleWorkQueue.cpp
rename to src/Threading/SimpleWorkQueue.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 0000000..e68379d
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(StateMachine)
+add_subdirectory(Threading)
diff --git a/test/StateMachine/CMakeLists.txt b/test/StateMachine/CMakeLists.txt
new file mode 100644
index 0000000..e243501
--- /dev/null
+++ b/test/StateMachine/CMakeLists.txt
@@ -0,0 +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)
diff --git a/StateMachine/test/StateMachineTest.cpp b/test/StateMachine/StateMachineTest.cpp
similarity index 100%
rename from StateMachine/test/StateMachineTest.cpp
rename to test/StateMachine/StateMachineTest.cpp
diff --git a/test/Threading/CMakeLists.txt b/test/Threading/CMakeLists.txt
new file mode 100644
index 0000000..73d1de7
--- /dev/null
+++ b/test/Threading/CMakeLists.txt
@@ -0,0 +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)
+target_link_libraries(SimpleWorkQueueTest logging-client)
+target_link_libraries(SimpleWorkQueueTest Threading)
+asterisk_scf_test_boost(SimpleWorkQueueTest)
diff --git a/Threading/test/SimpleWorkQueueTest.cpp b/test/Threading/SimpleWorkQueueTest.cpp
similarity index 100%
rename from Threading/test/SimpleWorkQueueTest.cpp
rename to test/Threading/SimpleWorkQueueTest.cpp
-----------------------------------------------------------------------
--
asterisk-scf/release/util-cpp.git
More information about the asterisk-scf-commits
mailing list