[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Oct 8 09:58:13 CDT 2010
branch "master" has been updated
via 31c6fde85dfee23062ccc472221ac262a0b28363 (commit)
via 1d9dbbb9bd05515b772c6f936bf00cfdd5f01549 (commit)
via 152ec96a32ec966b9b3a690b6364f9beda7cddab (commit)
from c32dd3a79c1c538fbc8f93a45449775018eeff62 (commit)
Summary of changes:
CMakeLists.txt | 9 ++++-----
CMakeSubDirs.txt | 7 -------
cmake | 2 +-
config/CMakeLists.txt | 9 +++++++++
config/test_component.config.in | 33 +++++++++++++++++++++++++++++++--
logger | 2 +-
slice | 2 +-
test/CMakeLists.txt | 9 ++++-----
8 files changed, 51 insertions(+), 22 deletions(-)
delete mode 100644 CMakeSubDirs.txt
create mode 100644 config/CMakeLists.txt
- Log -----------------------------------------------------------------
commit 31c6fde85dfee23062ccc472221ac262a0b28363
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 8 09:53:20 2010 -0500
Got 'make test' working.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45713bf..ceec66d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ if(NOT integrated_build STREQUAL "true")
# logger is integrated into our build
set(integrated_build true)
add_subdirectory(logger)
+ set(integrated_build false)
endif()
add_subdirectory(src)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
new file mode 100644
index 0000000..6d62851
--- /dev/null
+++ b/config/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
+configure_file(test_component.config.in test_component.config)
diff --git a/config/test_component.config.in b/config/test_component.config.in
index fd73afe..49e0289 100644
--- a/config/test_component.config.in
+++ b/config/test_component.config.in
@@ -1,8 +1,17 @@
# This is a configuration file used in conjunction with the media_rtp_pjmedia test driver
+#
+# Icebox Configuration
+#
+
+IceBox.InheritProperties=1
+IceBox.LoadOrder=ServiceDiscovery,MediaRTPpjmedia,MediaRTPpjmediaTest
+
+#
# media_rtp_pjmedia Configuration
#
-IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create --Ice.Config=config/test_media_rtp_pjmedia.conf
+
+IceBox.Service.MediaRTPpjmedia=../src at media_rtp_pjmedia:create
# Adapter parameters for this component
MediaRTPpjmediaAdapter.Endpoints=default
@@ -16,5 +25,25 @@ ServiceLocatorProxy=LocatorService:tcp -p 4411
#
# media_rtp_pjmedia_test Configuration
#
-IceBox.Service.MediaRTPpjmediaTest=media_rtp_pjmedia_test:create --Ice.Config=config/test_component.config --report_sink=${CMAKE_BINARY_DIR}/media_rtp_pjmedia_test-result.xml --report_format=XML --report_level=detailed
+IceBox.Service.MediaRTPpjmediaTest=media_rtp_pjmedia_test:create --report_sink=${CMAKE_BINARY_DIR}/media_rtp_pjmedia_test-result.xml --report_format=XML --report_level=detailed
+
+#
+# Service Locator Configuration
+#
+
+IceBox.Service.ServiceDiscovery=${service_locator_bindir}/src at service_locator:create
+
+HydraIceStorm.InstanceName=HydraIceStorm
+HydraIceStorm.TopicManager.Endpoints=default -p 10000
+HydraIceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+HydraIceStorm.Trace.TopicManager=2
+HydraIceStorm.Transient=1
+HydraIceStorm.Flush.Timeout=2000
+TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 10000
+
+ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
+ServiceLocatorAdapter.Endpoints=tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -p 4411
+
+LoggerAdapter.Endpoints=default
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 32389c4..0ae9671 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,8 +14,7 @@ hydra_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework t
hydra_component_build_icebox(media_rtp_pjmedia_test)
#hydra_component_install(media_rtp_pjmedia_test RUNTIME bin "PJmedia RTP Media Test Driver." Core)
-icebox_add_test(media_rtp_pjmedia_test config/test_component.config)
-
-# Copy our test config file to make it available in the test directory.
-# CMake does a bit of search-and-replace, as well.
-configure_file(../config/test_component.config.in ${CMAKE_CURRENT_BINARY_DIR}/config/test_component.config)
+# integration test
+if(integrated_build STREQUAL "true")
+ icebox_add_test(media_rtp_pjmedia_test ../config/test_component.config)
+endif()
commit 1d9dbbb9bd05515b772c6f936bf00cfdd5f01549
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 8 09:24:39 2010 -0500
Removed CMakeSubDirs.txt. We now have a better way to handle integrated builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d409693..45713bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,6 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
-# Include the subdirectory information. This is separate so that
-# a higher-level CMakeLists.txt can act as a master for integrated
-# builds.
-include(CMakeSubDirs.txt)
-
+add_subdirectory(src)
+add_subdirectory(config)
+add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index f7c3595..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-# Take care of the source code for this project
-add_subdirectory(src)
-
-# Finally take care of the test suite
-add_subdirectory(test)
commit 152ec96a32ec966b9b3a690b6364f9beda7cddab
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 8 09:13:43 2010 -0500
Updating submodules to the latest
diff --git a/cmake b/cmake
index e9cf9f2..17066de 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e9cf9f2e6dd03fe7bc39c363d72812aceed28367
+Subproject commit 17066de364794f3befcdcca030ca31d349e83eea
diff --git a/logger b/logger
index 0cc0c02..9b51c72 160000
--- a/logger
+++ b/logger
@@ -1 +1 @@
-Subproject commit 0cc0c02a16e404b94d54c8cb6736dee14a671352
+Subproject commit 9b51c7252a9942e3cdc342a2d9b204ec2cc516a2
diff --git a/slice b/slice
index 0c62939..03ea08a 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 0c629393e2f05dc0ed43bcc6305880949df36289
+Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
-----------------------------------------------------------------------
--
asterisk-scf/integration/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list