[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jan 17 10:53:18 CST 2011
branch "master" has been updated
via 72b1fe6de5982f1e1d97808e4a7c28147fb4ccd6 (commit)
via 0020a940b1c0551b72977d39ab5a90ca9f74276c (commit)
from 968acad3916e463eac055f832288c990fd15ef11 (commit)
Summary of changes:
AsteriskSCF/CMakeLists.txt | 22 -----------
AsteriskSCF/Core/CMakeLists.txt | 9 -----
AsteriskSCF/Core/Discovery/CMakeLists.txt | 5 ---
AsteriskSCF/Core/Endpoint/CMakeLists.txt | 4 --
AsteriskSCF/Core/Routing/CMakeLists.txt | 4 --
AsteriskSCF/Media/CMakeLists.txt | 3 --
AsteriskSCF/Media/RTP/CMakeLists.txt | 1 -
AsteriskSCF/SessionCommunications/CMakeLists.txt | 2 -
AsteriskSCF/System/CMakeLists.txt | 10 -----
AsteriskSCF/System/Component/CMakeLists.txt | 3 --
AsteriskSCF/System/Logger/CMakeLists.txt | 2 -
AsteriskSCF/System/Time/CMakeLists.txt | 2 -
CMakeLists.txt | 42 ++++++++++++++++++++-
13 files changed, 40 insertions(+), 69 deletions(-)
delete mode 100644 AsteriskSCF/CMakeLists.txt
delete mode 100644 AsteriskSCF/Core/CMakeLists.txt
delete mode 100644 AsteriskSCF/Core/Discovery/CMakeLists.txt
delete mode 100644 AsteriskSCF/Core/Endpoint/CMakeLists.txt
delete mode 100644 AsteriskSCF/Core/Routing/CMakeLists.txt
delete mode 100644 AsteriskSCF/Media/CMakeLists.txt
delete mode 100644 AsteriskSCF/Media/RTP/CMakeLists.txt
delete mode 100644 AsteriskSCF/SessionCommunications/CMakeLists.txt
delete mode 100644 AsteriskSCF/System/CMakeLists.txt
delete mode 100644 AsteriskSCF/System/Component/CMakeLists.txt
delete mode 100644 AsteriskSCF/System/Logger/CMakeLists.txt
delete mode 100644 AsteriskSCF/System/Time/CMakeLists.txt
- Log -----------------------------------------------------------------
commit 72b1fe6de5982f1e1d97808e4a7c28147fb4ccd6
Author: David M. Lee <dlee at digium.com>
Date: Mon Jan 17 09:56:36 2011 -0600
Fixed install problem on Windows.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c784aa..41b01d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,8 @@ set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
install(TARGETS asterisk-scf-api
- LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR})
+ LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
+ RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR})
install(DIRECTORY AsteriskSCF DESTINATION ${ASTERISK_SCF_INSTALL_SLICE_DIR})
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/
DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR}
commit 0020a940b1c0551b72977d39ab5a90ca9f74276c
Author: David M. Lee <dlee at digium.com>
Date: Wed Jan 12 13:34:14 2011 -0600
Building a single API library.
diff --git a/AsteriskSCF/CMakeLists.txt b/AsteriskSCF/CMakeLists.txt
deleted file mode 100644
index cfa7f97..0000000
--- a/AsteriskSCF/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Make all of our slice definitions available to... themselves!
-asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-# Slice definitions for system infrastructure
-add_subdirectory(System)
-
-# Slice definitions for core functionality
-add_subdirectory(Core)
-
-# Slice definitions for media functionality
-add_subdirectory(Media)
-
-# Slice definitions for session-oriented communications
-add_subdirectory(SessionCommunications)
diff --git a/AsteriskSCF/Core/CMakeLists.txt b/AsteriskSCF/Core/CMakeLists.txt
deleted file mode 100644
index fd4994c..0000000
--- a/AsteriskSCF/Core/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Slice definitions for Discovery functionality
-add_subdirectory(Discovery)
-
-# Slice definitions for Endpoint functionality
-add_subdirectory(Endpoint)
-
-# Slice definitions for Routing functionality
-add_subdirectory(Routing)
-
diff --git a/AsteriskSCF/Core/Discovery/CMakeLists.txt b/AsteriskSCF/Core/Discovery/CMakeLists.txt
deleted file mode 100644
index 3412680..0000000
--- a/AsteriskSCF/Core/Discovery/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Compile our service locator slice definition so we can then use it
-asterisk_scf_compile_slice(ServiceLocatorIf.ice lib "Slice Defined API" Core)
-
-# Can't forget about events
-asterisk_scf_compile_slice(ServiceLocatorEventsIf.ice lib "Slice Defined API" Core)
diff --git a/AsteriskSCF/Core/Endpoint/CMakeLists.txt b/AsteriskSCF/Core/Endpoint/CMakeLists.txt
deleted file mode 100644
index 4695acf..0000000
--- a/AsteriskSCF/Core/Endpoint/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Compile routing service API
-asterisk_scf_compile_slice(EndpointIf.ice lib "Endpoint API" Core)
-
-
diff --git a/AsteriskSCF/Core/Routing/CMakeLists.txt b/AsteriskSCF/Core/Routing/CMakeLists.txt
deleted file mode 100644
index 9e39749..0000000
--- a/AsteriskSCF/Core/Routing/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Compile routing service API
-asterisk_scf_compile_slice(RoutingIf.ice lib "Routing Service API" Core)
-
-
diff --git a/AsteriskSCF/Media/CMakeLists.txt b/AsteriskSCF/Media/CMakeLists.txt
deleted file mode 100644
index 3092e18..0000000
--- a/AsteriskSCF/Media/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-asterisk_scf_compile_slice(MediaIf.ice lib "Slice Defined API" Core)
-
-add_subdirectory(RTP)
diff --git a/AsteriskSCF/Media/RTP/CMakeLists.txt b/AsteriskSCF/Media/RTP/CMakeLists.txt
deleted file mode 100644
index 0b9ce82..0000000
--- a/AsteriskSCF/Media/RTP/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-asterisk_scf_compile_slice(MediaRTPIf.ice lib "RTP Media API" Core)
diff --git a/AsteriskSCF/SessionCommunications/CMakeLists.txt b/AsteriskSCF/SessionCommunications/CMakeLists.txt
deleted file mode 100644
index f7324d6..0000000
--- a/AsteriskSCF/SessionCommunications/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Compile Session Oriented APIs
-asterisk_scf_compile_slice(SessionCommunicationsIf.ice lib "Session Oriented Communications API" SessionCommunications)
diff --git a/AsteriskSCF/System/CMakeLists.txt b/AsteriskSCF/System/CMakeLists.txt
deleted file mode 100644
index 5f01e53..0000000
--- a/AsteriskSCF/System/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Slice definitions for Component functionality
-add_subdirectory(Component)
-
-# Slice definitions for Time services functionality
-add_subdirectory(Time)
-
-# Slice definitions for the Logger service
-add_subdirectory(Logger)
-
-asterisk_scf_compile_slice(ExceptionsIf.ice lib "System-wide Exceptions" System)
diff --git a/AsteriskSCF/System/Component/CMakeLists.txt b/AsteriskSCF/System/Component/CMakeLists.txt
deleted file mode 100644
index c68f74d..0000000
--- a/AsteriskSCF/System/Component/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Compile Component API
-asterisk_scf_compile_slice(ComponentServiceIf.ice lib "ComponentService API" System)
-asterisk_scf_compile_slice(ReplicaIf.ice lib "ComponentService API" System)
diff --git a/AsteriskSCF/System/Logger/CMakeLists.txt b/AsteriskSCF/System/Logger/CMakeLists.txt
deleted file mode 100644
index 8453c03..0000000
--- a/AsteriskSCF/System/Logger/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Compile Time API
-asterisk_scf_compile_slice(LoggerIf.ice lib "Logger service API" System)
diff --git a/AsteriskSCF/System/Time/CMakeLists.txt b/AsteriskSCF/System/Time/CMakeLists.txt
deleted file mode 100644
index bf732cb..0000000
--- a/AsteriskSCF/System/Time/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Compile Time API
-asterisk_scf_compile_slice(TimeIf.ice lib "Time services API" System)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8049668..6c784aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,45 @@
# All rights reserved.
#
+asterisk_scf_component_init(asterisk-scf-api CXX)
+
# Make all of our slice definitions available to... themselves!
asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-# Slice definitions for system infrastructure
-add_subdirectory(AsteriskSCF)
\ No newline at end of file
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/Core/Endpoint/EndpointIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/Core/Routing/RoutingIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/Media/MediaIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/Media/RTP/MediaRTPIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/System/Component/ComponentServiceIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/System/Component/ReplicaIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/System/ExceptionsIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/System/Logger/LoggerIf.ice)
+asterisk_scf_component_add_slice(asterisk-scf-api
+ AsteriskSCF/System/Time/TimeIf.ice)
+
+asterisk_scf_add_ice_libraries(Ice IceUtil)
+asterisk_scf_component_build_library(asterisk-scf-api)
+
+set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+
+install(TARGETS asterisk-scf-api
+ LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_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")
-----------------------------------------------------------------------
--
asterisk-scf/release/slice.git
More information about the asterisk-scf-commits
mailing list