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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  39340b9a0c43ec386c7a270ffed22544f002b17e (commit)
      from  89fa8df660c8d4783a1271ff26d63acb74c264bd (commit)

Summary of changes:
 .../{ => AsteriskSCF/TestChannel}/CommandsIf.ice   |    0
 local_slice/CMakeLists.txt                         |   13 +++++++++++--
 src/CMakeLists.txt                                 |    7 +++++++
 src/ConsoleDriver.h                                |    2 +-
 src/TestEndpoint.cpp                               |    2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)
 rename local_slice/{ => AsteriskSCF/TestChannel}/CommandsIf.ice (100%)


- Log -----------------------------------------------------------------
commit 39340b9a0c43ec386c7a270ffed22544f002b17e
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 20:24:07 2011 -0600

    Install test-channel artifacts.
    
    * Install the slice file in a AsteriskSCF/TestChannel directory
    * Install the api in libdir

diff --git a/local_slice/CommandsIf.ice b/local_slice/AsteriskSCF/TestChannel/CommandsIf.ice
similarity index 100%
rename from local_slice/CommandsIf.ice
rename to local_slice/AsteriskSCF/TestChannel/CommandsIf.ice
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 95c6e7d..85cbc7e 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -8,10 +8,19 @@
 
 asterisk_scf_component_init(test-channel-api CXX)
 
-asterisk_scf_component_add_slice(test-channel-api CommandsIf.ice)
+asterisk_scf_component_add_slice(test-channel-api
+    AsteriskSCF/TestChannel/CommandsIf.ice)
 
 asterisk_scf_add_ice_libraries(Ice IceUtil)
 asterisk_scf_component_build_library(test-channel-api)
 
-set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+set(TEST_CHANNEL_API_INCLUDE_DIR
+    ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
 
+install(TARGETS test-channel-api
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
+install(DIRECTORY AsteriskSCF DESTINATION ${ASTERISK_SCF_INSTALL_SLICE_DIR})
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/
+    DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR}
+    FILES_MATCHING PATTERN "*.h")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04cd2e7..927ef1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,10 @@ asterisk_scf_component_build_icebox(test_channel)
 target_link_libraries(test_channel asterisk-scf-api)
 target_link_libraries(test_channel test-channel-api)
 
+install(TARGETS test_channel
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
+
 asterisk_scf_component_init(console_driver CXX)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
@@ -22,3 +26,6 @@ asterisk_scf_component_add_file(console_driver main.cpp)
 include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
 asterisk_scf_component_build_standalone(console_driver)
 target_link_libraries(console_driver test-channel-api)
+
+install(TARGETS console_driver
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
diff --git a/src/ConsoleDriver.h b/src/ConsoleDriver.h
index ed267e6..680b311 100644
--- a/src/ConsoleDriver.h
+++ b/src/ConsoleDriver.h
@@ -18,7 +18,7 @@
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Thread.h>
 #include <string>
-#include <CommandsIf.h>
+#include <AsteriskSCF/TestChannel/CommandsIf.h>
 
 namespace AsteriskSCF
 {
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 2ce0024..830bdbf 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -28,7 +28,7 @@
 
 #include "Logger.h"
 #include "MediaSession.h"
-#include <CommandsIf.h>
+#include <AsteriskSCF/TestChannel/CommandsIf.h>
 
 
 using namespace AsteriskSCF::TestUtil;

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


-- 
asterisk-scf/release/test_channel.git