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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  80509d044f08a90c8fffa8f7524b8ad741d6f250 (commit)
      from  5b9b4472bc3b67c0bcd31817a913dfcafa822551 (commit)

Summary of changes:
 CMakeLists.txt                                     |    7 ++-----
 config/CMakeLists.txt                              |    9 ---------
 ...st-integ.config.in => routingtest-integ.config} |    8 ++++----
 config/routingtest.config                          |    2 +-
 test/CMakeLists.txt                                |    2 +-
 5 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 config/CMakeLists.txt
 rename config/{routingtest-integ.config.in => routingtest-integ.config} (90%)


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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01eadd2..8dedc49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
    # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled.
    include(cmake/AsteriskSCF.cmake)
 
-   # This project is C++ based and requires a minimum of 3.4 of Ice.
-   asterisk_scf_project(RoutingService 3.4 CXX)
-
    # Take care of slice definitions
    add_subdirectory(slice)
 
@@ -28,7 +25,7 @@ if(NOT integrated_build STREQUAL "true")
    set(integrated_build false)
 endif()
 
+asterisk_scf_project(RoutingService 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 5aef64e..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(routingtest-integ.config.in routingtest-integ.config)
diff --git a/config/routingtest-integ.config.in b/config/routingtest-integ.config
similarity index 90%
rename from config/routingtest-integ.config.in
rename to config/routingtest-integ.config
index 001b4c7..74836c8 100644
--- a/config/routingtest-integ.config.in
+++ b/config/routingtest-integ.config
@@ -2,12 +2,12 @@
 
 IceBox.InheritProperties=1
 
-IceBox.Service.ServiceDiscovery=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.BasicRoutingService=../src at BasicRoutingService:create
+IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.BasicRoutingService=BasicRoutingService:create
 
 # Boost Test arguments can be passed here.
-# IceBox.Service.RoutingTest = RoutingTest:create --log_level=all
-IceBox.Service.RoutingTest = ../test at RoutingTest:create
+# IceBox.Service.RoutingTest=RoutingTest:create --log_level=all
+IceBox.Service.RoutingTest=RoutingTest:create
 
 IceBox.LoadOrder=ServiceDiscovery,BasicRoutingService,RoutingTest
 
diff --git a/config/routingtest.config b/config/routingtest.config
index 7dd703d..c35f7ea 100644
--- a/config/routingtest.config
+++ b/config/routingtest.config
@@ -1,7 +1,7 @@
 # This is a configuration file for the Routing Service Test driver.
 
 
-IceBox.Service.RoutingTest = RoutingTest:create --log_level=all
+IceBox.Service.RoutingTest=RoutingTest:create --log_level=all
 
 IceBox.InheritProperties=1 
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c2935e1..e51d804 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -21,5 +21,5 @@ asterisk_scf_component_build_icebox(RoutingTest)
 target_link_libraries(RoutingTest asterisk-scf-api)
 
 if(integrated_build STREQUAL "true")
-   icebox_add_test(RoutingTest ../config/routingtest-integ.config)
+   asterisk_scf_test_icebox(RoutingTest config/routingtest-integ.config)
 endif()

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


-- 
asterisk-scf/release/routing.git