[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "single-build-dir" updated.

[Commits to the Asterisk SCF project code repositories]

branch "single-build-dir" has been updated
  discards  46adbee014c9cccafd5b2442bfb7e11468b78b33 (commit)
       via  37b6b32b5336299fac3895f36093d74d97c77a80 (commit)
       via  6f40364bd44771f7cb097767d88ca3ef0190a345 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (46adbee014c9cccafd5b2442bfb7e11468b78b33)
            \
             N -- N -- N (37b6b32b5336299fac3895f36093d74d97c77a80)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:
 config/test_component.config |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 37b6b32b5336299fac3895f36093d74d97c77a80
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Apr 25 17:48:25 2011 -0500

    Changes to work with new single-build-directory CMake script.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a60eae4..b74377d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,6 @@ if(NOT integrated_build STREQUAL "true")
    pjproject_build(pjmedia)
    pjproject_build(third_party)
 
-   # This project is C++ based and requires a minimum of 3.4
-   asterisk_scf_project(media_rtp_pjmedia 3.4 CXX)
-
    # Knock out slice definitions
    add_subdirectory(slice EXCLUDE_FROM_ALL)
 
@@ -38,6 +35,7 @@ if(NOT integrated_build STREQUAL "true")
    set(integrated_build false)
 endif()
 
+asterisk_scf_project(media_rtp_pjmedia 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 6d62851..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_component.config.in test_component.config)
diff --git a/config/test_component.config.in b/config/test_component.config
similarity index 80%
rename from config/test_component.config.in
rename to config/test_component.config
index 2d0ff56..97311ed 100644
--- a/config/test_component.config.in
+++ b/config/test_component.config
@@ -8,7 +8,7 @@ IceBox.InheritProperties=1
 IceBox.LoadOrder=ServiceDiscovery,RtpStateReplicator,MediaRTPpjmedia,MediaRTPpjmediaTest
 
 # RtpStateReplicator Configuration
-IceBox.Service.RtpStateReplicator=../src at RtpStateReplicator:create
+IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
 
 # Adapter parameters for this component
 RtpStateReplicator.Endpoints=tcp:udp
@@ -23,7 +23,7 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
 # media_rtp_pjmedia Configuration
 #
 
-IceBox.Service.MediaRTPpjmedia=../src at media_rtp_pjmedia:create
+IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create
 
 # Adapter parameters for this component
 MediaRTPpjmediaAdapter.Endpoints=default
@@ -40,13 +40,13 @@ ServiceLocatorProxy=LocatorService:tcp -p 4411
 # media_rtp_pjmedia_test Configuration
 #
 
-IceBox.Service.MediaRTPpjmediaTest=../test at media_rtp_pjmedia_test:create --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
 
 #
 # Service Locator Configuration
 #
 
-IceBox.Service.ServiceDiscovery=${service_locator_bindir}/src at service_locator:create
+IceBox.Service.ServiceDiscovery=service_locator:create
 
 AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
 AsteriskSCFIceStorm.TopicManager.Endpoints=default -p 10000
diff --git a/config/test_media_rtp_pjmedia.conf b/config/test_media_rtp_pjmedia.conf
index f7015b2..3a451da 100644
--- a/config/test_media_rtp_pjmedia.conf
+++ b/config/test_media_rtp_pjmedia.conf
@@ -1,5 +1,5 @@
 # This is a configuration file used in conjunction with the pjmedia rtp component test driver
-IceBox.InheritProperties = 1
+IceBox.InheritProperties=1
 IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create
 
 # Adapter parameters for this component
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5ca2576..117f097 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,5 +18,5 @@ target_link_libraries(media_rtp_pjmedia_test asterisk-scf-api)
 
 # integration test
 if(integrated_build STREQUAL "true")
-   icebox_add_test(media_rtp_pjmedia_test ../config/test_component.config)
+   asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
 endif()

commit 6f40364bd44771f7cb097767d88ca3ef0190a345
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Apr 26 14:35:18 2011 -0230

    Add missing service locator configuration item

diff --git a/config/test_component.config.in b/config/test_component.config.in
index f4c470d..2d0ff56 100644
--- a/config/test_component.config.in
+++ b/config/test_component.config.in
@@ -58,6 +58,7 @@ TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
 
 ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
 ServiceLocatorAdapter.Endpoints=tcp -p 4411
+ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
 LocatorService.Proxy=LocatorService:tcp -p 4411
 
 LoggerAdapter.Endpoints=default

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git