[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 26 13:38:50 CDT 2011
branch "master" has been updated
via 41af13b549464e2ab353e7d1a22edd8dc7f2afe2 (commit)
via 065951a7616e80059a68828f72a475dd509e8531 (commit)
via d922b0a5315b0abe2e9cb10d774870d4e7bd2f11 (commit)
via 9cd5f73e81340ea9589d8736f61ba4ef4b1c2dc7 (commit)
via 13d1259e05de64a80bbafb66f94f4938595bc517 (commit)
via ba42f30351e094f5fe76b24a496d7e1baa3a11a6 (commit)
from 74e92918e69c9851192aeb4139d762b23972cb9a (commit)
Summary of changes:
CMakeLists.txt | 6 ++----
config/CMakeLists.txt | 9 ---------
.../{test_bridging.conf.in => test_bridging.conf} | 14 +++++++-------
test/CMakeLists.txt | 2 +-
4 files changed, 10 insertions(+), 21 deletions(-)
delete mode 100644 config/CMakeLists.txt
rename config/{test_bridging.conf.in => test_bridging.conf} (91%)
- Log -----------------------------------------------------------------
commit 41af13b549464e2ab353e7d1a22edd8dc7f2afe2
Merge: 065951a 74e9291
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 13:36:24 2011 -0500
Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/bridging
commit 065951a7616e80059a68828f72a475dd509e8531
Merge: ba42f30 d922b0a
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 12:25:25 2011 -0500
Merge branch 'single-build-dir' of git://git.asterisk.org/asterisk-scf/integration/bridging into single-build-dir
commit d922b0a5315b0abe2e9cb10d774870d4e7bd2f11
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 11:42:58 2011 -0500
Remove configuration of file that does not need it now.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8432c0..5483175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,5 +27,4 @@ endif()
asterisk_scf_project(BridgingService 3.4)
add_subdirectory(src)
-add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
deleted file mode 100644
index df5843f..0000000
--- a/config/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-configure_file(test_bridging.conf.in test_bridging.conf)
commit 9cd5f73e81340ea9589d8736f61ba4ef4b1c2dc7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 11:36:42 2011 -0500
Rename a config file that was missed in the previous round of changes.
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf
similarity index 100%
rename from config/test_bridging.conf.in
rename to config/test_bridging.conf
commit 13d1259e05de64a80bbafb66f94f4938595bc517
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:49:26 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9979a32..e8432c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
- # This project is C++ based and requires a minimum of 3.4
- asterisk_scf_project(BridgingService 3.4 CXX)
-
# Take care of slice definitions
add_subdirectory(slice)
@@ -27,6 +24,8 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
+asterisk_scf_project(BridgingService 3.4)
+
add_subdirectory(src)
add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 3e5f3ab..e88f751 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -109,13 +109,13 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
#
# The IceBox entries for loading the services.
#
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
-IceBox.Service.Replicator=../src at BridgeReplicator:create
-IceBox.Service.TestBridge=../src at bridgeservice:create
-IceBox.Service.TestBridge2=../src/@bridgeservice:create
-IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
-IceBox.Service.TestDriver=../test at bridge_component_test:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Replicator=BridgeReplicator:create
+IceBox.Service.TestBridge=bridgeservice:create
+IceBox.Service.TestBridge2=bridgeservice:create
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.TestDriver=bridge_component_test:create
#
# The bridging service uses the test channel`s Endpoint
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2dfcc0e..b74c1e9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(bridge_component_test test-channel-api)
# component tests only work for integrated builds
if(integrated_build STREQUAL "true")
- icebox_add_test(bridge_component_test ../config/test_bridging.conf)
+ asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
asterisk_scf_component_init(bridge_unit_tests CXX)
commit ba42f30351e094f5fe76b24a496d7e1baa3a11a6
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:49:26 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9979a32..e8432c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
- # This project is C++ based and requires a minimum of 3.4
- asterisk_scf_project(BridgingService 3.4 CXX)
-
# Take care of slice definitions
add_subdirectory(slice)
@@ -27,6 +24,8 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
+asterisk_scf_project(BridgingService 3.4)
+
add_subdirectory(src)
add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 37d7b8c..8aa0cf7 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -108,13 +108,13 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
#
# The IceBox entries for loading the services.
#
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
-IceBox.Service.Replicator=../src at BridgeReplicator:create
-IceBox.Service.TestBridge=../src at bridgeservice:create
-IceBox.Service.TestBridge2=../src/@bridgeservice:create
-IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
-IceBox.Service.TestDriver=../test at bridge_component_test:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Replicator=BridgeReplicator:create
+IceBox.Service.TestBridge=bridgeservice:create
+IceBox.Service.TestBridge2=bridgeservice:create
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.TestDriver=bridge_component_test:create
#
# The bridging service uses the test channel`s Endpoint
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2dfcc0e..b74c1e9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(bridge_component_test test-channel-api)
# component tests only work for integrated builds
if(integrated_build STREQUAL "true")
- icebox_add_test(bridge_component_test ../config/test_bridging.conf)
+ asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
asterisk_scf_component_init(bridge_unit_tests CXX)
-----------------------------------------------------------------------
--
asterisk-scf/release/bridging.git
More information about the asterisk-scf-commits
mailing list