[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:01:48 UTC 2011
branch "master" has been updated
via eb46079c791efc15e8e5a94879375f170f2f1a6e (commit)
from df4537a88e8a9f42b3bb8e1c3030de31ef7a717a (commit)
Summary of changes:
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 +-
10 files changed, 29 insertions(+), 63 deletions(-)
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 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/release/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list