[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "disintegrated-build" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Jun 16 17:22:32 CDT 2011
branch "disintegrated-build" has been created
at 7200ffebb2686874ce332b2fdc08597a4ff9f007 (commit)
- Log -----------------------------------------------------------------
commit 7200ffebb2686874ce332b2fdc08597a4ff9f007
Merge: c2200de 0f67d36
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 16 17:16:27 2011 -0500
Merge branch 'disintegrated-build' of git://git.asterisk.org/team/kpfleming/wip-cmake into disintegrated-build
diff --cc cmake/modules/cmake_uninstall.cmake.in
index 0000000,9b093d4..9b093d4
mode 000000,100644..100644
--- a/cmake/modules/cmake_uninstall.cmake.in
+++ b/cmake/modules/cmake_uninstall.cmake.in
commit 0f67d364f49cfb4e0c8351a37de7035ca1cb84e5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 16 17:09:43 2011 -0500
Provide ability to automatically translate Slice files when needed.
When a Slice file is added to a component (to be translated and compiled),
other Slice files that it is dependent on may also need to be added to the
component. This patch adds automatic addition of dependency Slice files. See
the documentation for astscf_component_add_slices() to understand when this
function is performed and why.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 8887518..d83d3f6 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -322,7 +322,7 @@ function(astscf_project NAME ICE_VERSION)
# every component against those libraries at minimum
set(ASTSCF_ICE_LIBRARIES ICE ICEUTIL PARENT_SCOPE)
- astscf_slice_collection(GLOBAL NAME Ice PATH "${ICE_SLICE_DIR}" HEADERS "${ICE_INCLUDE_DIR}")
+ astscf_slice_collection(GLOBAL NOTRANSLATE NAME Ice PATH "${ICE_SLICE_DIR}" HEADERS "${ICE_INCLUDE_DIR}")
astscf_slice_include_collection(Ice)
set(SLICE_INCLUDE_DIRECTORIES ${SLICE_INCLUDE_DIRECTORIES} PARENT_SCOPE)
@@ -508,20 +508,25 @@ endfunction()
# collection's details.
#
# Syntax:
-# astscf_slice_collection([OVERRIDE] [GLOBAL NAME <name> | LOCAL]
+# astscf_slice_collection([OVERRIDE] [GLOBAL NAME <name> | LOCAL] [TRANSLATE | NOTRANSLATE]
# [PATH <path>] [LIBRARY <library] [HEADERS <path>])
#
# GLOBAL: defines a global collection; NAME is mandatory
# LOCAL: (default) defines a local collection; NAME will be 'LOCAL'
# OVERRIDE: must be specified in order to change PATH, LIBRARY or HEADERS
# for a previously-defined global collection
+# TRANSLATE: (default, unless the collection provides a library) Slice files
+# in this collection should be translated into header/source files
+# when used in a component
+# NOTRANSLATE: (default if the collection provides a library) Slice files in
+# this collection should not be translated
# NAME: name of the collection
# PATH: path to the directory where the Slice files are located
# HEADERS: path to the directory where Slice-generated headers are located
# LIBRARY: path or target name of a library built from Slice-generated sources
#
function(astscf_slice_collection)
- cmake_parse_arguments("" "OVERRIDE;GLOBAL;LOCAL" "NAME;PATH;LIBRARY;HEADERS" "" ${ARGN})
+ cmake_parse_arguments("" "OVERRIDE;GLOBAL;LOCAL;TRANSLATE;NOTRANSLATE" "NAME;PATH;LIBRARY;HEADERS" "" ${ARGN})
if(_GLOBAL AND NOT _NAME)
message(FATAL_ERROR "NAME argument to this function is mandatory for global Slice collections.")
endif()
@@ -547,6 +552,9 @@ function(astscf_slice_collection)
message(FATAL_ERROR "PATH argument to this function is mandatory.")
endif()
if(_GLOBAL)
+ list(APPEND collections ${_NAME} ${SLICE_GLOBAL_COLLECTIONS})
+ list(REMOVE_DUPLICATES collections)
+ __astscf_set_cache_string(SLICE_GLOBAL_COLLECTIONS "${collections}" "" ADVANCED)
if(_PATH)
__astscf_set_cache_path(SLICE_COLLECTION_${_NAME} "${real}" "Path to Slice files in collection ${_NAME}.")
endif()
@@ -556,6 +564,11 @@ function(astscf_slice_collection)
if(_HEADERS)
__astscf_set_cache_path(SLICE_COLLECTION_${_NAME}_HEADERS "${_HEADERS}" "Path to generated headers for Slice collection ${_NAME}.")
endif()
+ if(_NOTRANSLATE OR SLICE_COLLECTION_${_NAME}_LIBRARY)
+ __astscf_set_cache_string(SLICE_COLLECTION_${_NAME}_TRANSLATE "false" "" ADVANCED)
+ else()
+ __astscf_set_cache_string(SLICE_COLLECTION_${_NAME}_TRANSLATE "true" "" ADVANCED)
+ endif()
message(STATUS "Added Slice collection '${_NAME}' at ${_PATH}")
else()
if(_PATH)
@@ -621,7 +634,12 @@ endfunction()
# Function which records Slice files, from a collection, as being used by a
# component. The Slice files will be translated and compiled when the component
-# is built.
+# is built. In addition, any Slice files that the specified files are dependent
+# on (via #include) that come from Slice collections which don't provide
+# libraries (or have been marked explicitly as needing translation) will also be
+# added to the component automatically. This will also occur for any Slice files
+# from the same collection as the specified files, even if that collection does
+# provide a library or has not been marked as needing translation.
#
# The Slice files are passed in as a list of globs, relative to the collection's
# base directory. The globs default to regular non-recursive expansion. If you
@@ -664,7 +682,10 @@ function(astscf_component_add_slices COMPONENT COLLECTION)
endif()
endif()
+ __astscf_slice_compiler_arguments(slice_compiler_arguments)
+
set(collection_dir "${SLICE_COLLECTION_${COLLECTION}}")
+ set(collections ${${COMPONENT}_SLICE_COLLECTIONS})
# default to glob syntax by default. not as useful as GLOB_RECURSE, but
# follows the principle of least surprise
set(glob_style GLOB)
@@ -678,70 +699,74 @@ function(astscf_component_add_slices COMPONENT COLLECTION)
if(NOT slices)
message(FATAL_ERROR "Pattern '${slice_glob}' did not match any files in ${collection_dir}.")
endif()
- if(NOT found)
- set(collections ${${COMPONENT}_SLICE_COLLECTIONS})
+ # if the component isn't already using any Slice files from this collection,
+ # record this collection in the list
+ list(FIND collections ${COLLECTION} index)
+ if(index EQUAL -1)
list(APPEND collections ${COLLECTION})
- list(REMOVE_DUPLICATES collections)
- __astscf_set_cache_string(${COMPONENT}_SLICE_COLLECTIONS "${collections}" "" ADVANCED)
endif()
- set(found true)
- list(APPEND all_slices ${slices})
+ foreach(slice ${slices})
+ message(STATUS "Adding ${slice} from collection ${COLLECTION} to ${COMPONENT}")
+ endforeach()
+ list(APPEND new_slices ${slices})
endif()
endforeach()
- list(APPEND all_slices ${${COMPONENT}_${COLLECTION}_SLICES})
+ list(APPEND all_slices ${${COMPONENT}_${COLLECTION}_SLICES} ${new_slices})
list(REMOVE_DUPLICATES all_slices)
__astscf_set_cache_string(${COMPONENT}_${COLLECTION}_SLICES "${all_slices}" "" ADVANCED)
+ # now use the Slice compiler to find Slice files that the ones that were just added are dependent on
+ foreach(slice ${new_slices})
+ __astscf_slice_get_targets_and_sources(${COLLECTION} "${collection_dir}" "${slice}" "${slice_compiler_arguments}" targets sources)
+ foreach(source ${sources})
+ # check to see if a dependency Slice file is located in a known collection; if so, then
+ # it might also need to be added to this component
+ foreach(collection ${SLICE_GLOBAL_COLLECTIONS} PROJECT LOCAL)
+ # the dependency file should be also be added to this component (to be translated)
+ # if the collection it comes from is marked to cause translation, *or* if it
+ # comes from the same collection as the one which is dependent on it
+ if(SLICE_COLLECTION_${collection}_TRANSLATE OR (collection STREQUAL COLLECTION))
+ # check the initial parts of the path to the dependency file against the collection's
+ # Slice file directory path
+ if(SLICE_COLLECTION_${collection} AND ("${source}" MATCHES "${SLICE_COLLECTION_${collection}}/(.+)"))
+ list(FIND ${COMPONENT}_${collection}_SLICES ${CMAKE_MATCH_1} index)
+ if(index EQUAL -1)
+ message(STATUS "Auto-adding ${CMAKE_MATCH_1} from collection ${collection} to ${COMPONENT}")
+ # if the component isn't already using any Slice files from this collection,
+ # record this collection in the list
+ list(FIND collections ${collection} index)
+ if(index EQUAL -1)
+ list(APPEND collections ${collection})
+ endif()
+ list(APPEND new_slices_${collection} ${CMAKE_MATCH_1})
+ endif()
+ endif()
+ endif()
+ endforeach()
+ endforeach()
+ endforeach()
+ # now append all the auto-discovered Slice files to the appropriate lists for this component
+ foreach(collection ${SLICE_GLOBAL_COLLECTIONS} PROJECT LOCAL)
+ if(new_slices_${collection})
+ unset(all_slices)
+ list(APPEND all_slices ${${COMPONENT}_${collection}_SLICES} ${new_slices_${collection}})
+ list(REMOVE_DUPLICATES all_slices)
+ __astscf_set_cache_string(${COMPONENT}_${collection}_SLICES "${all_slices}" "" ADVANCED)
+ endif()
+ endforeach()
+ list(REMOVE_DUPLICATES collections)
+ __astscf_set_cache_string(${COMPONENT}_SLICE_COLLECTIONS "${collections}" "" ADVANCED)
endfunction()
-# Function which add a Slice file to a component. This handles all the magic of
-# creating the rules to run slice2cpp, adding the generated headers to the
-# include path, adding the generated .cpp file to the component, etc. The
-# generated files are placed in ${CMAKE_CURRENT_BINARY_DIR}/slice-<collection>.
+# Function which uses the Slice translator to discover the files that a particular Slice
+# file depends on, and the files the translator would generate from that Slice file. The
+# TARGETS argument specifies the name of a variable that will receive the list of generated
+# files; the SOURCES argument specifies the name of a variable that will receive the list
+# of dependency files.
#
-function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SLICE)
- # Append the needed include directories for Slice definitions
- foreach(include ${SLICE_INCLUDE_DIRECTORIES})
- list(APPEND slice_compiler_arguments "-I${include}")
- endforeach()
-
- # Set some common Slice translator options:
- # - generate support for the Ice streaming interface
- # - generate checksums for definitions
- # - allow underscores to be used in identifiers
- list(APPEND slice_compiler_arguments "--stream" "--checksum" "--underscore")
-
- # If any Slice plugins are to be used, include them in the
- # compiler arguments
- if(SLICE_PLUGINS)
- foreach(plugin ${SLICE_PLUGINS})
- list(APPEND slice_compiler_arguments "--plugin=${plugin}")
- endforeach()
- endif()
-
- get_filename_component(slice_basename "${SLICE}" NAME_WE)
- get_filename_component(slice_subdir "${SLICE}" PATH)
-
- message(STATUS "Adding ${SLICE} from collection ${COLLECTION} to ${COMPONENT}")
- # compute the directory in which to put the generated code and header files
- set(slice_out_collection_dir "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENT}/slice-${COLLECTION}")
- if(slice_subdir)
- set(slice_out_file_dir "${slice_out_collection_dir}/${slice_subdir}")
- else()
- set(slice_out_file_dir "${slice_out_collection_dir}")
- endif()
- # header files that refer to the one generated from this Slice file
- # will try to find it from the base of the collection, so add that
- # directory to the include path
- include_directories(SYSTEM "${slice_out_collection_dir}")
- # the C++ source file generated from this Slice file will try to find
- # the generated header in the same directory as the source, so add
- # the file's immediate directory to the include path as well
- include_directories(SYSTEM "${slice_out_file_dir}")
-
- # Determine this Slice file's dependencies
- message(STATUS "Determining dependencies for ${SLICE}")
+function(__astscf_slice_get_targets_and_sources COLLECTION COLLECTION_DIR SLICE COMPILER_ARGS TARGETS SOURCES)
+ message(STATUS "Determining dependencies for ${SLICE} from ${COLLECTION}")
execute_process(
- COMMAND ${SLICE_COMPILER} ${slice_compiler_arguments} --depend ${COLLECTION_DIR}/${SLICE}
+ COMMAND ${SLICE_COMPILER} ${COMPILER_ARGS} --depend ${COLLECTION_DIR}/${SLICE}
OUTPUT_VARIABLE raw_dependencies
ERROR_VARIABLE slice_errors)
if(slice_errors)
@@ -772,23 +797,41 @@ function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SL
list(APPEND expsources ${dep_sources})
endforeach()
endif()
-
foreach(source ${expsources})
# put the spaces back in.
string(REPLACE "%20%" " " source ${source})
list(APPEND sources ${source})
endforeach()
- # prepend the slice_out_dir to the targets
- foreach(target ${targets})
- list(APPEND generated_files "${slice_out_file_dir}/${target}")
+ if(targets)
+ get_filename_component(slice_basename "${SLICE}" NAME_WE)
+ list(APPEND targets "${slice_basename}.h")
+ list(REMOVE_DUPLICATES targets)
+ list(SORT targets)
+ set(${TARGETS} ${targets} PARENT_SCOPE)
+ endif()
+
+ if(sources)
+ list(SORT sources)
+ set(${SOURCES} ${sources} PARENT_SCOPE)
+ endif()
+endfunction()
+
+# Function which collects together all the arguments that should be specified
+# to the Slice compiler, if it is to be executed in the current scope. The list of
+# arguments is stored in the variable named in the ARGUMENTS argument.
+#
+function(__astscf_slice_compiler_arguments ARGUMENTS)
+ # Append the needed include directories for Slice definitions
+ foreach(include ${SLICE_INCLUDE_DIRECTORIES})
+ list(APPEND slice_compiler_arguments "-I${include}")
endforeach()
- # you would think that would be enough, but slice2cpp doesn't generate a
- # dep for the .h file
- list(APPEND generated_files "${slice_out_file_dir}/${slice_basename}.h")
- # and be resilient in case it does so in the future...
- list(REMOVE_DUPLICATES generated_files)
- set_source_files_properties(${generated_files} PROPERTIES GENERATED 1)
+
+ # Set some common Slice translator options:
+ # - generate support for the Ice streaming interface
+ # - generate checksums for definitions
+ # - allow underscores to be used in identifiers
+ list(APPEND slice_compiler_arguments "--stream" "--checksum" "--underscore")
# create a preprocessor definition in the generated CXX files that enables
# the generated classes to be exported from the library (only necessary on
@@ -797,6 +840,53 @@ function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SL
list(APPEND slice_compiler_arguments "--dll-export" "ASTSCF_DLL_EXPORT")
endif()
+ # If any Slice plugins are to be used, include them in the
+ # compiler arguments
+ if(SLICE_PLUGINS)
+ foreach(plugin ${SLICE_PLUGINS})
+ list(APPEND slice_compiler_arguments "--plugin=${plugin}")
+ endforeach()
+ endif()
+
+ set(${ARGUMENTS} ${slice_compiler_arguments} PARENT_SCOPE)
+endfunction()
+
+# Function which add a Slice file to a component. This handles all the magic of
+# creating the rules to run slice2cpp, adding the generated headers to the
+# include path, adding the generated .cpp file to the component, etc. The
+# generated files are placed in ${CMAKE_CURRENT_BINARY_DIR}/slice-<collection>.
+#
+function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SLICE)
+ __astscf_slice_compiler_arguments(slice_compiler_arguments)
+
+ get_filename_component(slice_basename "${SLICE}" NAME_WE)
+ get_filename_component(slice_subdir "${SLICE}" PATH)
+
+ # compute the directory in which to put the generated code and header files
+ set(slice_out_collection_dir "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENT}/slice-${COLLECTION}")
+ if(slice_subdir)
+ set(slice_out_file_dir "${slice_out_collection_dir}/${slice_subdir}")
+ else()
+ set(slice_out_file_dir "${slice_out_collection_dir}")
+ endif()
+
+ __astscf_slice_get_targets_and_sources(${COLLECTION} "${COLLECTION_DIR}" "${SLICE}" "${slice_compiler_arguments}" targets sources)
+
+ # prepend the slice_out_dir to the targets
+ foreach(target ${targets})
+ list(APPEND generated_files "${slice_out_file_dir}/${target}")
+ endforeach()
+ set_source_files_properties(${generated_files} PROPERTIES GENERATED 1)
+
+ # header files that refer to the one generated from this Slice file
+ # will try to find it from the base of the collection, so add that
+ # directory to the include path
+ include_directories(SYSTEM "${slice_out_collection_dir}")
+ # the C++ source file generated from this Slice file will try to find
+ # the generated header in the same directory as the source, so add
+ # the file's immediate directory to the include path as well
+ include_directories(SYSTEM "${slice_out_file_dir}")
+
file(MAKE_DIRECTORY ${slice_out_file_dir})
add_custom_command(
OUTPUT ${generated_files}
commit c2200de90a43998ecd8c87b56158ab3cc3142ab8
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:55:31 2011 -0500
Provide 'astscf' prefix for linking to ice-util-cpp library.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af0b9a3..c7f87b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories(${logger_dir}/include)
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
astscf_component_init(bridgeservice)
astscf_component_add_files(bridgeservice Service.cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a770dfa..73c590d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories(${logger_dir}/include)
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
include_directories("../src")
commit 8b00cfaec8340c7c57559706ccd3b96d2002faac
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:40:16 2011 -0500
Install component-specific Slice files.
Use astscf_slice_collection_install() to install the Slice files provided
by each component, that define its interfaces. As part of this change, many
of these Slice files were renamed and moved into different namespaces, to
provide consistency.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77d9be5..63316cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
+astscf_slice_collection_install(PROJECT)
diff --git a/slice/BridgeReplicatorIf.ice b/slice/AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice
similarity index 97%
rename from slice/BridgeReplicatorIf.ice
rename to slice/AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice
index 1d3e1b8..4b404cb 100644
--- a/slice/BridgeReplicatorIf.ice
+++ b/slice/AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice
@@ -22,7 +22,9 @@
module AsteriskSCF
{
-module Bridge
+module Replication
+{
+module BridgeService
{
["suppress"]
module V1
@@ -240,6 +242,7 @@ interface Replicator
idempotent ReplicatedStateItemSeq getAllState();
};
-}; /* End of namespace V1 */
-}; /* End of namespace Bridge */
-}; /* End of namespace AsteriskSCF */
+}; /* End of module V1 */
+}; /* End of module BridgeService */
+}; /* End of module Replication */
+}; /* End of module AsteriskSCF */
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 60b6bb2..f669b40 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -33,7 +33,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
@@ -1016,7 +1016,7 @@ AsteriskSCF::BridgeService::BridgeServant::create(const string& name, const Ice:
const ReplicatorSmartPrx& replicator,
const Logger& logger)
{
- BridgeStateItemPtr state(new AsteriskSCF::Bridge::V1::BridgeStateItem);
+ BridgeStateItemPtr state(new AsteriskSCF::Replication::BridgeService::V1::BridgeStateItem);
state->runningState = Running;
state->serial = SerialCounterStart;
//
@@ -1033,7 +1033,7 @@ AsteriskSCF::BridgeService::BridgeServant::create(const Ice::ObjectAdapterPtr& o
const AsteriskSCF::BridgeService::BridgeListenerMgrPtr& listenerMgr,
const ReplicatorSmartPrx& replicator,
const Logger& logger,
- const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& state)
+ const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& state)
{
logger(Debug) << FUNLOG << ": creating replica for " << state->bridgeId;
IceUtil::Handle<AsteriskSCF::BridgeService::BridgeServant> bridge(
diff --git a/src/BridgeImpl.h b/src/BridgeImpl.h
index f764355..2c9ab9f 100644
--- a/src/BridgeImpl.h
+++ b/src/BridgeImpl.h
@@ -98,10 +98,10 @@ public:
* TODO: complete documentation.
*
**/
- virtual void updateState(const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& state) = 0;
+ virtual void updateState(const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& state) = 0;
- virtual void addListener(const AsteriskSCF::Bridge::V1::BridgeListenerStateItemPtr& state) = 0;
- virtual void removeListener(const AsteriskSCF::Bridge::V1::BridgeListenerStateItemPtr& state) = 0;
+ virtual void addListener(const AsteriskSCF::Replication::BridgeService::V1::BridgeListenerStateItemPtr& state) = 0;
+ virtual void removeListener(const AsteriskSCF::Replication::BridgeService::V1::BridgeListenerStateItemPtr& state) = 0;
virtual std::string id() = 0;
@@ -148,7 +148,7 @@ public:
const AsteriskSCF::BridgeService::BridgeListenerMgrPtr& listenerMgr,
const ReplicatorSmartPrx& replicator,
const AsteriskSCF::System::Logging::Logger& logger,
- const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& state);
+ const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& state);
};
typedef IceUtil::Handle<BridgeServant> BridgeServantPtr;
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index be58b67..c0fec01 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -34,7 +34,7 @@ using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace std;
namespace
@@ -302,7 +302,7 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
{
mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::unique_lock<boost::shared_mutex> lock(mLock);
- if (mState->runningState == AsteriskSCF::Bridge::V1::ShuttingDown)
+ if (mState->runningState == AsteriskSCF::Replication::BridgeService::V1::ShuttingDown)
{
mLogger(Debug) << FUNLOG << ": already shutting down.";
return;
@@ -317,7 +317,7 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
mListeners->stopping();
}
mLogger(Info) << current.adapter->getCommunicator()->identityToString(current.id) << ": shutting down." ;
- mState->runningState = AsteriskSCF::Bridge::V1::ShuttingDown;
+ mState->runningState = AsteriskSCF::Replication::BridgeService::V1::ShuttingDown;
reap();
for (vector<BridgeInfo>::iterator i = mBridges.begin(); i != mBridges.end(); ++i)
{
@@ -329,13 +329,13 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
mListeners->stopped();
}
mAdapter->getCommunicator()->shutdown();
- mState->runningState = AsteriskSCF::Bridge::V1::Destroyed;
+ mState->runningState = AsteriskSCF::Replication::BridgeService::V1::Destroyed;
}
bool BridgeManagerImpl::destroyed()
{
mLogger(Debug) << FUNLOG;
- return mState->runningState == AsteriskSCF::Bridge::V1::Destroyed;
+ return mState->runningState == AsteriskSCF::Replication::BridgeService::V1::Destroyed;
}
BridgeManagerStateItemPtr BridgeManagerImpl::getState()
@@ -441,12 +441,12 @@ void BridgeManagerImpl::statePreCheck(const string& caller)
{
mLogger(Info) << caller << ": remote call invoked when not active!";
}
- if (mState->runningState == AsteriskSCF::Bridge::V1::ShuttingDown)
+ if (mState->runningState == AsteriskSCF::Replication::BridgeService::V1::ShuttingDown)
{
mLogger(Debug) << caller << ": called when shutting down." ;
throw AsteriskSCF::System::Component::V1::ShuttingDown();
}
- if (mState->runningState == AsteriskSCF::Bridge::V1::Paused || mListeners->isSuspended())
+ if (mState->runningState == AsteriskSCF::Replication::BridgeService::V1::Paused || mListeners->isSuspended())
{
mLogger(Debug) << caller << ": called when suspended." ;
throw AsteriskSCF::System::Component::V1::Suspended();
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index dd7fad3..2f22125 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -42,9 +42,9 @@ public:
*
**/
- virtual AsteriskSCF::Bridge::V1::BridgeManagerStateItemPtr getState() = 0;
+ virtual AsteriskSCF::Replication::BridgeService::V1::BridgeManagerStateItemPtr getState() = 0;
- virtual void updateState(const AsteriskSCF::Bridge::V1::BridgeManagerStateItemPtr& state) = 0;
+ virtual void updateState(const AsteriskSCF::Replication::BridgeService::V1::BridgeManagerStateItemPtr& state) = 0;
virtual std::vector<BridgeServantPtr> getBridges() = 0;
@@ -52,9 +52,9 @@ public:
virtual std::string getID() = 0;
- virtual void createBridgeReplica(const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& bridgeState) = 0;
+ virtual void createBridgeReplica(const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& bridgeState) = 0;
- virtual void removeBridge(const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& bridgeState) = 0;
+ virtual void removeBridge(const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& bridgeState) = 0;
};
typedef IceUtil::Handle<BridgeManagerServant> BridgeManagerServantPtr;
diff --git a/src/BridgeReplicatorService.cpp b/src/BridgeReplicatorService.cpp
index e672287..e80f8e1 100644
--- a/src/BridgeReplicatorService.cpp
+++ b/src/BridgeReplicatorService.cpp
@@ -27,15 +27,15 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::Core::Discovery::V1;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
typedef AsteriskSCF::Replication::StateReplicator<
- AsteriskSCF::Bridge::V1::Replicator,
- AsteriskSCF::Bridge::V1::ReplicatedStateItemPtr,
+ AsteriskSCF::Replication::BridgeService::V1::Replicator,
+ AsteriskSCF::Replication::BridgeService::V1::ReplicatedStateItemPtr,
string,
- AsteriskSCF::Bridge::V1::ReplicatorListenerPrx> ReplicatorI;
+ AsteriskSCF::Replication::BridgeService::V1::ReplicatorListenerPrx> ReplicatorI;
typedef IceUtil::Handle<ReplicatorI> ReplicatorIPtr;
diff --git a/src/BridgeReplicatorStateListenerI.cpp b/src/BridgeReplicatorStateListenerI.cpp
index 9b82c50..d260135 100644
--- a/src/BridgeReplicatorStateListenerI.cpp
+++ b/src/BridgeReplicatorStateListenerI.cpp
@@ -25,7 +25,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace std;
namespace
diff --git a/src/BridgeReplicatorStateListenerI.h b/src/BridgeReplicatorStateListenerI.h
index e666b59..f8e4cf6 100644
--- a/src/BridgeReplicatorStateListenerI.h
+++ b/src/BridgeReplicatorStateListenerI.h
@@ -35,7 +35,7 @@ class Logger;
namespace BridgeService
{
-Bridge::V1::ReplicatorListenerPtr createStateListener(const AsteriskSCF::System::Logging::Logger& logger,
+Replication::BridgeService::V1::ReplicatorListenerPtr createStateListener(const AsteriskSCF::System::Logging::Logger& logger,
const AsteriskSCF::BridgeService::BridgeManagerServantPtr& manager);
} /* End of namespace BridgeService */
diff --git a/src/BridgeServiceConfig.h b/src/BridgeServiceConfig.h
index 5452f5e..6acfcb8 100644
--- a/src/BridgeServiceConfig.h
+++ b/src/BridgeServiceConfig.h
@@ -67,7 +67,7 @@ inline std::string objectIdFromCurrent(const Ice::Current& current)
return current.adapter->getCommunicator()->identityToString(current.id);
}
-typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Bridge::V1::ReplicatorPrx> ReplicatorSmartPrx;
+typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::BridgeService::V1::ReplicatorPrx> ReplicatorSmartPrx;
} // End of namespace BridgeService
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0b46805..af0b9a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,7 @@ astscf_component_add_files(bridgeservice Tasks.h)
astscf_component_add_files(bridgeservice InternalExceptions.h)
astscf_component_add_files(bridgeservice BridgeServiceConfig.h)
astscf_component_add_files(bridgeservice ListenerManager.h)
-astscf_component_add_slices(bridgeservice PROJECT BridgeReplicatorIf.ice)
+astscf_component_add_slices(bridgeservice PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
astscf_component_add_ice_libraries(bridgeservice IceStorm)
astscf_component_add_boost_libraries(bridgeservice thread date_time)
astscf_component_add_slice_collection_libraries(bridgeservice ASTSCF)
@@ -39,7 +39,7 @@ astscf_component_install(bridgeservice)
astscf_component_init(BridgeReplicator)
astscf_component_add_files(BridgeReplicator BridgeReplicatorService.cpp)
-astscf_component_add_slices(BridgeReplicator PROJECT BridgeReplicatorIf.ice)
+astscf_component_add_slices(BridgeReplicator PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
astscf_component_add_ice_libraries(BridgeReplicator IceStorm)
astscf_component_add_boost_libraries(BridgeReplicator thread date_time)
astscf_component_add_slice_collection_libraries(BridgeReplicator ASTSCF)
diff --git a/src/DebugUtil.h b/src/DebugUtil.h
index b8e6e41..c259a2b 100644
--- a/src/DebugUtil.h
+++ b/src/DebugUtil.h
@@ -26,7 +26,7 @@ namespace BridgeService
inline
std::ostream& dumpState(std::ostream& os, const std::string& prefix,
- const AsteriskSCF::Bridge::V1::BridgedSessionPtr& session,
+ const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr& session,
const Ice::CommunicatorPtr& comm)
{
#ifndef _NDEBUG
@@ -42,13 +42,13 @@ std::ostream& dumpState(std::ostream& os, const std::string& prefix,
os << prefix << "State: ";
switch (session->currentState)
{
- case AsteriskSCF::Bridge::V1::Added:
+ case AsteriskSCF::Replication::BridgeService::V1::Added:
os << "added\n";
break;
- case AsteriskSCF::Bridge::V1::Connected:
+ case AsteriskSCF::Replication::BridgeService::V1::Connected:
os << "connected\n";
break;
- case AsteriskSCF::Bridge::V1::Disconnected:
+ case AsteriskSCF::Replication::BridgeService::V1::Disconnected:
os << "disconnected\n";
break;
default:
@@ -62,7 +62,7 @@ std::ostream& dumpState(std::ostream& os, const std::string& prefix,
}
inline
-std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& state,
+std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& state,
const Ice::CommunicatorPtr&)
{
#ifndef _NDEBUG
@@ -77,16 +77,16 @@ std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Bridge::V1::BridgeS
os << "state : ";
switch (state->runningState)
{
- case AsteriskSCF::Bridge::V1::Running:
+ case AsteriskSCF::Replication::BridgeService::V1::Running:
os << "running\n";
break;
- case AsteriskSCF::Bridge::V1::Paused:
+ case AsteriskSCF::Replication::BridgeService::V1::Paused:
os << "paused\n";
break;
- case AsteriskSCF::Bridge::V1::ShuttingDown:
+ case AsteriskSCF::Replication::BridgeService::V1::ShuttingDown:
os << "shutting down\n";
break;
- case AsteriskSCF::Bridge::V1::Destroyed:
+ case AsteriskSCF::Replication::BridgeService::V1::Destroyed:
os << "destroyed\n";
break;
default:
@@ -95,10 +95,10 @@ std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Bridge::V1::BridgeS
os << "Media replication policy: ";
switch (state->mediaReplicationPolicy)
{
- case AsteriskSCF::Bridge::V1::Replicate:
+ case AsteriskSCF::Replication::BridgeService::V1::Replicate:
os << "replicate\n";
break;
- case AsteriskSCF::Bridge::V1::Reconstruct:
+ case AsteriskSCF::Replication::BridgeService::V1::Reconstruct:
os << "reconstruct\n";
break;
default:
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 1a631b6..e8abb17 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -37,7 +37,7 @@
//
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::Media::V1;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace std;
namespace AsteriskSCF
diff --git a/src/MediaSplicer.h b/src/MediaSplicer.h
index 835374d..e00b2a9 100644
--- a/src/MediaSplicer.h
+++ b/src/MediaSplicer.h
@@ -71,7 +71,7 @@ public:
/**
* Replication support function.
**/
- virtual void update(const AsteriskSCF::Bridge::V1::SessionPairingPtr& update) = 0;
+ virtual void update(const AsteriskSCF::Replication::BridgeService::V1::SessionPairingPtr& update) = 0;
};
typedef IceUtil::Handle<MediaConnector> MediaConnectorPtr;
@@ -83,7 +83,7 @@ public:
const AsteriskSCF::System::Logging::Logger& logger);
void connect(const SessionWrapperPtr& session, const AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionPrx);
- MediaConnectorPtr createReplica(const AsteriskSCF::Bridge::V1::SessionPairingPtr& pairings);
+ MediaConnectorPtr createReplica(const AsteriskSCF::Replication::BridgeService::V1::SessionPairingPtr& pairings);
private:
boost::shared_ptr<MediaSplicerI> mImpl;
diff --git a/src/Service.cpp b/src/Service.cpp
index 451ed60..f0379d4 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -32,7 +32,7 @@ using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
diff --git a/src/SessionCollection.cpp b/src/SessionCollection.cpp
index bf9db83..eb15ad9 100644
--- a/src/SessionCollection.cpp
+++ b/src/SessionCollection.cpp
@@ -21,7 +21,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
diff --git a/src/SessionCollection.h b/src/SessionCollection.h
index 745c7df..d306da9 100644
--- a/src/SessionCollection.h
+++ b/src/SessionCollection.h
@@ -128,9 +128,9 @@ public:
**/
void reap();
- void replicaUpdate(const AsteriskSCF::Bridge::V1::BridgedSessionPtr& bridgedSession);
+ void replicaUpdate(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr& bridgedSession);
- void removeSession(const AsteriskSCF::Bridge::V1::BridgedSessionPtr& bridgedSession);
+ void removeSession(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr& bridgedSession);
private:
diff --git a/src/SessionListener.cpp b/src/SessionListener.cpp
index bf5b450..10a8d73 100644
--- a/src/SessionListener.cpp
+++ b/src/SessionListener.cpp
@@ -21,7 +21,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
diff --git a/src/SessionOperations.cpp b/src/SessionOperations.cpp
index d8ab630..58670a9 100644
--- a/src/SessionOperations.cpp
+++ b/src/SessionOperations.cpp
@@ -19,7 +19,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
diff --git a/src/SessionOperations.h b/src/SessionOperations.h
index 89e6c8b..97726fc 100644
--- a/src/SessionOperations.h
+++ b/src/SessionOperations.h
@@ -80,7 +80,7 @@ private:
class IfStateCriteria
{
public:
- IfStateCriteria(AsteriskSCF::Bridge::V1::BridgedSessionState state) :
+ IfStateCriteria(AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState state) :
mState(state)
{
}
@@ -91,7 +91,7 @@ public:
}
private:
- AsteriskSCF::Bridge::V1::BridgedSessionState mState;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState mState;
};
class StateMemberSelector
@@ -101,7 +101,7 @@ public:
mWrapper(wrapper)
{
}
- AsteriskSCF::Bridge::V1::BridgedSessionState select()
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState select()
{
return mWrapper->getBridgedSession()->currentState;
}
diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
index 48ccfa8..c66b0f8 100644
--- a/src/SessionWrapper.cpp
+++ b/src/SessionWrapper.cpp
@@ -23,7 +23,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::BridgeService;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF;
using namespace std;
@@ -248,7 +248,7 @@ class SetStateTask : public QueuedTask
{
public:
SetStateTask(const SessionWrapperPtr& session,
- const AsteriskSCF::Bridge::V1::BridgedSessionState newState) :
+ const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState newState) :
QueuedTask("SetStateTask"),
mSession(session),
mState(newState)
@@ -264,15 +264,15 @@ protected:
private:
SessionWrapperPtr mSession;
- AsteriskSCF::Bridge::V1::BridgedSessionState mState;
- AsteriskSCF::Bridge::V1::BridgedSessionState mOldState;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState mState;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState mOldState;
};
class SetStateFromTask : public QueuedTask
{
public:
SetStateFromTask(const SessionWrapperPtr& session,
- const AsteriskSCF::Bridge::V1::BridgedSessionState newState,
+ const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState newState,
const StateSet& startStates) :
QueuedTask("SetStateFromTask"),
mSession(session),
@@ -294,8 +294,8 @@ protected:
private:
SessionWrapperPtr mSession;
- AsteriskSCF::Bridge::V1::BridgedSessionState mState;
- AsteriskSCF::Bridge::V1::BridgedSessionState mOldState;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState mState;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState mOldState;
StateSet mStartStates;
};
@@ -359,11 +359,11 @@ QueuedTasks createShutdownTasks(const SessionWrapperPtr& session, const SessionL
// queue from continuing if the session is already connected or done.
//
StateSet statesToContinueOn;
- statesToContinueOn.insert(::AsteriskSCF::Bridge::V1::Added);
- statesToContinueOn.insert(::AsteriskSCF::Bridge::V1::Connected);
+ statesToContinueOn.insert(::AsteriskSCF::Replication::BridgeService::V1::Added);
+ statesToContinueOn.insert(::AsteriskSCF::Replication::BridgeService::V1::Connected);
QueuedTasks tasks;
- tasks.push_back(new SetStateFromTask(session, ::AsteriskSCF::Bridge::V1::Disconnected, statesToContinueOn));
+ tasks.push_back(new SetStateFromTask(session, ::AsteriskSCF::Replication::BridgeService::V1::Disconnected, statesToContinueOn));
if (code)
{
tasks.push_back(new RemoveBridgeTask(session, listener, true));
@@ -376,7 +376,7 @@ QueuedTasks createShutdownTasks(const SessionWrapperPtr& session, const SessionL
QueuedTasks createSetupTasks(const SessionWrapperPtr& session)
{
QueuedTasks tasks;
- tasks.push_back(new SetStateTask(session, ::AsteriskSCF::Bridge::V1::Connected));
+ tasks.push_back(new SetStateTask(session, ::AsteriskSCF::Replication::BridgeService::V1::Connected));
tasks.push_back(new ConnectMediaTask(session));
return tasks;
}
@@ -591,11 +591,11 @@ void SessionWrapper::shutdown(const SessionListenerPrx& listener, const Response
// shutdownRunner->start();
}
-AsteriskSCF::Bridge::V1::BridgedSessionState SessionWrapper::setState(const AsteriskSCF::Bridge::V1::BridgedSessionState newState)
+AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState SessionWrapper::setState(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState newState)
{
mLogger(Debug) << FUNLOG << ": updating state " << mId;
BridgedSessionPtr copyOfNewState;
- AsteriskSCF::Bridge::V1::BridgedSessionState oldState;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState oldState;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
oldState = mSession->currentState;
diff --git a/src/SessionWrapper.h b/src/SessionWrapper.h
index e0a8835..9ddb43c 100644
--- a/src/SessionWrapper.h
+++ b/src/SessionWrapper.h
@@ -30,7 +30,7 @@ namespace BridgeService
class SessionWrapper : public Ice::LocalObject
{
public:
- SessionWrapper(const AsteriskSCF::Bridge::V1::BridgedSessionPtr& session,
+ SessionWrapper(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr& session,
const MediaSplicerPtr& splicer,
const AsteriskSCF::BridgeService::ReplicatorSmartPrx& replicator,
const AsteriskSCF::System::Logging::Logger& logger);
@@ -70,7 +70,7 @@ public:
* creates a copy of the BridgedSession object.
* Does not initiate replication.
**/
- AsteriskSCF::Bridge::V1::BridgedSessionPtr getBridgedSession() const;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr getBridgedSession() const;
/**
* Accesses the session proxy itself that is part of this session.
@@ -87,7 +87,7 @@ public:
**/
void setupMedia();
void setConnector(const MediaConnectorPtr& connector);
- void updateMedia(const AsteriskSCF::Bridge::V1::SessionPairingPtr& pairings);
+ void updateMedia(const AsteriskSCF::Replication::BridgeService::V1::SessionPairingPtr& pairings);
/**
* Frees connection related resources.
@@ -99,7 +99,7 @@ public:
* Updates the contents of this session with replica updates. This should
* not be called unless this session is hosted by a standby service.
**/
- void update(const AsteriskSCF::Bridge::V1::BridgedSessionPtr& update);
+ void update(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr& update);
/**
* Marks this wrapper as "done" and ready to be cleaned up.
@@ -127,7 +127,7 @@ public:
//
// TODO: Refactor so these methods don't need to be exposed.
//
- AsteriskSCF::Bridge::V1::BridgedSessionState setState(const AsteriskSCF::Bridge::V1::BridgedSessionState newState);
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState setState(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState newState);
/**
* Disconnection helper.
@@ -137,7 +137,7 @@ public:
private:
mutable boost::shared_mutex mLock;
- AsteriskSCF::Bridge::V1::BridgedSessionPtr mSession;
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr mSession;
AsteriskSCF::BridgeService::ReplicatorSmartPrx mReplicator;
MediaConnectorPtr mConnector;
AsteriskSCF::System::Logging::Logger mLogger;
@@ -149,10 +149,10 @@ private:
* Sends changes to the replication service. This should never occur
* unless the host service is active.
**/
- void pushUpdate(const AsteriskSCF::Bridge::V1::BridgedSessionPtr& update);
+ void pushUpdate(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr& update);
- AsteriskSCF::Bridge::V1::BridgedSessionPtr createUpdate();
+ AsteriskSCF::Replication::BridgeService::V1::BridgedSessionPtr createUpdate();
};
typedef IceUtil::Handle<SessionWrapper> SessionWrapperPtr;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1d3acf7..a770dfa 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ astscf_component_add_files(bridge_component_test BridgeManagerListenerI.h)
astscf_component_add_files(bridge_component_test BridgeManagerListenerI.cpp)
astscf_component_add_files(bridge_component_test TestCommandDriver.cpp)
astscf_component_add_files(bridge_component_test TestCommandDriver.h)
-astscf_component_add_slices(bridge_component_test PROJECT BridgeReplicatorIf.ice)
+astscf_component_add_slices(bridge_component_test PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
astscf_component_add_ice_libraries(bridge_component_test IceStorm)
astscf_component_add_ice_libraries(bridge_component_test IceBox)
astscf_component_add_boost_libraries(bridge_component_test unit_test_framework thread)
@@ -24,7 +24,7 @@ target_link_libraries(bridge_component_test logging-client)
astscf_test_icebox(bridge_component_test config/test_bridging.conf)
astscf_component_init(bridge_unit_tests)
-astscf_component_add_slices(bridge_unit_tests PROJECT BridgeReplicatorIf.ice)
+astscf_component_add_slices(bridge_unit_tests PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
astscf_component_add_files(bridge_unit_tests ../src/SessionCollection.cpp)
astscf_component_add_files(bridge_unit_tests ../src/SessionOperations.cpp)
astscf_component_add_files(bridge_unit_tests ../src/SessionWrapper.cpp)
diff --git a/test/UnitTests.cpp b/test/UnitTests.cpp
index b3bfcef..8a8ebb7 100644
--- a/test/UnitTests.cpp
+++ b/test/UnitTests.cpp
@@ -32,7 +32,7 @@
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
-using namespace AsteriskSCF::Bridge::V1;
+using namespace AsteriskSCF::Replication::BridgeService::V1;
using namespace AsteriskSCF::BridgeService;
using namespace std;
commit 511a822b3c569cb07c5f5f0712c925f9890c0e5d
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:36:15 2011 -0500
Support installation of Slice collections.
Add the astscf_slice_collection_install() function, which will install the
collection's Slice files, header files and library (if they are provided).
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 5d299de..8887518 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -586,7 +586,7 @@ function(astscf_slice_include_collection COLLECTION)
set(SLICE_INCLUDE_DIRECTORIES ${SLICE_INCLUDE_DIRECTORIES} PARENT_SCOPE)
if(SLICE_COLLECTION_${COLLECTION}_HEADERS)
set(path "${SLICE_COLLECTION_${COLLECTION}_HEADERS}")
- message(STATUS "Using C++ headers for Slice collection ${COLLECTION} from: ${path}")
+ message(STATUS "Using C++ headers for Slice collection ${COLLECTION} from ${path}")
# We mark the Slice include directory as a 'system' directory so that
# the compiler will be less likely to generate warnings and/or errors
# for the code in the generated header files.
@@ -912,44 +912,48 @@ function(astscf_component_install COMPONENT)
if(${COMPONENT}_TYPE STREQUAL "icebox")
install(
TARGETS ${COMPONENT}
- ARCHIVE DESTINATION ${ASTSCF_INSTALL_LIB_DIR}
- LIBRARY DESTINATION ${ASTSCF_INSTALL_ICEBOX_DIR}
- RUNTIME DESTINATION ${ASTSCF_INSTALL_ICEBOX_DIR}
+ ARCHIVE DESTINATION "${ASTSCF_INSTALL_LIB_DIR}"
+ LIBRARY DESTINATION "${ASTSCF_INSTALL_ICEBOX_DIR}"
+ RUNTIME DESTINATION "${ASTSCF_INSTALL_ICEBOX_DIR}"
)
else()
install(
TARGETS ${COMPONENT}
- ARCHIVE DESTINATION ${ASTSCF_INSTALL_LIB_DIR}
- LIBRARY DESTINATION ${ASTSCF_INSTALL_LIB_DIR}
- RUNTIME DESTINATION ${ASTSCF_INSTALL_BIN_DIR}
+ ARCHIVE DESTINATION "${ASTSCF_INSTALL_LIB_DIR}"
+ LIBRARY DESTINATION "${ASTSCF_INSTALL_LIB_DIR}"
+ RUNTIME DESTINATION "${ASTSCF_INSTALL_BIN_DIR}"
)
endif()
endfunction()
-# Install generated Slice header files to their proper location
-function(astscf_slice_headers_install)
- install(
- DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/
- DESTINATION ${ASTSCF_INSTALL_INCLUDE_DIR}
- FILES_MATCHING PATTERN "*.h"
- )
-endfunction()
-
-# Install Slice files to their proper location
-function(astscf_slice_install DIR)
- install(
- DIRECTORY ${DIR}
- DESTINATION ${ASTSCF_INSTALL_SLICE_DIR}
- FILES_MATCHING PATTERN "*.ice"
- )
+function(astscf_slice_collection_install COLLECTION)
+ if(NOT SLICE_COLLECTION_${COLLECTION})
+ message(FATAL_ERROR "Slice collection ${COLLECTION} has not been defined.")
+ endif()
+ # install Slice files
+ install(DIRECTORY "${SLICE_COLLECTION_${COLLECTION}}/"
+ DESTINATION "${ASTSCF_INSTALL_SLICE_DIR}"
+ FILES_MATCHING
+ PATTERN "*.ice"
+ )
+ # if the collection has a library that is a target in
+ # this build, install it
+ if(SLICE_COLLECTION_${COLLECTION}_LIBRARY AND ASTSCF_COMPONENT_${SLICE_COLLECTION_${COLLECTION}_LIBRARY})
+ astscf_component_install(${SLICE_COLLECTION_${COLLECTION}_LIBRARY})
+ endif()
+ # if the collection has headers, install them
+ if(SLICE_COLLECTION_${COLLECTION}_HEADERS)
+ astscf_headers_install("${SLICE_COLLECTION_${COLLECTION}_HEADERS}/")
+ endif()
endfunction()
# Install header files to their proper location
function(astscf_headers_install DIR)
install(
- DIRECTORY ${DIR}
- DESTINATION ${ASTSCF_INSTALL_INCLUDE_DIR}
- FILES_MATCHING PATTERN "*.h"
+ DIRECTORY "${DIR}"
+ DESTINATION "${ASTSCF_INSTALL_INCLUDE_DIR}"
+ FILES_MATCHING
+ PATTERN "*.h"
)
endfunction()
commit 1a08a1b3160492d844621bc176099953fc8b095a
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:41:27 2011 -0500
Allow library type specific in astscf_build_library().
astscf_build_library() can now be told to build a STATIC, SHARED or MODULE
library; astscf_set_libtype() has been removed.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index c225053..5d299de 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -877,21 +877,29 @@ function(astscf_component_build_standalone COMPONENT)
target_link_libraries(${COMPONENT} ${component_libs})
endfunction()
-function(astscf_set_libtype COMPONENT TYPE)
- set("${COMPONENT}_LIBTYPE" ${TYPE} PARENT_SCOPE)
-endfunction()
-
function(astscf_component_build_library COMPONENT)
+ cmake_parse_arguments("" "SHARED;STATIC;MODULE" "" "" ${ARGN})
if(NOT ASTSCF_${COMPONENT})
message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
endif()
- message(STATUS "Building component ${COMPONENT} as a ${${COMPONENT}_LIBTYPE} library")
+ if(NOT (_SHARED OR _STATIC OR _MODULE))
+ set(libtype SHARED)
+ elseif(_SHARED AND NOT (_STATIC OR _MODULE))
+ set(libtype SHARED)
+ elseif(_STATIC AND NOT (_SHARED OR _MODULE))
+ set(libtype STATIC)
+ elseif(_MODULE AND NOT (_SHARED OR _STATIC))
+ set(libtype MODULE)
+ else()
+ message(FATAL_ERROR "Only one of STATIC, SHARED or MODULE may be specified.")
+ endif()
+ message(STATUS "Building component ${COMPONENT} as a ${libtype} library")
__astscf_set_cache_string(${COMPONENT}_TYPE library "" ADVANCED)
__astscf_component_slices(${COMPONENT})
__astscf_component_libraries(${COMPONENT})
# Now we actually create the component
- add_library(${COMPONENT} ${${COMPONENT}_LIBTYPE} ${${COMPONENT}_SOURCES})
+ add_library(${COMPONENT} ${libtype} ${${COMPONENT}_SOURCES})
# Link required libraries
target_link_libraries(${COMPONENT} ${component_libs})
endfunction()
commit dd47b0f4d2ffc34b0320708f73d74dde031a1bbe
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:30:59 2011 -0500
Remove unnecessary variable references.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index d888eeb..c225053 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -856,7 +856,7 @@ function(astscf_component_build_icebox COMPONENT)
__astscf_component_libraries(${COMPONENT})
# Now we actually create the shared module
- add_library(${COMPONENT} MODULE ${${COMPONENT}_SLICES} ${${COMPONENT}_SOURCES})
+ add_library(${COMPONENT} MODULE ${${COMPONENT}_SOURCES})
# Link required libraries
target_link_libraries(${COMPONENT} ${component_libs})
endfunction()
@@ -872,7 +872,7 @@ function(astscf_component_build_standalone COMPONENT)
__astscf_component_libraries(${COMPONENT})
# Now we actually create the component
- add_executable(${COMPONENT} ${${COMPONENT}_SLICES} ${${COMPONENT}_SOURCES})
+ add_executable(${COMPONENT} ${${COMPONENT}_SOURCES})
# Link required libraries
target_link_libraries(${COMPONENT} ${component_libs})
endfunction()
@@ -891,7 +891,7 @@ function(astscf_component_build_library COMPONENT)
__astscf_component_libraries(${COMPONENT})
# Now we actually create the component
- add_library(${COMPONENT} ${${COMPONENT}_LIBTYPE} ${${COMPONENT}_SLICES} ${${COMPONENT}_SOURCES})
+ add_library(${COMPONENT} ${${COMPONENT}_LIBTYPE} ${${COMPONENT}_SOURCES})
# Link required libraries
target_link_libraries(${COMPONENT} ${component_libs})
endfunction()
commit 3a0170e26072beb31c5c4fbf0d614323f825be39
Merge: 1e05a54 6cffd17
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:25:30 2011 -0500
Merge branch 'master' into disintegrated-build
commit 1e05a545568f3e707c1e8924cb25b48fa1182193
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:24:31 2011 -0500
Use Slice collections support in AsteriskSCF.cmake.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3ba1c2..0b46805 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
include_directories(${ice-util-cpp_dir}/include)
@@ -33,6 +32,7 @@ astscf_component_add_files(bridgeservice ListenerManager.h)
astscf_component_add_slices(bridgeservice PROJECT BridgeReplicatorIf.ice)
astscf_component_add_ice_libraries(bridgeservice IceStorm)
astscf_component_add_boost_libraries(bridgeservice thread date_time)
+astscf_component_add_slice_collection_libraries(bridgeservice ASTSCF)
astscf_component_build_icebox(bridgeservice)
target_link_libraries(bridgeservice logging-client)
astscf_component_install(bridgeservice)
@@ -42,7 +42,7 @@ astscf_component_add_files(BridgeReplicator BridgeReplicatorService.cpp)
astscf_component_add_slices(BridgeReplicator PROJECT BridgeReplicatorIf.ice)
astscf_component_add_ice_libraries(BridgeReplicator IceStorm)
astscf_component_add_boost_libraries(BridgeReplicator thread date_time)
+astscf_component_add_slice_collection_libraries(BridgeReplicator ASTSCF)
astscf_component_build_icebox(BridgeReplicator)
target_link_libraries(BridgeReplicator logging-client)
-target_link_libraries(BridgeReplicator astscf-api)
astscf_component_install(BridgeReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ebefc73..1d3acf7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,14 +1,12 @@
-include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
include_directories(${ice-util-cpp_dir}/include)
-include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
include_directories("../src")
-astscf_slice_collection(TEST_CHANNEL ${CMAKE_CURRENT_SOURCE_DIR}/../../test_channel/slice)
+astscf_slice_include_collection(TEST_CHANNEL)
astscf_component_init(bridge_component_test)
-astscf_component_add_slices(bridge_component_test TEST_CHANNEL CommandsIf.ice)
+astscf_component_add_slices(bridge_component_test TEST_CHANNEL AsteriskSCF/TestChannel/CommandsIf.ice)
astscf_component_add_files(bridge_component_test TestBridging.cpp)
astscf_component_add_files(bridge_component_test BridgeListenerI.h)
astscf_component_add_files(bridge_component_test BridgeListenerI.cpp)
@@ -20,8 +18,9 @@ astscf_component_add_slices(bridge_component_test PROJECT BridgeReplicatorIf.ice
astscf_component_add_ice_libraries(bridge_component_test IceStorm)
astscf_component_add_ice_libraries(bridge_component_test IceBox)
astscf_component_add_boost_libraries(bridge_component_test unit_test_framework thread)
+astscf_component_add_slice_collection_libraries(bridge_component_test ASTSCF TEST_CHANNEL)
astscf_component_build_icebox(bridge_component_test)
-target_link_libraries(bridge_component_test logging-client astscf-api test-channel-api)
+target_link_libraries(bridge_component_test logging-client)
astscf_test_icebox(bridge_component_test config/test_bridging.conf)
astscf_component_init(bridge_unit_tests)
@@ -33,6 +32,7 @@ astscf_component_add_files(bridge_unit_tests ../src/MediaSplicer.cpp)
astscf_component_add_files(bridge_unit_tests UnitTests.cpp)
astscf_component_add_ice_libraries(bridge_unit_tests Ice)
astscf_component_add_boost_libraries(bridge_unit_tests unit_test_framework thread)
+astscf_component_add_slice_collection_libraries(bridge_unit_tests ASTSCF)
astscf_component_build_standalone(bridge_unit_tests)
-target_link_libraries(bridge_unit_tests logging-client astscf-api)
+target_link_libraries(bridge_unit_tests logging-client)
astscf_test_boost(bridge_unit_tests)
commit 59f28cd006a442312375e2366a22e90730bafac9
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:07:17 2011 -0500
Add initial support for Slice file 'collections'.
Adds various functions to handle collections of Slice-defined interfaces in
an easy-to-use manner; this insulates the scripts that build components
from having to know the actual paths where Slice files, headers files and
libraries are located.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 895cd13..d888eeb 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -184,6 +184,8 @@ endif()
include(CTest)
enable_testing()
+include(CMakeParseArguments)
+
if(UNIX AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_custom_target(update COMMAND git pull WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" COMMENT "Updating clone")
add_custom_target(pull COMMAND git pull WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" COMMENT "Updating clone")
@@ -320,15 +322,8 @@ function(astscf_project NAME ICE_VERSION)
# every component against those libraries at minimum
set(ASTSCF_ICE_LIBRARIES ICE ICEUTIL PARENT_SCOPE)
- message(STATUS "Using Ice C++ headers from: ${ICE_INCLUDE_DIR}")
- # We mark the Ice include directory as a 'system' directory so that
- # the compiler will be less likely to generate warnings and/or errors
- # for the code in the Ice header files.
- include_directories(SYSTEM "${ICE_INCLUDE_DIR}")
-
- set(SLICE_COLLECTION_Ice "${ICE_SLICE_DIR}")
- list(APPEND SLICE_INCLUDE_DIRECTORIES "${ICE_SLICE_DIR}")
- list(REMOVE_DUPLICATES SLICE_INCLUDE_DIRECTORIES)
+ astscf_slice_collection(GLOBAL NAME Ice PATH "${ICE_SLICE_DIR}" HEADERS "${ICE_INCLUDE_DIR}")
+ astscf_slice_include_collection(Ice)
set(SLICE_INCLUDE_DIRECTORIES ${SLICE_INCLUDE_DIRECTORIES} PARENT_SCOPE)
# threading support required
@@ -339,6 +334,7 @@ function(astscf_project NAME ICE_VERSION)
list(APPEND cxx_flags "${CMAKE_THREAD_LIBS_INIT}")
else()
list(APPEND linker_flags "${CMAKE_THREAD_LIBS_INIT}")
+ endif()
endif()
# If C++0x support is requested, use a compiler check to see if it is available
@@ -426,20 +422,6 @@ macro(__astscf_ensure_abs_paths pathlist)
set(${pathlist} ${eap_temp})
endmacro()
-# Function which remembers Slice plugins to be used for all targets in the
-# current directory and below
-function(astscf_slice_plugins)
- if(NOT ARGN)
- message(FATAL_ERROR "You must pass at least one plugin to this function")
- endif()
- set(plugins ${SLICE_PLUGINS})
- foreach(plugin ${ARGN})
- list(APPEND plugins ${plugin})
- endforeach()
- list(REMOVE_DUPLICATES plugins)
- set(SLICE_PLUGINS ${plugins} PARENT_SCOPE)
-endfunction()
-
# Function which initializes a component for building
function(astscf_component_init COMPONENT)
message(STATUS "Setting up to build component ${COMPONENT}")
@@ -502,22 +484,144 @@ function(astscf_component_add_ice_libraries COMPONENT)
__astscf_set_cache_string(${COMPONENT}_ICE_LIBRARIES "${libs}" "" ADVANCED)
endfunction()
-function(astscf_slice_collection COLLECTION PATH)
- get_filename_component(real "${PATH}" REALPATH)
- set(SLICE_COLLECTION_${COLLECTION} "${real}" PARENT_SCOPE)
- message(STATUS "Added Slice collection '${COLLECTION}' at ${PATH}")
+# Function which remembers Slice plugins to be used for all targets in the
+# current directory and below
+function(astscf_slice_plugins)
+ if(NOT ARGN)
+ message(FATAL_ERROR "You must pass at least one plugin to this function")
+ endif()
+ set(plugins ${SLICE_PLUGINS})
+ foreach(plugin ${ARGN})
+ list(APPEND plugins ${plugin})
+ endforeach()
+ list(REMOVE_DUPLICATES plugins)
+ set(SLICE_PLUGINS ${plugins} PARENT_SCOPE)
endfunction()
+# Function which defines a 'collection' of Slice interfaces; the collection
+# will consist of one or more Slice files, and optionally header/source files
+# generated in C++ from them, also optionally a compiled library produced
+# from the generated sources. Both global and local collections are supported;
+# local collections are unnamed and visible only to the directory they are defined
+# in and below. This function can be called more than once for the same global
+# collection if desired, using the 'OVERRIDE' flag, in order to 'update' the
+# collection's details.
+#
+# Syntax:
+# astscf_slice_collection([OVERRIDE] [GLOBAL NAME <name> | LOCAL]
+# [PATH <path>] [LIBRARY <library] [HEADERS <path>])
+#
+# GLOBAL: defines a global collection; NAME is mandatory
+# LOCAL: (default) defines a local collection; NAME will be 'LOCAL'
+# OVERRIDE: must be specified in order to change PATH, LIBRARY or HEADERS
+# for a previously-defined global collection
+# NAME: name of the collection
+# PATH: path to the directory where the Slice files are located
+# HEADERS: path to the directory where Slice-generated headers are located
+# LIBRARY: path or target name of a library built from Slice-generated sources
+#
+function(astscf_slice_collection)
+ cmake_parse_arguments("" "OVERRIDE;GLOBAL;LOCAL" "NAME;PATH;LIBRARY;HEADERS" "" ${ARGN})
+ if(_GLOBAL AND NOT _NAME)
+ message(FATAL_ERROR "NAME argument to this function is mandatory for global Slice collections.")
+ endif()
+ if(_LOCAL AND _NAME)
+ message(FATAL_ERROR "NAME argument to this function is not allowed for local Slice collections.")
+ endif()
+ if(_NAME STREQUAL "LOCAL")
+ message(FATAL_ERROR "'LOCAL' name for Slice collections is reserved.")
+ endif()
+ if(_NAME STREQUAL "PROJECT")
+ message(FATAL_ERROR "'LOCAL' name for Slice collections is reserved.")
+ endif()
+ if(_LIBRARY)
+ if(_GLOBAL AND NOT (_HEADERS OR SLICE_COLLECTION_${_NAME}_HEADERS))
+ message(FATAL_ERROR "A collection with a library must also provide headers.")
+ elseif(_LOCAL AND NOT (_HEADERS OR SLICE_COLLECTION_LOCAL_HEADERS))
+ message(FATAL_ERROR "A collection with a library must also provide headers.")
+ endif()
+ endif()
+ if(_PATH)
+ get_filename_component(real "${_PATH}" REALPATH)
+ elseif(NOT (_OVERRIDE AND _GLOBAL AND SLICE_COLLECTION_${_NAME}))
+ message(FATAL_ERROR "PATH argument to this function is mandatory.")
+ endif()
+ if(_GLOBAL)
+ if(_PATH)
+ __astscf_set_cache_path(SLICE_COLLECTION_${_NAME} "${real}" "Path to Slice files in collection ${_NAME}.")
+ endif()
+ if(_LIBRARY)
+ __astscf_set_cache_string(SLICE_COLLECTION_${_NAME}_LIBRARY "${_LIBRARY}" "Library of generated code for Slice collection ${_NAME}.")
+ endif()
+ if(_HEADERS)
+ __astscf_set_cache_path(SLICE_COLLECTION_${_NAME}_HEADERS "${_HEADERS}" "Path to generated headers for Slice collection ${_NAME}.")
+ endif()
+ message(STATUS "Added Slice collection '${_NAME}' at ${_PATH}")
+ else()
+ if(_PATH)
+ set(SLICE_COLLECTION_LOCAL "${real}" PARENT_SCOPE)
+ endif()
+ if(_LIBRARY)
+ set(SLICE_COLLECTION_LOCAL_LIBRARY "${_LIBRARY}" PARENT_SCOPE)
+ endif()
+ if(_HEADERS)
+ set(SLICE_COLLECTION_LOCAL_HEADERS "${_HEADERS}" PARENT_SCOPE)
+ endif()
+ message(STATUS "Added local Slice collection at ${_PATH}")
+ endif()
+endfunction()
+
+# Function which makes the Slice files and header files from a collection
+# available to components in the current directory and below. The collection's
+# Slice file directory is added to SLICE_INCLUDE_DIRECTORIES (for later use
+# by the Slice translator), and the collection's header files directory
+# (if any) is added as a 'system' include directory for compilations.
+#
function(astscf_slice_include_collection COLLECTION)
+ if(NOT SLICE_COLLECTION_${COLLECTION})
+ message(FATAL_ERROR "Slice collection ${COLLECTION} has not been defined.")
+ endif()
list(APPEND SLICE_INCLUDE_DIRECTORIES "${SLICE_COLLECTION_${COLLECTION}}")
list(REMOVE_DUPLICATES SLICE_INCLUDE_DIRECTORIES)
set(SLICE_INCLUDE_DIRECTORIES ${SLICE_INCLUDE_DIRECTORIES} PARENT_SCOPE)
+ if(SLICE_COLLECTION_${COLLECTION}_HEADERS)
+ set(path "${SLICE_COLLECTION_${COLLECTION}_HEADERS}")
+ message(STATUS "Using C++ headers for Slice collection ${COLLECTION} from: ${path}")
+ # We mark the Slice include directory as a 'system' directory so that
+ # the compiler will be less likely to generate warnings and/or errors
+ # for the code in the generated header files.
+ include_directories(SYSTEM "${path}")
+ endif()
endfunction()
-# Adds Slice files from a collection to a target. This handles all the magic of
-# creating the rules to run slice2cpp, adding the generated headers to the
-# include path, adding the generated .cpp file to the component, etc. The
-# generated files are placed in ${CMAKE_CURRENT_BINARY_DIR}/slice-<collection>.
+# Function which links the library associated with a Slice collection into
+# a component.
+#
+function(astscf_component_add_slice_collection_libraries COMPONENT)
+ if(NOT ARGN)
+ message(FATAL_ERROR "You must pass at least one Slice collection to this function")
+ endif()
+ if(NOT ASTSCF_${COMPONENT})
+ message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
+ endif()
+ set(libs ${${COMPONENT}_SLICE_LIBRARIES})
+ foreach(lib ${ARGN})
+ if(NOT SLICE_COLLECTION_${lib})
+ message(FATAL_ERROR "Slice collection ${lib} has not been defined.")
+ endif()
+ if(NOT SLICE_COLLECTION_${lib}_LIBRARY)
+ message(FATAL_ERROR "Slice collection ${lib} does not provide a library.")
+ endif()
+ message(STATUS "Linking component ${COMPONENT} to library from Slice collection ${lib}")
+ list(APPEND libs ${lib})
+ endforeach()
+ list(REMOVE_DUPLICATES libs)
+ __astscf_set_cache_string(${COMPONENT}_SLICE_LIBRARIES "${libs}" "" ADVANCED)
+endfunction()
+
+# Function which records Slice files, from a collection, as being used by a
+# component. The Slice files will be translated and compiled when the component
+# is built.
#
# The Slice files are passed in as a list of globs, relative to the collection's
# base directory. The globs default to regular non-recursive expansion. If you
@@ -528,6 +632,7 @@ endfunction()
#
# See http://www.cmake.org/cmake/help/cmake-2-8-docs.html#command:file for more
# details on the globbing syntax.
+#
function(astscf_component_add_slices COMPONENT COLLECTION)
if(NOT ARGN)
message(FATAL_ERROR "You must pass at least one Slice file to this function")
@@ -570,14 +675,29 @@ function(astscf_component_add_slices COMPONENT COLLECTION)
else()
# expand the glob into a list of files
file(${glob_style} slices RELATIVE "${collection_dir}" "${collection_dir}/${slice_glob}")
- foreach(slice ${slices})
- __astscf_component_add_one_slice(${COMPONENT} "${COLLECTION}" "${collection_dir}" "${slice}")
- endforeach()
+ if(NOT slices)
+ message(FATAL_ERROR "Pattern '${slice_glob}' did not match any files in ${collection_dir}.")
+ endif()
+ if(NOT found)
+ set(collections ${${COMPONENT}_SLICE_COLLECTIONS})
+ list(APPEND collections ${COLLECTION})
+ list(REMOVE_DUPLICATES collections)
+ __astscf_set_cache_string(${COMPONENT}_SLICE_COLLECTIONS "${collections}" "" ADVANCED)
+ endif()
+ set(found true)
+ list(APPEND all_slices ${slices})
endif()
endforeach()
- __astscf_set_cache_string(${COMPONENT}_SLICES "${${COMPONENT}_SLICES}" "" ADVANCED)
+ list(APPEND all_slices ${${COMPONENT}_${COLLECTION}_SLICES})
+ list(REMOVE_DUPLICATES all_slices)
+ __astscf_set_cache_string(${COMPONENT}_${COLLECTION}_SLICES "${all_slices}" "" ADVANCED)
endfunction()
+# Function which add a Slice file to a component. This handles all the magic of
+# creating the rules to run slice2cpp, adding the generated headers to the
+# include path, adding the generated .cpp file to the component, etc. The
+# generated files are placed in ${CMAKE_CURRENT_BINARY_DIR}/slice-<collection>.
+#
function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SLICE)
# Append the needed include directories for Slice definitions
foreach(include ${SLICE_INCLUDE_DIRECTORIES})
@@ -619,7 +739,7 @@ function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SL
include_directories(SYSTEM "${slice_out_file_dir}")
# Determine this Slice file's dependencies
- message(STATUS "Determining dependencies for ${slice_basename}")
+ message(STATUS "Determining dependencies for ${SLICE}")
execute_process(
COMMAND ${SLICE_COMPILER} ${slice_compiler_arguments} --depend ${COLLECTION_DIR}/${SLICE}
OUTPUT_VARIABLE raw_dependencies
@@ -686,8 +806,21 @@ function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SL
DEPENDS ${sources} ${SLICE_COMPILER})
# the Slice and generated_files are now sources for the component
- set(file_list ${${COMPONENT}_SLICES} ${COLLECTION_DIR}/${SLICE} ${generated_files})
- set(${COMPONENT}_SLICES ${file_list} PARENT_SCOPE)
+ set(file_list ${${COMPONENT}_SOURCES} ${COLLECTION_DIR}/${SLICE} ${generated_files})
+ set(${COMPONENT}_SOURCES ${file_list} PARENT_SCOPE)
+endfunction()
+
+# Function which collects Slice files used by a component, causing them
+# to be translated, compiled and linked into the component
+#
+function(__astscf_component_slices COMPONENT)
+ foreach(collection ${${COMPONENT}_SLICE_COLLECTIONS})
+ set(collection_dir "${SLICE_COLLECTION_${collection}}")
+ foreach(slice ${${COMPONENT}_${collection}_SLICES})
+ __astscf_component_add_one_slice(${COMPONENT} ${collection} "${collection_dir}" "${slice}")
+ endforeach()
+ endforeach()
+ set(${COMPONENT}_SOURCES ${${COMPONENT}_SOURCES} PARENT_SCOPE)
endfunction()
# Function which collects libraries needed by a component
@@ -704,6 +837,9 @@ function(__astscf_component_libraries COMPONENT)
list(APPEND target_libs "${Boost_${lib}_LIBRARY}")
endforeach()
endif()
+ foreach(lib ${${COMPONENT}_SLICE_LIBRARIES})
+ list(APPEND target_libs "${SLICE_COLLECTION_${lib}_LIBRARY}")
+ endforeach()
set(component_libs ${target_libs} PARENT_SCOPE)
endfunction()
@@ -716,6 +852,7 @@ function(astscf_component_build_icebox COMPONENT)
__astscf_set_cache_string(${COMPONENT}_TYPE icebox "" ADVANCED)
find_package(Ice REQUIRED IceBox)
list(APPEND icelibs ${${COMPONENT}_ICE_LIBRARIES} ICEBOX)
+ __astscf_component_slices(${COMPONENT})
__astscf_component_libraries(${COMPONENT})
# Now we actually create the shared module
@@ -731,6 +868,7 @@ function(astscf_component_build_standalone COMPONENT)
endif()
message(STATUS "Building component ${COMPONENT} as a standalone executable")
__astscf_set_cache_string(${COMPONENT}_TYPE standalone "" ADVANCED)
+ __astscf_component_slices(${COMPONENT})
__astscf_component_libraries(${COMPONENT})
# Now we actually create the component
@@ -749,6 +887,7 @@ function(astscf_component_build_library COMPONENT)
endif()
message(STATUS "Building component ${COMPONENT} as a ${${COMPONENT}_LIBTYPE} library")
__astscf_set_cache_string(${COMPONENT}_TYPE library "" ADVANCED)
+ __astscf_component_slices(${COMPONENT})
__astscf_component_libraries(${COMPONENT})
# Now we actually create the component
commit 3c5bc4cc404a86074860741767ea394556240183
Merge: 2997fd6 8cfea72
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 13 15:58:03 2011 -0500
Merge branch 'master' into disintegrated-build
Conflicts:
AsteriskSCF.cmake
diff --cc AsteriskSCF.cmake
index eff7fc8,d039634..895cd13
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@@ -264,146 -276,172 +270,150 @@@ macro(__astscf_compute_test_paths
endmacro()
# Function which initializes project specific things
-function(asterisk_scf_project NAME ICE_VERSION)
- if(ASTERISK_SCF_MASTER_PROJECT)
- # this is a sub-project, so just record the name and
- # move on
- set(ASTERISK_SCF_PROJECT "${NAME}" PARENT_SCOPE)
- set(ASTERISK_SCF_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
- return()
- else()
- set(ASTERISK_SCF_PROJECT "MASTER" PARENT_SCOPE)
- set(ASTERISK_SCF_MASTER_PROJECT true PARENT_SCOPE)
+function(astscf_project NAME ICE_VERSION)
+ if(ASTSCF_MASTER_PROJECT)
+ # this is a sub-project, so just record the name and
+ # move on
+ set(ASTSCF_PROJECT "${NAME}" PARENT_SCOPE)
+ set(ASTSCF_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
+ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/slice")
+ set(SLICE_COLLECTION_PROJECT "${CMAKE_CURRENT_SOURCE_DIR}/slice" PARENT_SCOPE)
+ message(STATUS "Added project-specific Slice collection for '${NAME}' at ${CMAKE_CURRENT_SOURCE_DIR}/slice")
+ list(APPEND SLICE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/slice")
+ set(SLICE_INCLUDE_DIRECTORIES ${SLICE_INCLUDE_DIRECTORIES} PARENT_SCOPE)
endif()
+ return()
+ else()
+ set(ASTSCF_PROJECT "MASTER" PARENT_SCOPE)
+ set(ASTSCF_MASTER_PROJECT true PARENT_SCOPE)
+ endif()
- message(STATUS "Setting up project ${NAME} for Ice version ${ICE_VERSION}")
-
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" PARENT_SCOPE)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" PARENT_SCOPE)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" PARENT_SCOPE)
-
- set(CMAKE_INCLUDE_CURRENT_DIR true)
+ message(STATUS "Setting up project ${NAME} for Ice version ${ICE_VERSION}")
- # On Windows, IceBox C++ services must be compiled with some symbols exported;
- # the source code should use ASTERISK_SCF_ICEBOX_EXPORT to accomplish this, and this
- if(WIN32)
- message(STATUS "Setting ASTERISK_SCF_ICEBOX_EXPORT definition for Windows IceBox services")
- add_definitions(-DASTERISK_SCF_ICEBOX_EXPORT=__declspec\(dllexport\))
- else()
- add_definitions(-DASTERISK_SCF_ICEBOX_EXPORT=)
- endif()
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" PARENT_SCOPE)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" PARENT_SCOPE)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" PARENT_SCOPE)
- # On Windows, 'debug' libraries should have a "d" suffix to indicate that they
- # are debug libraries
- if(WIN32)
- set_cache_var(CMAKE_DEBUG_POSTFIX "d")
- endif()
+ set(CMAKE_INCLUDE_CURRENT_DIR true)
- message(STATUS "Performing requirement checks for components")
- # set(Ice_DEBUG on)
- find_package(Ice 3.4 REQUIRED Ice IceUtil)
-
- # All components need the Ice library, and it needs the
- # IceUtil library (as do most components), so link
- # every component against those libraries at minimum
- set(ASTERISK_SCF_ICE_LIBRARIES ICE ICEUTIL PARENT_SCOPE)
-
- message(STATUS "Using Ice C++ headers from: ${ICE_INCLUDE_DIR}")
- # We mark the Ice include directory as a 'system' directory so that
- # the compiler will be less likely to generate warnings and/or errors
- # for the code in the Ice header files.
- include_directories(SYSTEM "${ICE_INCLUDE_DIR}")
-
- message(STATUS "Using Ice Slice files from: ${ICE_SLICE_DIR}")
- # We can't use asterisk_scf_slice_include_directories here because
- # the variable it sets will only be local to this function
- set(SLICE_INCLUDE_DIRECTORIES "${ICE_SLICE_DIR}" PARENT_SCOPE)
-
- # threading support required
- find_package(Threads REQUIRED)
- if(CMAKE_THREAD_LIBS_INIT)
- if(NOT CMAKE_HAVE_THREADS_LIBRARY)
- list(APPEND c_flags "${CMAKE_THREAD_LIBS_INIT}")
- list(APPEND cxx_flags "${CMAKE_THREAD_LIBS_INIT}")
- else()
- list(APPEND linker_flags "${CMAKE_THREAD_LIBS_INIT}")
- endif()
- endif()
+ # On Windows, IceBox C++ services and some other types of libraries must be compiled
+ # with some symbols exported; the source code should use ASTSCF_DLL_EXPORT to accomplish this
+ if(WIN32)
+ message(STATUS "Setting ASTSCF_DLL_EXPORT definition for Windows libraries")
+ add_definitions(-DASTSCF_DLL_EXPORT=__declspec\(dllexport\))
+ else()
+ add_definitions(-DASTSCF_DLL_EXPORT=)
+ endif()
- # If C++0x support is requested, use a compiler check to see if it is available
- # C++0x was on by default, but we disabled it due to problems with
- # Ubuntu 11.04.
- # See http://bugs.launchpad.net/ubuntu/+source/boost1.42/+bug/776860
- if(ENABLE_CPP0X)
- if(CMAKE_COMPILER_IS_GNUCXX)
- include(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD_CPP0X)
- if(HAVE_STD_CPP0X)
- add_definitions("-DCPP_ZEROX_SUPPORT")
- list(APPEND cxx_flags "-std=c++0x")
- message(STATUS "Support for C++0x Enabled")
- else()
- message(FATAL_ERROR "Compiler does not support C++0x")
- endif()
- endif()
- endif()
+ # On Windows, 'debug' libraries should have a "d" suffix to indicate that they
+ # are debug libraries
+ if(WIN32)
+ __astscf_set_cache_string(CMAKE_DEBUG_POSTFIX "d")
+ endif()
- if(CMAKE_COMPILER_IS_GNUC)
- list(APPEND c_flags_debug "-Wall" "-g3")
- list(APPEND c_flags_profile "-ftest-coverage" "-fprofile-arcs")
- endif()
+ message(STATUS "Performing requirement checks for components")
+ # set(Ice_DEBUG on)
+ find_package(Ice 3.4 REQUIRED Ice IceUtil)
+
+ # All components need the Ice library, and it needs the
+ # IceUtil library (as do most components), so link
+ # every component against those libraries at minimum
+ set(ASTSCF_ICE_LIBRARIES ICE ICEUTIL PARENT_SCOPE)
+
+ message(STATUS "Using Ice C++ headers from: ${ICE_INCLUDE_DIR}")
+ # We mark the Ice include directory as a 'system' directory so that
+ # the compiler will be less likely to generate warnings and/or errors
+ # for the code in the Ice header files.
+ include_directories(SYSTEM "${ICE_INCLUDE_DIR}")
+
+ set(SLICE_COLLECTION_Ice "${ICE_SLICE_DIR}")
+ list(APPEND SLICE_INCLUDE_DIRECTORIES "${ICE_SLICE_DIR}")
+ list(REMOVE_DUPLICATES SLICE_INCLUDE_DIRECTORIES)
+ set(SLICE_INCLUDE_DIRECTORIES ${SLICE_INCLUDE_DIRECTORIES} PARENT_SCOPE)
+
+ # threading support required
+ find_package(Threads REQUIRED)
+ if(CMAKE_THREAD_LIBS_INIT)
+ if(NOT CMAKE_HAVE_THREADS_LIBRARY)
+ list(APPEND c_flags "${CMAKE_THREAD_LIBS_INIT}")
+ list(APPEND cxx_flags "${CMAKE_THREAD_LIBS_INIT}")
+ else()
+ list(APPEND linker_flags "${CMAKE_THREAD_LIBS_INIT}")
- endif()
+ endif()
- # Use a compiler test for GCC to see if C++0x is supported; enable it if found.
- if(CMAKE_COMPILER_IS_GNUCXX)
- include(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD_CPP0X)
- if(HAVE_STD_CPP0X)
- add_definitions("-DCPP_ZEROX_SUPPORT")
- list(APPEND cxx_flags "-std=c++0x")
- message(STATUS "Support for C++0x Enabled")
- else()
- message(STATUS "Support for C++0x Disabled")
++ # If C++0x support is requested, use a compiler check to see if it is available
++ # C++0x was on by default, but we disabled it due to problems with
++ # Ubuntu 11.04.
++ # See http://bugs.launchpad.net/ubuntu/+source/boost1.42/+bug/776860
++ if(ENABLE_CPP0X)
+ if(CMAKE_COMPILER_IS_GNUCXX)
- list(APPEND cxx_flags ${ICE_CXX_FLAGS})
- list(APPEND cxx_flags_debug "-Wall" "-Wextra" "-g3")
- list(APPEND cxx_flags_debug "-Wshadow" "-Wmissing-format-attribute" "-Wformat=2" "-Wpointer-arith" "-Wconversion")
- include(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG(-Wlogical-op HAVE_W_LOGICAL_OP)
- if(HAVE_W_LOGICAL_OP)
- list(APPEND cxx_flags_debug "-Wlogical-op")
- endif()
- list(APPEND cxx_flags_debug "-Werror")
- list(APPEND cxx_flags_profile "-ftest-coverage" "-fprofile-arcs")
- endif()
-
- if(CMAKE_SYSTEM MATCHES "SunOS.*")
- list(APPEND cxx_flags "-pthreads")
++ include(CheckCXXCompilerFlag)
++ CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD_CPP0X)
++ if(HAVE_STD_CPP0X)
++ add_definitions("-DCPP_ZEROX_SUPPORT")
++ list(APPEND cxx_flags "-std=c++0x")
++ message(STATUS "Support for C++0x Enabled")
++ else()
++ message(FATAL_ERROR "Compiler does not support C++0x")
++ endif()
endif()
+ endif()
- append_to_var(CMAKE_C_FLAGS ${c_flags})
- append_to_var(CMAKE_C_FLAGS_DEBUG ${c_flags_debug})
- append_to_var(CMAKE_C_FLAGS_PROFILE ${c_flags_profile} ${c_flags_debug})
+ if(CMAKE_COMPILER_IS_GNUC)
+ list(APPEND c_flags_debug "-Wall" "-g3")
+ list(APPEND c_flags_profile "-ftest-coverage" "-fprofile-arcs")
+ endif()
- append_to_var(CMAKE_CXX_FLAGS ${cxx_flags})
- append_to_var(CMAKE_CXX_FLAGS_DEBUG ${cxx_flags_debug})
- append_to_var(CMAKE_CXX_FLAGS_PROFILE ${cxx_flags_profile} ${cxx_flags_debug})
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ list(APPEND cxx_flags ${ICE_CXX_FLAGS})
+ list(APPEND cxx_flags_debug "-Wall" "-Wextra" "-g3")
+ list(APPEND cxx_flags_debug "-Wshadow" "-Wmissing-format-attribute" "-Wformat=2" "-Wpointer-arith" "-Wconversion")
+ # When building shared objects (libraries or modules), the linker normally
+ # doesn't try to ensure that all symbols referenced by the code linked
+ # into the object have been satisfied... which means that unresolved
+ # symbols won't be found until runtime. This flag tells the linker
+ # to do that resolution at link time, and report an error if a symbol
+ # is unresolved.
+ list(APPEND cxx_flags_debug "-Wl,--no-undefined")
+ include(CheckCXXCompilerFlag)
+ CHECK_CXX_COMPILER_FLAG(-Wlogical-op HAVE_W_LOGICAL_OP)
+ if(HAVE_W_LOGICAL_OP)
+ list(APPEND cxx_flags_debug "-Wlogical-op")
+ endif()
+ list(APPEND cxx_flags_debug "-Werror")
+ list(APPEND cxx_flags_profile "-ftest-coverage" "-fprofile-arcs")
+ endif()
- append_to_var(CMAKE_EXE_LINKER_FLAGS ${linker_flags})
- append_to_var(CMAKE_MODULE_LINKER_FLAGS ${linker_flags})
- append_to_var(CMAKE_SHARED_LINKER_FLAGS ${linker_flags})
+ if(CMAKE_SYSTEM MATCHES "SunOS.*")
+ list(APPEND cxx_flags "-pthreads")
+ endif()
- # Boost is required
- # Only specify those versions that are not "known" by default for
- # the oldest version of cmake supported.
- #
- set(Boost_ADDITIONAL_VERSIONS "1.44" "1.44.0" "1.45" "1.45.0" "1.46" "1.46.0" "1.46.1")
- find_package(Boost ${MIN_BOOST_VERSION} REQUIRED)
- set(Boost_CORE_FOUND "bazinga" PARENT_SCOPE)
- set(Boost_CORE_FOUND "bazinga")
+ __astscf_append_to_var(CMAKE_C_FLAGS ${c_flags})
+ __astscf_append_to_var(CMAKE_C_FLAGS_DEBUG ${c_flags_debug})
+ __astscf_append_to_var(CMAKE_C_FLAGS_PROFILE ${c_flags_profile} ${c_flags_debug})
- compute_test_paths()
+ __astscf_append_to_var(CMAKE_CXX_FLAGS ${cxx_flags})
+ __astscf_append_to_var(CMAKE_CXX_FLAGS_DEBUG ${cxx_flags_debug})
+ __astscf_append_to_var(CMAKE_CXX_FLAGS_PROFILE ${cxx_flags_profile} ${cxx_flags_debug})
- message(STATUS "Passed requirement checks for CXX components")
-endfunction()
+ __astscf_append_to_var(CMAKE_EXE_LINKER_FLAGS ${linker_flags})
+ __astscf_append_to_var(CMAKE_MODULE_LINKER_FLAGS ${linker_flags})
+ __astscf_append_to_var(CMAKE_SHARED_LINKER_FLAGS ${linker_flags})
-# Function which initializes a component for building
-function(asterisk_scf_component_init COMPONENT)
- message(STATUS "Setting up to build component ${COMPONENT}")
- set(ASTERISK_SCF_${COMPONENT} Bob PARENT_SCOPE)
-endfunction()
+ # Boost is required
+ # Only specify those versions that are not "known" by default for
+ # the oldest version of CMake supported.
+ #
+ set(Boost_ADDITIONAL_VERSIONS "1.44" "1.44.0" "1.45" "1.45.0" "1.46" "1.46.0" "1.46.1")
+ find_package(Boost ${MIN_BOOST_VERSION} REQUIRED)
+ set(Boost_CORE_FOUND "bazinga" PARENT_SCOPE)
+ set(Boost_CORE_FOUND "bazinga")
+ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
+ link_directories(${Boost_LIBRARY_DIRS})
-# Find a Boost library.
-function(find_Boost_library LIBRARY)
- string(TOUPPER ${LIBRARY} libtag)
- if(NOT Boost_${libtag}_FOUND)
- find_package(Boost REQUIRED ${LIBRARY})
- endif()
- if(NOT Boost_${libtag}_FOUND)
- message(FATAL_ERROR "Boost library ${LIBRARY} not found")
- endif()
-endfunction()
+ __astscf_compute_test_paths()
-# Function which adds Boost libraries needed by a component
-function(asterisk_scf_component_add_boost_libraries COMPONENT)
- if(NOT ARGN)
- message(FATAL_ERROR "You must pass at least one library to this function")
- endif()
- set(libs ${${COMPONENT}_BOOST_LIBRARIES})
- # By default we are disabling boost auto-linking and specifying dynamic linking.
- add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_ALL_DYN_LINK)
- foreach(lib ${ARGN})
- find_Boost_library(${lib})
- string(TOUPPER "${lib}" lib)
- list(APPEND libs ${lib})
- endforeach()
- list(REMOVE_DUPLICATES libs)
- set(${COMPONENT}_BOOST_LIBRARIES ${libs} PARENT_SCOPE)
- include_directories(SYSTEM ${Boost_INCLUDE_DIR})
- link_directories(${Boost_LIBRARY_DIRS})
+ message(STATUS "Passed requirement checks for CXX components")
endfunction()
# Ensures that a list of paths are all absolute paths.
commit 2997fd659feef09abd5026bbfc5ba953009cf266
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 13 15:53:59 2011 -0500
Ensure that shared objects have no unresolved symbols.
When doing builds on Linux, the linker will now ensure that all symbols
referenced by the object files linked into the module or library are
... 32478 lines suppressed ...
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list