[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "ami-collector" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:46:00 UTC 2011
branch "ami-collector" has been updated
via 3dc960f2824e3f491443a1ba06abddfeb7c6e2fa (commit)
via 566a99492be4eb33bc0d89c2424021b3bee948c8 (commit)
via eb46079c791efc15e8e5a94879375f170f2f1a6e (commit)
from e0583da22e08670880bd69a3cd2d060ddd1652c9 (commit)
Summary of changes:
AmiCollector/CMakeLists.txt | 11 +++++++-
.../{src => include/AsteriskSCF}/AmiCollector.h | 2 +-
.../AsteriskSCF}/ResponseCollector.h | 0
AmiCollector/src/AmiCollector.cpp | 2 +-
AmiCollector/src/CMakeLists.txt | 6 ----
AmiCollector/test/IceIntegration-test.cpp | 3 +-
AmiCollector/test/ResponseCollector-test.cpp | 2 +-
AmiCollector/test/TestAmiCollector.h | 2 +-
SmartProxy/CMakeLists.txt | 26 ++++++++++---------
.../{src => include/AsteriskSCF}/SmartProxy.h | 4 +-
SmartProxy/src/CMakeLists.txt | 21 ----------------
SmartProxy/src/SmartProxy.cpp | 2 +-
StateReplicator/CMakeLists.txt | 20 ++++++---------
.../{src => include/AsteriskSCF}/StateReplicator.h | 0
StateReplicator/src/CMakeLists.txt | 12 ---------
StateReplicator/src/StateReplicator.cpp | 2 +-
StateReplicator/test/CMakeLists.txt | 2 +-
StateReplicator/test/TestStateReplicator.cpp | 3 +-
18 files changed, 45 insertions(+), 75 deletions(-)
rename AmiCollector/{src => include/AsteriskSCF}/AmiCollector.h (98%)
rename AmiCollector/{src => include/AsteriskSCF}/ResponseCollector.h (100%)
delete mode 100644 AmiCollector/src/CMakeLists.txt
rename SmartProxy/{src => include/AsteriskSCF}/SmartProxy.h (98%)
delete mode 100644 SmartProxy/src/CMakeLists.txt
rename StateReplicator/{src => include/AsteriskSCF}/StateReplicator.h (100%)
delete mode 100644 StateReplicator/src/CMakeLists.txt
- Log -----------------------------------------------------------------
commit 3dc960f2824e3f491443a1ba06abddfeb7c6e2fa
Author: David M. Lee <dlee at digium.com>
Date: Fri Jan 7 15:45:35 2011 -0600
Fixed AmiCollector for include file changes.
diff --git a/AmiCollector/CMakeLists.txt b/AmiCollector/CMakeLists.txt
index 47f2510..b5e6420 100644
--- a/AmiCollector/CMakeLists.txt
+++ b/AmiCollector/CMakeLists.txt
@@ -1,2 +1,11 @@
-add_subdirectory(src)
+asterisk_scf_component_init(ami-collector CXX)
+
+include_directories(include)
+
+asterisk_scf_component_add_file(ami-collector include/AsteriskSCF/AmiCollector.h)
+asterisk_scf_component_add_file(ami-collector include/AsteriskSCF/ResponseCollector.h)
+asterisk_scf_component_add_file(ami-collector src/AmiCollector.cpp)
+
+asterisk_scf_component_build_library(ami-collector)
+
add_subdirectory(test)
diff --git a/AmiCollector/src/AmiCollector.h b/AmiCollector/include/AsteriskSCF/AmiCollector.h
similarity index 98%
rename from AmiCollector/src/AmiCollector.h
rename to AmiCollector/include/AsteriskSCF/AmiCollector.h
index 892a136..cd703c3 100644
--- a/AmiCollector/src/AmiCollector.h
+++ b/AmiCollector/include/AsteriskSCF/AmiCollector.h
@@ -22,7 +22,7 @@
#include <IceUtil/Handle.h>
#include <IceUtil/Shared.h>
-#include "ResponseCollector.h"
+#include <AsteriskSCF/ResponseCollector.h>
namespace AsteriskSCF
{
diff --git a/AmiCollector/src/ResponseCollector.h b/AmiCollector/include/AsteriskSCF/ResponseCollector.h
similarity index 100%
rename from AmiCollector/src/ResponseCollector.h
rename to AmiCollector/include/AsteriskSCF/ResponseCollector.h
diff --git a/AmiCollector/src/AmiCollector.cpp b/AmiCollector/src/AmiCollector.cpp
index a5e4797..c0244fe 100644
--- a/AmiCollector/src/AmiCollector.cpp
+++ b/AmiCollector/src/AmiCollector.cpp
@@ -14,4 +14,4 @@
* at the top of the source tree.
*/
-#include "AmiCollector.h"
+#include <AsteriskSCF/AmiCollector.h>
diff --git a/AmiCollector/src/CMakeLists.txt b/AmiCollector/src/CMakeLists.txt
deleted file mode 100644
index 319aea0..0000000
--- a/AmiCollector/src/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-asterisk_scf_component_init(ami-collector CXX)
-
-asterisk_scf_component_add_file(ami-collector AmiCollector.h)
-asterisk_scf_component_add_file(ami-collector AmiCollector.cpp)
-
-asterisk_scf_component_build_library(ami-collector)
diff --git a/AmiCollector/test/IceIntegration-test.cpp b/AmiCollector/test/IceIntegration-test.cpp
index 343ef1e..06ba168 100644
--- a/AmiCollector/test/IceIntegration-test.cpp
+++ b/AmiCollector/test/IceIntegration-test.cpp
@@ -20,7 +20,8 @@
#include <Ice/Proxy.h>
#include <boost/test/unit_test.hpp>
-#include "AmiCollector.h"
+#include <AsteriskSCF/AmiCollector.h>
+
#include "TestAmiCollector.h"
using namespace AsteriskSCF::IceUtil;
diff --git a/AmiCollector/test/ResponseCollector-test.cpp b/AmiCollector/test/ResponseCollector-test.cpp
index 34bb0f3..63f7403 100644
--- a/AmiCollector/test/ResponseCollector-test.cpp
+++ b/AmiCollector/test/ResponseCollector-test.cpp
@@ -16,7 +16,7 @@
#include <boost/test/unit_test.hpp>
-#include "ResponseCollector.h"
+#include <AsteriskSCF/ResponseCollector.h>
using namespace AsteriskSCF;
diff --git a/AmiCollector/test/TestAmiCollector.h b/AmiCollector/test/TestAmiCollector.h
index 11ae789..b714f13 100644
--- a/AmiCollector/test/TestAmiCollector.h
+++ b/AmiCollector/test/TestAmiCollector.h
@@ -17,7 +17,7 @@
#include <boost/thread/condition_variable.hpp>
#include <IceUtil/Handle.h>
-#include "AmiCollector.h"
+#include <AsteriskSCF/AmiCollector.h>
namespace AsteriskSCF
{
commit 566a99492be4eb33bc0d89c2424021b3bee948c8
Merge: e0583da eb46079
Author: David M. Lee <dlee at digium.com>
Date: Fri Jan 7 15:29:55 2011 -0600
Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/ice-util-cpp into ami-collector
commit eb46079c791efc15e8e5a94879375f170f2f1a6e
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 14:50:45 2011 -0600
Adjust #includes to use <> and prefix paths with AsteriskSCF.
diff --git a/SmartProxy/CMakeLists.txt b/SmartProxy/CMakeLists.txt
index 1667914..e7ae3c4 100644
--- a/SmartProxy/CMakeLists.txt
+++ b/SmartProxy/CMakeLists.txt
@@ -6,22 +6,24 @@
# All rights reserved.
#
-# State Replicator build system
+# Smart Proxy build system
-if(NOT integrated_build STREQUAL "true")
+asterisk_scf_component_init(SmartProxy CXX)
- # Minimum we require is 2.6
- cmake_minimum_required(VERSION 2.6)
+include_directories(include)
- # Include common Asterisk SCF build infrastructure. Make sure your submodules are pulled.
- include(cmake/AsteriskSCF.cmake)
+asterisk_scf_component_add_slice(SmartProxy ServiceLocatorIf)
+asterisk_scf_component_add_file(SmartProxy include/AsteriskSCF/SmartProxy.h)
+asterisk_scf_component_add_file(SmartProxy src/SmartProxy.cpp)
+asterisk_scf_component_add_boost_libraries(SmartProxy core)
- # This project is C++ based and requires a minimum of 3.4 of Ice.
- asterisk_scf_project(SipChannelService 3.4 CXX)
+if(NOT logger_dir)
+ message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/include)
- # Pull in the slice definitions
- #add_subdirectory(slice)
+asterisk_scf_component_build_library(SmartProxy)
-endif()
+target_link_libraries(SmartProxy logging-client)
-add_subdirectory(src)
+asterisk_scf_component_install(SmartProxy LIBRARY lib "Smart Proxy" SmartProxy ARCHIVE DESTINATION lib)
\ No newline at end of file
diff --git a/SmartProxy/src/SmartProxy.h b/SmartProxy/include/AsteriskSCF/SmartProxy.h
similarity index 98%
rename from SmartProxy/src/SmartProxy.h
rename to SmartProxy/include/AsteriskSCF/SmartProxy.h
index e7b6bc9..27b8961 100644
--- a/SmartProxy/src/SmartProxy.h
+++ b/SmartProxy/include/AsteriskSCF/SmartProxy.h
@@ -19,9 +19,9 @@
#include <Ice/Ice.h>
#include <IceUtil/Mutex.h>
+#include <AsteriskSCF/logger.h>
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "logger.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
namespace AsteriskSCF
{
diff --git a/SmartProxy/src/CMakeLists.txt b/SmartProxy/src/CMakeLists.txt
deleted file mode 100644
index af426fb..0000000
--- a/SmartProxy/src/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Define the SIP Channel Service component
-
-asterisk_scf_component_init(SmartProxy CXX)
-
-asterisk_scf_component_add_slice(SmartProxy ServiceLocatorIf)
-asterisk_scf_component_add_file(SmartProxy SmartProxy.h)
-asterisk_scf_component_add_file(SmartProxy SmartProxy.cpp)
-asterisk_scf_component_add_boost_libraries(SmartProxy core)
-
-if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/common)
-include_directories(${logger_dir}/client/src)
-
-asterisk_scf_component_build_library(SmartProxy)
-
-target_link_libraries(SmartProxy logging-client)
-
-asterisk_scf_component_install(SmartProxy LIBRARY lib "Smart Proxy" SmartProxy ARCHIVE DESTINATION lib)
-
diff --git a/SmartProxy/src/SmartProxy.cpp b/SmartProxy/src/SmartProxy.cpp
index d4e7c45..2ebb5d7 100644
--- a/SmartProxy/src/SmartProxy.cpp
+++ b/SmartProxy/src/SmartProxy.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include "SmartProxy.h"
+#include <AsteriskSCF/SmartProxy.h>
namespace AsteriskSCF
{
diff --git a/StateReplicator/CMakeLists.txt b/StateReplicator/CMakeLists.txt
index 174c6df..098efcb 100644
--- a/StateReplicator/CMakeLists.txt
+++ b/StateReplicator/CMakeLists.txt
@@ -8,23 +8,19 @@
# State Replicator build system
-if(NOT integrated_build STREQUAL "true")
+asterisk_scf_component_init(StateReplicator CXX)
- # Minimum we require is 2.6
- cmake_minimum_required(VERSION 2.6)
+include_directories(include)
- # Include common Asterisk SCF build infrastructure. Make sure your submodules are pulled.
- include(cmake/AsteriskSCF.cmake)
+asterisk_scf_component_add_file(StateReplicator include/AsteriskSCF/StateReplicator.h)
+asterisk_scf_component_add_file(StateReplicator src/StateReplicator.cpp)
+asterisk_scf_component_add_boost_libraries(StateReplicator thread)
+
+asterisk_scf_component_build_library(StateReplicator)
- # This project is C++ based and requires a minimum of 3.4 of Ice.
- asterisk_scf_project(SipChannelService 3.4 CXX)
+asterisk_scf_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
- # Pull in the slice definitions
- #add_subdirectory(slice)
-endif()
-
-add_subdirectory(src)
add_subdirectory(testslice)
add_subdirectory(test)
diff --git a/StateReplicator/src/StateReplicator.h b/StateReplicator/include/AsteriskSCF/StateReplicator.h
similarity index 100%
rename from StateReplicator/src/StateReplicator.h
rename to StateReplicator/include/AsteriskSCF/StateReplicator.h
diff --git a/StateReplicator/src/CMakeLists.txt b/StateReplicator/src/CMakeLists.txt
deleted file mode 100644
index 3eb7d57..0000000
--- a/StateReplicator/src/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Define the state replicator template component
-
-asterisk_scf_component_init(StateReplicator CXX)
-
-asterisk_scf_component_add_file(StateReplicator StateReplicator.h)
-asterisk_scf_component_add_file(StateReplicator StateReplicator.cpp)
-asterisk_scf_component_add_boost_libraries(StateReplicator thread)
-
-asterisk_scf_component_build_library(StateReplicator)
-
-asterisk_scf_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
-
diff --git a/StateReplicator/src/StateReplicator.cpp b/StateReplicator/src/StateReplicator.cpp
index a2b6af7..dfe1241 100644
--- a/StateReplicator/src/StateReplicator.cpp
+++ b/StateReplicator/src/StateReplicator.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include "StateReplicator.h"
+#include <AsteriskSCF/StateReplicator.h>
namespace AsteriskSCF
{
diff --git a/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index 673a9cd..e00b507 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/test/CMakeLists.txt
@@ -1,7 +1,7 @@
# Create State Replicator Test project.
asterisk_scf_component_init(StateReplicatorTest CXX)
-include_directories("../src")
+include_directories("../include")
asterisk_scf_component_add_slice(StateReplicatorTest StateReplicatorTestIf)
asterisk_scf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
asterisk_scf_component_add_file(StateReplicatorTest SharedTestData.h)
diff --git a/StateReplicator/test/TestStateReplicator.cpp b/StateReplicator/test/TestStateReplicator.cpp
index 4b46e1e..759a18a 100644
--- a/StateReplicator/test/TestStateReplicator.cpp
+++ b/StateReplicator/test/TestStateReplicator.cpp
@@ -21,8 +21,9 @@
#include <Ice/Ice.h>
+#include <AsteriskSCF/StateReplicator.h>
+
#include "StateReplicatorTestIf.h"
-#include "StateReplicator.h"
#include "SharedTestData.h"
using namespace std;
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list