[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 14 19:02:25 CDT 2010
branch "master" has been updated
via 0b3cf8d8678af55ce00b2f39b760e01510901a2b (commit)
from 1874f709a83438fcc5471b081bd2a44b4949dd4d (commit)
Summary of changes:
CMakeLists.txt | 4 ++--
cmake | 2 +-
slice | 2 +-
src/BridgeServiceImpl.h | 4 ++--
src/CMakeLists.txt | 40 ++++++++++++++++++++--------------------
src/Service.cpp | 2 +-
test/CMakeLists.txt | 38 +++++++++++++++++++-------------------
test/TestBridging.cpp | 2 +-
test/channel_driver | 2 +-
9 files changed, 48 insertions(+), 48 deletions(-)
- Log -----------------------------------------------------------------
commit 0b3cf8d8678af55ce00b2f39b760e01510901a2b
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 18:49:15 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0288980..d97ff50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6, any lower and stuff would fail horribly
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure
+ # Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4
- hydra_project("bridging service" 3.4 CXX)
+ asterisk_scf_project("bridging service" 3.4 CXX)
# Take care of slice definitions
add_subdirectory(slice)
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/slice b/slice
index b8ee0db..bdfc399 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit b8ee0dbd90b5d9425b5add8f9c8e147bf5be0d59
+Subproject commit bdfc399d5876152d46be8b47cd4122abca1d2ed3
diff --git a/src/BridgeServiceImpl.h b/src/BridgeServiceImpl.h
index 7356f60..b29c58b 100644
--- a/src/BridgeServiceImpl.h
+++ b/src/BridgeServiceImpl.h
@@ -6,8 +6,8 @@
* All rights reserved.
*/
#pragma once
-#ifndef __HYDRA_BRIDGE_SERVICE_IMPL_H
-#define __HYDRA_BRIDGE_SERVICE_IMPL_H
+#ifndef __ASTERISK_SCF_BRIDGE_SERVICE_IMPL_H
+#define __ASTERISK_SCF_BRIDGE_SERVICE_IMPL_H
#include <AsteriskSCF/Telephony/Bridging/BridgeService.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c292bc..d666099 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,22 +1,22 @@
-hydra_component_init(bridgeservice CXX)
-hydra_component_add_slice(bridgeservice EndpointIf)
-hydra_component_add_slice(bridgeservice ComponentServiceIf)
-hydra_component_add_slice(bridgeservice SessionCommunicationsIf)
-hydra_component_add_slice(bridgeservice ServiceLocatorIf)
-hydra_component_add_file(bridgeservice Service.cpp)
-hydra_component_add_file(bridgeservice BridgeImpl.h)
-hydra_component_add_file(bridgeservice BridgeImpl.cpp)
-hydra_component_add_file(bridgeservice BridgeListenerMgr.h)
-hydra_component_add_file(bridgeservice BridgeListenerMgr.cpp)
-hydra_component_add_file(bridgeservice BridgeManagerListenerMgr.h)
-hydra_component_add_file(bridgeservice BridgeManagerListenerMgr.cpp)
-hydra_component_add_file(bridgeservice BridgeManagerImpl.h)
-hydra_component_add_file(bridgeservice BridgeManagerImpl.cpp)
-hydra_component_add_file(bridgeservice MediaSplicer.h)
-hydra_component_add_file(bridgeservice MediaSplicer.cpp)
-hydra_component_add_ice_libraries(bridgeservice IceStorm)
-hydra_component_add_ice_libraries(bridgeservice IceBox)
-hydra_component_add_boost_libraries(bridgeservice thread)
+asterisk_scf_component_init(bridgeservice CXX)
+asterisk_scf_component_add_slice(bridgeservice EndpointIf)
+asterisk_scf_component_add_slice(bridgeservice ComponentServiceIf)
+asterisk_scf_component_add_slice(bridgeservice SessionCommunicationsIf)
+asterisk_scf_component_add_slice(bridgeservice ServiceLocatorIf)
+asterisk_scf_component_add_file(bridgeservice Service.cpp)
+asterisk_scf_component_add_file(bridgeservice BridgeImpl.h)
+asterisk_scf_component_add_file(bridgeservice BridgeImpl.cpp)
+asterisk_scf_component_add_file(bridgeservice BridgeListenerMgr.h)
+asterisk_scf_component_add_file(bridgeservice BridgeListenerMgr.cpp)
+asterisk_scf_component_add_file(bridgeservice BridgeManagerListenerMgr.h)
+asterisk_scf_component_add_file(bridgeservice BridgeManagerListenerMgr.cpp)
+asterisk_scf_component_add_file(bridgeservice BridgeManagerImpl.h)
+asterisk_scf_component_add_file(bridgeservice BridgeManagerImpl.cpp)
+asterisk_scf_component_add_file(bridgeservice MediaSplicer.h)
+asterisk_scf_component_add_file(bridgeservice MediaSplicer.cpp)
+asterisk_scf_component_add_ice_libraries(bridgeservice IceStorm)
+asterisk_scf_component_add_ice_libraries(bridgeservice IceBox)
+asterisk_scf_component_add_boost_libraries(bridgeservice thread)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -24,5 +24,5 @@ endif()
include_directories(${logger_dir}/common)
include_directories(${logger_dir}/client/src)
-hydra_component_build_icebox(bridgeservice)
+asterisk_scf_component_build_icebox(bridgeservice)
target_link_libraries(bridgeservice logging-client)
diff --git a/src/Service.cpp b/src/Service.cpp
index bcd527e..b82d194 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -229,7 +229,7 @@ void BridgingApp::stop()
}
extern "C" {
- HYDRA_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new BridgingApp;
}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4efb4c2..fb53388 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,25 +1,25 @@
if(NOT integrated_build STREQUAL "true")
add_subdirectory(channel_driver/local_slice)
endif()
-hydra_component_init(bridging_unit_test CXX)
+asterisk_scf_component_init(bridging_unit_test CXX)
include_directories("../src")
-hydra_component_add_slice(bridging_unit_test EndpointIf)
-hydra_component_add_slice(bridging_unit_test ComponentServiceIf)
-hydra_component_add_slice(bridging_unit_test SessionCommunicationsIf)
-hydra_component_add_slice(bridging_unit_test CommandsIf)
-hydra_component_add_file(bridging_unit_test TestBridging.cpp)
-hydra_component_add_file(bridging_unit_test SessionListenerI.h)
-hydra_component_add_file(bridging_unit_test SessionListenerI.cpp)
-hydra_component_add_file(bridging_unit_test BridgeListenerI.h)
-hydra_component_add_file(bridging_unit_test BridgeListenerI.cpp)
-hydra_component_add_file(bridging_unit_test BridgeManagerListenerI.h)
-hydra_component_add_file(bridging_unit_test BridgeManagerListenerI.cpp)
-hydra_component_add_file(bridging_unit_test TestCommandDriver.cpp)
-hydra_component_add_file(bridging_unit_test TestCommandDriver.h)
-hydra_component_add_ice_libraries(bridging_unit_test IceStorm)
-hydra_component_add_ice_libraries(bridging_unit_test IceBox)
-hydra_component_add_boost_libraries(bridging_unit_test unit_test_framework)
-hydra_component_add_boost_libraries(bridging_unit_test thread)
+asterisk_scf_component_add_slice(bridging_unit_test EndpointIf)
+asterisk_scf_component_add_slice(bridging_unit_test ComponentServiceIf)
+asterisk_scf_component_add_slice(bridging_unit_test SessionCommunicationsIf)
+asterisk_scf_component_add_slice(bridging_unit_test CommandsIf)
+asterisk_scf_component_add_file(bridging_unit_test TestBridging.cpp)
+asterisk_scf_component_add_file(bridging_unit_test SessionListenerI.h)
+asterisk_scf_component_add_file(bridging_unit_test SessionListenerI.cpp)
+asterisk_scf_component_add_file(bridging_unit_test BridgeListenerI.h)
+asterisk_scf_component_add_file(bridging_unit_test BridgeListenerI.cpp)
+asterisk_scf_component_add_file(bridging_unit_test BridgeManagerListenerI.h)
+asterisk_scf_component_add_file(bridging_unit_test BridgeManagerListenerI.cpp)
+asterisk_scf_component_add_file(bridging_unit_test TestCommandDriver.cpp)
+asterisk_scf_component_add_file(bridging_unit_test TestCommandDriver.h)
+asterisk_scf_component_add_ice_libraries(bridging_unit_test IceStorm)
+asterisk_scf_component_add_ice_libraries(bridging_unit_test IceBox)
+asterisk_scf_component_add_boost_libraries(bridging_unit_test unit_test_framework)
+asterisk_scf_component_add_boost_libraries(bridging_unit_test thread)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -27,7 +27,7 @@ endif()
include_directories(${logger_dir}/common)
include_directories(${logger_dir}/client/src)
-hydra_component_build_icebox(bridging_unit_test)
+asterisk_scf_component_build_icebox(bridging_unit_test)
target_link_libraries(bridging_unit_test logging-client)
# component tests only work for integrated builds
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index aa60c65..8648814 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -538,7 +538,7 @@ private:
}
extern "C" {
- HYDRA_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new TestService;
}
diff --git a/test/channel_driver b/test/channel_driver
index 732ef0f..a8bcab4 160000
--- a/test/channel_driver
+++ b/test/channel_driver
@@ -1 +1 @@
-Subproject commit 732ef0fa29bd33d0aca4835a49be919b2736b399
+Subproject commit a8bcab4482bc3f079988b12f5ee78aa2a512b517
-----------------------------------------------------------------------
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list