[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "single-api-lib" updated.

[Commits to the Asterisk SCF project code repositories]

branch "single-api-lib" has been updated
       via  5856f238c481a0db13b58d08807604374a550907 (commit)
      from  285b25605ba5ca2c6ccd3ff1d77a8e547529cc4a (commit)

Summary of changes:
 CMakeSubDirs.txt           |    5 +----
 local-slice/CMakeLists.txt |    5 -----
 src/CMakeLists.txt         |   27 +++++++++------------------
 3 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 local-slice/CMakeLists.txt


- Log -----------------------------------------------------------------
commit 5856f238c481a0db13b58d08807604374a550907
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 12 19:06:34 2011 -0600

    Building a single API library.

diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
index 6ad9e82..5325451 100644
--- a/CMakeSubDirs.txt
+++ b/CMakeSubDirs.txt
@@ -1,8 +1,5 @@
-
-add_subdirectory(local-slice)
-
 # Add our component's source code 
 add_subdirectory(src)
 
 # Pull in the test suite
-add_subdirectory(test)
\ No newline at end of file
+add_subdirectory(test)
diff --git a/local-slice/CMakeLists.txt b/local-slice/CMakeLists.txt
deleted file mode 100644
index a886e38..0000000
--- a/local-slice/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Compile SIP Session Manager Component's own slice
-asterisk_scf_slice_include_directories("${CMAKE_SOURCE_DIR}/slice") 
-asterisk_scf_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipSessionManager)
-asterisk_scf_compile_slice(SipStateReplicationIf.ice lib "SIP State Replicator" SipSessionManager)
-#asterisk_scf_compile_slice(SipConfigurationIf.ice lib "SIP Configuration Slice Types" SipSessionManager)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e69dc6a..b5002c1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,19 +1,10 @@
 # Define the SIP Session Manager component
 
-asterisk_scf_component_init(SipSessionManager CXX)
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
-asterisk_scf_component_add_slice(SipSessionManager RoutingIf)
-asterisk_scf_component_add_slice(SipSessionManager ServiceLocatorIf)
-asterisk_scf_component_add_slice(SipSessionManager EndpointIf)
-asterisk_scf_component_add_slice(SipSessionManager ComponentServiceIf)
-asterisk_scf_component_add_slice(SipSessionManager MediaIf)
-asterisk_scf_component_add_slice(SipSessionManager MediaRTPIf)
-asterisk_scf_component_add_slice(SipSessionManager SessionCommunicationsIf)
-asterisk_scf_component_add_slice(SipSessionManager SipStateReplicationIf)
-asterisk_scf_component_add_slice(SipSessionManager ReplicaIf)
+asterisk_scf_component_init(SipSessionManager CXX)
 
 # Add our component's own slice types.
-asterisk_scf_component_add_slice(SipSessionManager SipIf)
 
 asterisk_scf_component_add_file(SipSessionManager SipSessionManagerApp.cpp)
 asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEventPublisher.cpp)
@@ -38,6 +29,9 @@ asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModuleConstruction
 asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModule.h)
 asterisk_scf_component_add_file(SipSessionManager SipStateReplicatorListener.cpp)
 asterisk_scf_component_add_file(SipSessionManager SipStateReplicator.h)
+asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipIf.ice)
+asterisk_scf_component_add_slice(SipSessionManager
+    ../local-slice/SipStateReplicationIf.ice)
 
 asterisk_scf_component_add_ice_libraries(SipSessionManager IceStorm)
 
@@ -61,12 +55,6 @@ pjproject_link(SipSessionManager pjlib)
 
 asterisk_scf_component_init(SipStateReplicator CXX)
 
-asterisk_scf_component_add_slice(SipStateReplicator ServiceLocatorIf)
-asterisk_scf_component_add_slice(SipStateReplicator ComponentServiceIf)
-asterisk_scf_component_add_slice(SipStateReplicator SipIf)
-asterisk_scf_component_add_slice(SipStateReplicator SipStateReplicationIf)
-asterisk_scf_component_add_slice(SipStateReplicator RoutingIf)
-asterisk_scf_component_add_slice(SipStateReplicator MediaRTPIf)
 
 #This line allows us to use the templated state replicator
 #code from the SIP component. This statement is not the most
@@ -74,15 +62,18 @@ asterisk_scf_component_add_slice(SipStateReplicator MediaRTPIf)
 #structured in the way that gitall structures them.
 include_directories(${utils_dir}/StateReplicator/include)
 include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${API_INCLUDE_DIR})
 
 asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
 asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
-#asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.cpp)
+asterisk_scf_component_add_slice(SipStateReplicator
+    ../local-slice/SipStateReplicationIf.ice)
 
 asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
 asterisk_scf_component_add_boost_libraries(SipStateReplicator thread date_time)
 
 asterisk_scf_component_build_icebox(SipStateReplicator)
 target_link_libraries(SipStateReplicator logging-client)
+target_link_libraries(SipStateReplicator asterisk-scf-api)
 
 #asterisk_scf_component_install(SipStateReplicator RUNTIME bin "Sip State Replicator" SipStateReplicator)

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git