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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  bdb740e86b1013c75919c833bcbdf82d46597ed3 (commit)
       via  8c70af7be4f6e800caf9b4912cab1a8f0aa625c8 (commit)
      from  db1a9c14642cc5e19e2c12bbc318dc9fa9cffe30 (commit)

Summary of changes:
 CMakeLists.txt                                     |   12 ++++++------
 CMakeSubDirs.txt                                   |    7 -------
 config/CMakeLists.txt                              |    9 +++++++++
 ...st-integ.config => routingtest-integ.config.in} |   11 +++++------
 test/CMakeLists.txt                                |    4 ++++
 5 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 CMakeSubDirs.txt
 create mode 100644 config/CMakeLists.txt
 rename config/{routingtest-integ.config => routingtest-integ.config.in} (90%)


- Log -----------------------------------------------------------------
commit bdb740e86b1013c75919c833bcbdf82d46597ed3
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 11 09:26:22 2010 -0500

    Got 'make test' to work

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ab7c58..92503d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,10 @@ 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)
+add_subdirectory(config)
 add_subdirectory(test)
 
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
new file mode 100644
index 0000000..5aef64e
--- /dev/null
+++ b/config/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+# 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 b/config/routingtest-integ.config.in
similarity index 90%
rename from config/routingtest-integ.config
rename to config/routingtest-integ.config.in
index 140434f..b396f81 100644
--- a/config/routingtest-integ.config
+++ b/config/routingtest-integ.config.in
@@ -1,14 +1,13 @@
 # This is a configuration file a single process test of the Routing Service.
 
-IceBox.InheritProperties=1 
+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. 
+# Boost Test arguments can be passed here.
 # IceBox.Service.RoutingTest = RoutingTest:create --log_level=all
-IceBox.Service.RoutingTest = RoutingTest:create 
+IceBox.Service.RoutingTest = RoutingTest:create
 
 IceBox.LoadOrder=ServiceDiscovery,BasicRoutingService,RoutingTest
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5e2a435..f2bfd2d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -21,3 +21,7 @@ hydra_component_add_file(RoutingTest MockEndpointLocator.cpp)
 hydra_component_add_ice_libraries(RoutingTest IceStorm)
 hydra_component_add_boost_libraries(RoutingTest unit_test_framework)
 hydra_component_build_icebox(RoutingTest)
+
+if(integrated_build STREQUAL "true")
+   icebox_add_test(RoutingTest ../config/routingtest-integ.config)
+endif()

commit 8c70af7be4f6e800caf9b4912cab1a8f0aa625c8
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 11 08:48:33 2010 -0500

    Removing CMakeSubDirs.txt.  Now have a better way to specify integrated builds.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abde640..7ab7c58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,10 @@ if(NOT integrated_build STREQUAL "true")
    # Minimum we require is 2.6
    cmake_minimum_required(VERSION 2.6)
 
-   # Include common Hydra build infrastructure. Make sure your submodules are pulled. 
+   # Include common Hydra 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. 
+   # This project is C++ based and requires a minimum of 3.4 of Ice.
    hydra_project(RoutingService 3.4 CXX)
 
    # Take care of slice definitions
@@ -27,8 +27,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(test)
 
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index 3348bd6..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-# Take care of the source code for this project
-add_subdirectory(src)
-
-# Finally take care of the test suite
-add_subdirectory(test)

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


-- 
asterisk-scf/integration/routing.git