[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 14 18:59:09 CDT 2010
branch "master" has been updated
via 8f9a2d44e753c944d4c4610aae387d5923daac09 (commit)
from 62d6bb3a5885d5035bb79399e1495c4b0de92570 (commit)
Summary of changes:
CMakeLists.txt | 4 +-
cmake | 2 +-
local-slice/CMakeLists.txt | 8 ++--
slice | 2 +-
src/CMakeLists.txt | 110 ++++++++++++++++++++--------------------
src/SipChannelServiceApp.cpp | 2 +-
src/SipStateReplicatorApp.cpp | 2 +-
7 files changed, 65 insertions(+), 65 deletions(-)
- Log -----------------------------------------------------------------
commit 8f9a2d44e753c944d4c4610aae387d5923daac09
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 19:00:33 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc34139..9f00737 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure. Make sure your submodules are pulled.
+ # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled.
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4 of Ice.
- hydra_project(SipChannelService 3.4 CXX)
+ asterisk_scf_project(SipChannelService 3.4 CXX)
# Include pjproject build integration
include(cmake/modules/pjproject.cmake)
diff --git a/cmake b/cmake
index 17066de..cd39ae8 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 17066de364794f3befcdcca030ca31d349e83eea
+Subproject commit cd39ae824f03a19dc934709caee21e930f3b9988
diff --git a/local-slice/CMakeLists.txt b/local-slice/CMakeLists.txt
index 11fc349..11cd75b 100644
--- a/local-slice/CMakeLists.txt
+++ b/local-slice/CMakeLists.txt
@@ -1,5 +1,5 @@
# Compile SIP Channel Service Component's own slice
-hydra_slice_include_directories("${CMAKE_SOURCE_DIR}/slice")
-hydra_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipChannelService)
-hydra_compile_slice(SipStateReplicationIf.ice lib "SIP State Replicator" SipChannelService)
-#hydra_compile_slice(SipConfigurationIf.ice lib "SIP Configuration Slice Types" SipChannelService)
+asterisk_scf_slice_include_directories("${CMAKE_SOURCE_DIR}/slice")
+asterisk_scf_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipChannelService)
+asterisk_scf_compile_slice(SipStateReplicationIf.ice lib "SIP State Replicator" SipChannelService)
+#asterisk_scf_compile_slice(SipConfigurationIf.ice lib "SIP Configuration Slice Types" SipChannelService)
diff --git a/slice b/slice
index 0c62939..bdfc399 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 0c629393e2f05dc0ed43bcc6305880949df36289
+Subproject commit bdfc399d5876152d46be8b47cd4122abca1d2ed3
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ecef775..5b77b71 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,47 +1,47 @@
# Define the SIP Channel Service component
-hydra_component_init(SipChannelService CXX)
-
-hydra_component_add_slice(SipChannelService RoutingIf)
-hydra_component_add_slice(SipChannelService ServiceLocatorIf)
-hydra_component_add_slice(SipChannelService EndpointIf)
-hydra_component_add_slice(SipChannelService ComponentServiceIf)
-hydra_component_add_slice(SipChannelService MediaIf)
-hydra_component_add_slice(SipChannelService MediaRTPIf)
-hydra_component_add_slice(SipChannelService SessionCommunicationsIf)
-hydra_component_add_slice(SipChannelService SipStateReplicationIf)
-hydra_component_add_slice(SipChannelService ReplicaIf)
+asterisk_scf_component_init(SipChannelService CXX)
+
+asterisk_scf_component_add_slice(SipChannelService RoutingIf)
+asterisk_scf_component_add_slice(SipChannelService ServiceLocatorIf)
+asterisk_scf_component_add_slice(SipChannelService EndpointIf)
+asterisk_scf_component_add_slice(SipChannelService ComponentServiceIf)
+asterisk_scf_component_add_slice(SipChannelService MediaIf)
+asterisk_scf_component_add_slice(SipChannelService MediaRTPIf)
+asterisk_scf_component_add_slice(SipChannelService SessionCommunicationsIf)
+asterisk_scf_component_add_slice(SipChannelService SipStateReplicationIf)
+asterisk_scf_component_add_slice(SipChannelService ReplicaIf)
# Add our component's own slice types.
-hydra_component_add_slice(SipChannelService SipIf)
-
-hydra_component_add_file(SipChannelService SipChannelServiceApp.cpp)
-hydra_component_add_file(SipChannelService SipChannelServiceEventPublisher.cpp)
-hydra_component_add_file(SipChannelService SipChannelServiceEventPublisher.h)
-hydra_component_add_file(SipChannelService SipChannelServiceEndpointLocator.cpp)
-hydra_component_add_file(SipChannelService SipChannelServiceEndpointLocator.h)
-hydra_component_add_file(SipChannelService SipEndpointFactory.cpp)
-hydra_component_add_file(SipChannelService SipEndpointFactory.h)
-hydra_component_add_file(SipChannelService SipEndpoint.cpp)
-hydra_component_add_file(SipChannelService SipEndpoint.h)
-hydra_component_add_file(SipChannelService SipSession.cpp)
-hydra_component_add_file(SipChannelService SipSession.h)
-hydra_component_add_file(SipChannelService PJSipManager.cpp)
-hydra_component_add_file(SipChannelService PJSipManager.h)
-hydra_component_add_file(SipChannelService PJSipModule.cpp)
-hydra_component_add_file(SipChannelService PJSipModule.h)
-hydra_component_add_file(SipChannelService PJSipSessionModule.cpp)
-hydra_component_add_file(SipChannelService PJSipSessionModuleConstruction.cpp)
-hydra_component_add_file(SipChannelService PJSipSessionModule.h)
-hydra_component_add_file(SipChannelService PJSipLoggingModule.cpp)
-hydra_component_add_file(SipChannelService PJSipLoggingModuleConstruction.cpp)
-hydra_component_add_file(SipChannelService PJSipLoggingModule.h)
-hydra_component_add_file(SipChannelService SipStateReplicatorListener.cpp)
-hydra_component_add_file(SipChannelService SipStateReplicator.h)
-
-hydra_component_add_ice_libraries(SipChannelService IceStorm)
-
-hydra_component_add_boost_libraries(SipChannelService thread core)
+asterisk_scf_component_add_slice(SipChannelService SipIf)
+
+asterisk_scf_component_add_file(SipChannelService SipChannelServiceApp.cpp)
+asterisk_scf_component_add_file(SipChannelService SipChannelServiceEventPublisher.cpp)
+asterisk_scf_component_add_file(SipChannelService SipChannelServiceEventPublisher.h)
+asterisk_scf_component_add_file(SipChannelService SipChannelServiceEndpointLocator.cpp)
+asterisk_scf_component_add_file(SipChannelService SipChannelServiceEndpointLocator.h)
+asterisk_scf_component_add_file(SipChannelService SipEndpointFactory.cpp)
+asterisk_scf_component_add_file(SipChannelService SipEndpointFactory.h)
+asterisk_scf_component_add_file(SipChannelService SipEndpoint.cpp)
+asterisk_scf_component_add_file(SipChannelService SipEndpoint.h)
+asterisk_scf_component_add_file(SipChannelService SipSession.cpp)
+asterisk_scf_component_add_file(SipChannelService SipSession.h)
+asterisk_scf_component_add_file(SipChannelService PJSipManager.cpp)
+asterisk_scf_component_add_file(SipChannelService PJSipManager.h)
+asterisk_scf_component_add_file(SipChannelService PJSipModule.cpp)
+asterisk_scf_component_add_file(SipChannelService PJSipModule.h)
+asterisk_scf_component_add_file(SipChannelService PJSipSessionModule.cpp)
+asterisk_scf_component_add_file(SipChannelService PJSipSessionModuleConstruction.cpp)
+asterisk_scf_component_add_file(SipChannelService PJSipSessionModule.h)
+asterisk_scf_component_add_file(SipChannelService PJSipLoggingModule.cpp)
+asterisk_scf_component_add_file(SipChannelService PJSipLoggingModuleConstruction.cpp)
+asterisk_scf_component_add_file(SipChannelService PJSipLoggingModule.h)
+asterisk_scf_component_add_file(SipChannelService SipStateReplicatorListener.cpp)
+asterisk_scf_component_add_file(SipChannelService SipStateReplicator.h)
+
+asterisk_scf_component_add_ice_libraries(SipChannelService IceStorm)
+
+asterisk_scf_component_add_boost_libraries(SipChannelService thread core)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -49,7 +49,7 @@ endif()
include_directories(${logger_dir}/common)
include_directories(${logger_dir}/client/src)
-hydra_component_build_icebox(SipChannelService)
+asterisk_scf_component_build_icebox(SipChannelService)
target_link_libraries(SipChannelService logging-client)
@@ -58,16 +58,16 @@ pjproject_link(SipChannelService pjmedia)
pjproject_link(SipChannelService pjlib-util)
pjproject_link(SipChannelService pjlib)
-#hydra_component_install(SipChannelService RUNTIME bin "SIP Channel Service" SipChannelService)
+#asterisk_scf_component_install(SipChannelService RUNTIME bin "SIP Channel Service" SipChannelService)
-hydra_component_init(SipStateReplicator CXX)
+asterisk_scf_component_init(SipStateReplicator CXX)
-hydra_component_add_slice(SipStateReplicator ServiceLocatorIf)
-hydra_component_add_slice(SipStateReplicator ComponentServiceIf)
-hydra_component_add_slice(SipStateReplicator SipIf)
-hydra_component_add_slice(SipStateReplicator SipStateReplicationIf)
-hydra_component_add_slice(SipStateReplicator RoutingIf)
-hydra_component_add_slice(SipStateReplicator MediaRTPIf)
+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
@@ -75,13 +75,13 @@ hydra_component_add_slice(SipStateReplicator MediaRTPIf)
#structured in the way that gitall structures them.
include_directories(../../statereplicator/src)
-hydra_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
-hydra_component_add_file(SipStateReplicator SipStateReplicator.h)
-#hydra_component_add_file(SipStateReplicator SipStateReplicator.cpp)
+asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
+asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
+#asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.cpp)
-hydra_component_add_ice_libraries(SipStateReplicator IceStorm)
+asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
-hydra_component_build_icebox(SipStateReplicator)
+asterisk_scf_component_build_icebox(SipStateReplicator)
target_link_libraries(SipStateReplicator logging-client)
-#hydra_component_install(SipStateReplicator RUNTIME bin "Sip State Replicator" SipStateReplicator)
+#asterisk_scf_component_install(SipStateReplicator RUNTIME bin "Sip State Replicator" SipStateReplicator)
diff --git a/src/SipChannelServiceApp.cpp b/src/SipChannelServiceApp.cpp
index 6a831bc..ee7497d 100644
--- a/src/SipChannelServiceApp.cpp
+++ b/src/SipChannelServiceApp.cpp
@@ -588,7 +588,7 @@ void SipChannelService::stop()
extern "C"
{
-HYDRA_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new SipChannelService;
}
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index 369a5c0..0952d84 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -215,7 +215,7 @@ void SipStateReplicatorService::stop()
extern "C"
{
-HYDRA_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new SipStateReplicatorService;
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/sip.git
More information about the asterisk-scf-commits
mailing list