[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  a8bcab4482bc3f079988b12f5ee78aa2a512b517 (commit)
      from  732ef0fa29bd33d0aca4835a49be919b2736b399 (commit)

Summary of changes:
 CMakeLists.txt             |    4 ++--
 local_slice/CMakeLists.txt |    2 +-
 src/CMakeLists.txt         |   42 +++++++++++++++++++++---------------------
 src/Service.cpp            |    2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)


- Log -----------------------------------------------------------------
commit a8bcab4482bc3f079988b12f5ee78aa2a512b517
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Oct 14 18:30:10 2010 -0500

    Replacing references to project's old internal working name.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b76275e..6b032c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,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("Test Channel" 3.4 CXX)
+  asterisk_scf_project("Test Channel" 3.4 CXX)
 
   # Take care of slice definitions
   add_subdirectory(slice EXCLUDE_FROM_ALL)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index ba8b52c..a1ed80b 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1 +1 @@
-hydra_compile_slice(CommandsIf.ice lib "Test Channel Command API" TestChannel)
+asterisk_scf_compile_slice(CommandsIf.ice lib "Test Channel Command API" TestChannel)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 55fabc9..33d3155 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,23 +1,23 @@
-hydra_component_init(test_channel CXX)
-hydra_component_add_slice(test_channel EndpointIf)
-hydra_component_add_slice(test_channel ComponentServiceIf)
-hydra_component_add_slice(test_channel SessionCommunicationsIf)
-hydra_component_add_slice(test_channel RoutingIf)
-hydra_component_add_slice(test_channel CommandsIf)
-hydra_component_add_file(test_channel Service.cpp)
-hydra_component_add_file(test_channel MediaEchoThread.cpp)
-hydra_component_add_file(test_channel MediaSession.cpp)
-hydra_component_add_file(test_channel TestEndpoint.cpp)
-hydra_component_add_file(test_channel TestEndpoint.h)
-hydra_component_add_ice_libraries(test_channel IceStorm)
-hydra_component_add_boost_libraries(test_channel thread)
-hydra_component_add_boost_libraries(test_channel date_time)
-hydra_component_build_icebox(test_channel)
+asterisk_scf_component_init(test_channel CXX)
+asterisk_scf_component_add_slice(test_channel EndpointIf)
+asterisk_scf_component_add_slice(test_channel ComponentServiceIf)
+asterisk_scf_component_add_slice(test_channel SessionCommunicationsIf)
+asterisk_scf_component_add_slice(test_channel RoutingIf)
+asterisk_scf_component_add_slice(test_channel CommandsIf)
+asterisk_scf_component_add_file(test_channel Service.cpp)
+asterisk_scf_component_add_file(test_channel MediaEchoThread.cpp)
+asterisk_scf_component_add_file(test_channel MediaSession.cpp)
+asterisk_scf_component_add_file(test_channel TestEndpoint.cpp)
+asterisk_scf_component_add_file(test_channel TestEndpoint.h)
+asterisk_scf_component_add_ice_libraries(test_channel IceStorm)
+asterisk_scf_component_add_boost_libraries(test_channel thread)
+asterisk_scf_component_add_boost_libraries(test_channel date_time)
+asterisk_scf_component_build_icebox(test_channel)
 
-hydra_component_init(console_driver CXX)
-hydra_component_add_slice(console_driver CommandsIf)
-hydra_component_add_file(console_driver ConsoleDriver.cpp)
-hydra_component_add_file(console_driver ConsoleDriver.h)
-hydra_component_add_file(console_driver main.cpp)
-hydra_component_build_standalone(console_driver)
+asterisk_scf_component_init(console_driver CXX)
+asterisk_scf_component_add_slice(console_driver CommandsIf)
+asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
+asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
+asterisk_scf_component_add_file(console_driver main.cpp)
+asterisk_scf_component_build_standalone(console_driver)
 
diff --git a/src/Service.cpp b/src/Service.cpp
index c5217a2..1b623ca 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -73,7 +73,7 @@ void TestChannelDriver::stop()
 }
 
 extern "C" {
-    HYDRA_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+    ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
     {
         return new TestChannelDriver;
     }

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


-- 
asterisk-scf/integration/test_channel.git