[asterisk-scf-commits] asterisk-scf/release/servicediscovery.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  e80e83fa53d5d1c2617f1e87189110d656cb2fd2 (commit)
      from  f885343e02abd41623c86670b4a238011506334d (commit)

Summary of changes:
 CMakeLists.txt                                     |    5 ++---
 ...t_component.config.in => test_component.config} |    6 +++---
 test/CMakeLists.txt                                |    6 +-----
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename config/{test_component.config.in => test_component.config} (86%)


- Log -----------------------------------------------------------------
commit e80e83fa53d5d1c2617f1e87189110d656cb2fd2
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Apr 25 17:47:30 2011 -0500

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e6759a..603e015 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(service_locator 3.4 CXX)
-
    # Take care of slice definitions
    add_subdirectory(slice EXCLUDE_FROM_ALL)
 
@@ -29,5 +26,7 @@ else()
   set(service_locator_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 endif()
 
+asterisk_scf_project(service_locator 3.4)
+
 add_subdirectory(src)
 add_subdirectory(test)
diff --git a/config/test_component.config.in b/config/test_component.config
similarity index 86%
rename from config/test_component.config.in
rename to config/test_component.config
index 6d13371..812d22f 100644
--- a/config/test_component.config.in
+++ b/config/test_component.config
@@ -41,7 +41,7 @@ AsteriskSCFIceStorm.Trace.TopicManager=2
 AsteriskSCFIceStorm.Flush.Timeout=2000
 
 # Service Locator State Replicator Configuration
-IceBox.Service.ServiceDiscoveryStateReplicator=../src at ServiceLocatorStateReplicator:create
+IceBox.Service.ServiceDiscoveryStateReplicator=ServiceLocatorStateReplicator:create
 
 # Test endpoints for the state replicator
 ServiceLocatorStateReplicator.Endpoints=tcp -p 4413:udp -p 4413
@@ -49,7 +49,7 @@ ServiceLocatorStateReplicator.Endpoints=tcp -p 4413:udp -p 4413
 #
 # ServiceDiscovery configuration
 #
-IceBox.Service.ServiceDiscovery=../src at service_locator:create
+IceBox.Service.ServiceDiscovery=service_locator:create
 
 # Test endpoints for the service locator local adapter
 ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
@@ -77,7 +77,7 @@ LoggerAdapter.Endpoints=default
 #
 # test configuration
 #
-IceBox.Service.ServiceDiscoveryTest=. at service_locator_test:create --report_sink=${CMAKE_BINARY_DIR}/service_locator_test-result.xml --report_format=XML --report_level=detailed
+IceBox.Service.ServiceDiscoveryTest=service_locator_test:create
 
 LocatorService.Proxy=LocatorService:tcp -p 4411
 ServiceLocatorManagement.proxy=ServiceLocatorManagement:tcp -p 4422
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3fc98bd..7c26a40 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,10 +18,6 @@ include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(service_locator_test)
 target_link_libraries(service_locator_test asterisk-scf-api)
 
-icebox_add_test(service_locator_test config/test_component.config)
+asterisk_scf_test_icebox(service_locator_test config/test_component.config)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/AsteriskSCFIceStorm)
-
-# 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)

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


-- 
asterisk-scf/release/servicediscovery.git