[asterisk-scf-commits] asterisk-scf/integration/sip.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:53 CDT 2011
branch "disintegrated-build" has been created
at 547acd0cccb190d89af05f5809ad7006923611d7 (commit)
- Log -----------------------------------------------------------------
commit 547acd0cccb190d89af05f5809ad7006923611d7
Merge: 6d05c0d 0f67d36
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 16 17:21:35 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 6d05c0d0f6ff782571bce351d9aa68f29cf0a716
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 ec76c63..2412342 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ if(OPENSSL_FOUND)
endif()
include_directories(${logger_dir}/include)
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
astscf_component_init(SipSessionManager)
astscf_component_add_files(SipSessionManager SipSessionManagerApp.cpp)
@@ -40,7 +40,7 @@ astscf_component_add_ice_libraries(SipSessionManager IceStorm)
astscf_component_add_boost_libraries(SipSessionManager core)
astscf_component_add_slice_collection_libraries(SipSessionManager ASTSCF)
astscf_component_build_icebox(SipSessionManager)
-target_link_libraries(SipSessionManager logging-client ice-util-cpp ${OPENSSL_LIBRARIES})
+target_link_libraries(SipSessionManager logging-client astscf-ice-util-cpp ${OPENSSL_LIBRARIES})
pjproject_link(SipSessionManager pjsip)
pjproject_link(SipSessionManager pjmedia)
pjproject_link(SipSessionManager pjlib-util)
@@ -57,5 +57,5 @@ astscf_component_add_ice_libraries(SipStateReplicator IceStorm)
astscf_component_add_boost_libraries(SipStateReplicator thread date_time)
astscf_component_add_slice_collection_libraries(SipStateReplicator ASTSCF)
astscf_component_build_icebox(SipStateReplicator)
-target_link_libraries(SipStateReplicator logging-client ice-util-cpp)
+target_link_libraries(SipStateReplicator logging-client astscf-ice-util-cpp)
astscf_component_install(SipStateReplicator)
commit dde6f94759bcbf54d1fa75a058307e7f55e21912
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 4718145..dfcf17b 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/SipConfigurationIf.ice b/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
similarity index 98%
rename from slice/SipConfigurationIf.ice
rename to slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
index ddfe65d..849992d 100644
--- a/slice/SipConfigurationIf.ice
+++ b/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
@@ -22,8 +22,13 @@
module AsteriskSCF
{
-module SIP
+
+module Configuration
+{
+
+module SipSessionManager
{
+
["suppress"]
module V1
{
@@ -401,6 +406,8 @@ module V1
}; /* module V1 */
-}; /* module SIP */
+}; /* module SipSessionManager */
+
+}; /* module Replication */
-}; /* module Asterisk SCF */
+}; /* module AsteriskSCF */
diff --git a/slice/SipStateReplicationIf.ice b/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
similarity index 96%
rename from slice/SipStateReplicationIf.ice
rename to slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
index aae6991..733deef 100644
--- a/slice/SipStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
@@ -24,8 +24,13 @@
module AsteriskSCF
{
-module SIP
+
+module Replication
+{
+
+module SipSessionManager
{
+
["suppress"]
module V1
{
@@ -154,6 +159,10 @@ module V1
AsteriskSCF::SessionCommunications::V1::Bridge *mBridge;
};
-}; //module V1
-}; //module SIP
-}; //module Asterisk SCF
+}; /* module V1 */
+
+}; /* module SipSessionManager */
+
+}; /* module Replication */
+
+}; /* module AsteriskSCF */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1112098..ec76c63 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,8 +34,8 @@ astscf_component_add_files(SipSessionManager SipConfiguration.h)
astscf_component_add_files(SipSessionManager SipStateReplicatorListener.cpp)
astscf_component_add_files(SipSessionManager SipStateReplicator.h)
astscf_component_add_slices(SipSessionManager PROJECT SipIf.ice)
-astscf_component_add_slices(SipSessionManager PROJECT SipStateReplicationIf.ice)
-astscf_component_add_slices(SipSessionManager PROJECT SipConfigurationIf.ice)
+astscf_component_add_slices(SipSessionManager PROJECT AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice)
+astscf_component_add_slices(SipSessionManager PROJECT AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice)
astscf_component_add_ice_libraries(SipSessionManager IceStorm)
astscf_component_add_boost_libraries(SipSessionManager core)
astscf_component_add_slice_collection_libraries(SipSessionManager ASTSCF)
@@ -50,9 +50,9 @@ astscf_component_install(SipSessionManager)
astscf_component_init(SipStateReplicator)
astscf_component_add_files(SipStateReplicator SipStateReplicatorApp.cpp)
astscf_component_add_files(SipStateReplicator SipStateReplicator.h)
-astscf_component_add_slices(SipStateReplicator PROJECT SipStateReplicationIf.ice)
astscf_component_add_slices(SipStateReplicator PROJECT SipIf.ice)
-astscf_component_add_slices(SipStateReplicator PROJECT SipConfigurationIf.ice)
+astscf_component_add_slices(SipStateReplicator PROJECT AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice)
+astscf_component_add_slices(SipStateReplicator PROJECT AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice)
astscf_component_add_ice_libraries(SipStateReplicator IceStorm)
astscf_component_add_boost_libraries(SipStateReplicator thread date_time)
astscf_component_add_slice_collection_libraries(SipStateReplicator ASTSCF)
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index ffd2854..928d47a 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -80,7 +80,7 @@ void PJSipManager::registerSessionModule(const boost::shared_ptr<SipEndpointFact
const AsteriskSCF::Discovery::SmartProxy<
AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>& sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica
)
{
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index 9138770..d82829e 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -73,7 +73,7 @@ public:
const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>&
sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica
);
diff --git a/src/PJSipModule.h b/src/PJSipModule.h
index 451a02a..354f5ba 100644
--- a/src/PJSipModule.h
+++ b/src/PJSipModule.h
@@ -30,7 +30,7 @@ namespace AsteriskSCF
namespace SipSessionManager
{
-using namespace AsteriskSCF::SIP::V1;
+using namespace AsteriskSCF::Replication::SipSessionManager::V1;
class PJSipModule : public IceUtil::Shared
{
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 74fe6f3..b2aec9b 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -53,7 +53,7 @@ using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::Core::Endpoint::V1;
using namespace AsteriskSCF::SessionCommunications::V1;
using namespace AsteriskSCF::Media::V1;
-using namespace AsteriskSCF::SIP::V1;
+using namespace AsteriskSCF::Replication::SipSessionManager::V1;
using namespace AsteriskSCF::System::ThreadPool::V1;
using namespace AsteriskSCF::System::WorkQueue::V1;
using namespace AsteriskSCF::WorkQueue;
@@ -265,8 +265,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
lg(Error) << "No endpoint for oneway invocation of setState() for state replication.";
}
- AsteriskSCF::SIP::V1::SipStateReplicatorPrx oneWayStateReplicator =
- AsteriskSCF::SIP::V1::SipStateReplicatorPrx::uncheckedCast(oneway);
+ SipStateReplicatorPrx oneWayStateReplicator = SipStateReplicatorPrx::uncheckedCast(oneway);
try
{
@@ -290,8 +289,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
lg(Error) << "No endpoint for oneway invocation of removeState() for state replication.";
}
- AsteriskSCF::SIP::V1::SipStateReplicatorPrx oneWayStateReplicator =
- AsteriskSCF::SIP::V1::SipStateReplicatorPrx::uncheckedCast(oneway);
+ SipStateReplicatorPrx oneWayStateReplicator = SipStateReplicatorPrx::uncheckedCast(oneway);
try
{
diff --git a/src/PJSipSessionModule.h b/src/PJSipSessionModule.h
index 73fd186..73f5f60 100644
--- a/src/PJSipSessionModule.h
+++ b/src/PJSipSessionModule.h
@@ -89,7 +89,7 @@ public:
const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>&
sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica);
pj_status_t load(pjsip_endpoint *endpoint);
pj_status_t start();
@@ -126,7 +126,7 @@ private:
boost::shared_ptr<SipEndpointFactory> mEndpointFactory;
AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> mSessionRouter;
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx mServiceLocator;
- AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> mStateReplicator;
+ AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx> mStateReplicator;
AsteriskSCF::System::Component::V1::ReplicaPtr mReplica;
pjsip_endpoint *mEndpoint;
AsteriskSCF::System::ThreadPool::V1::PoolPtr mPool;
diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index 14e0718..02cf53c 100644
--- a/src/PJSipSessionModuleConstruction.cpp
+++ b/src/PJSipSessionModuleConstruction.cpp
@@ -101,7 +101,7 @@ PJSipSessionModule::PJSipSessionModule(pjsip_endpoint *endpt,
const boost::shared_ptr<SipEndpointFactory>& endpointFactoryPtr,
const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>& sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica)
: mName(moduleName), mEndpointFactory(endpointFactoryPtr),
mSessionRouter(sessionRouter), mServiceLocator(serviceLocator),
diff --git a/src/SipConfiguration.cpp b/src/SipConfiguration.cpp
index f65f05d..a9ed619 100644
--- a/src/SipConfiguration.cpp
+++ b/src/SipConfiguration.cpp
@@ -32,8 +32,8 @@
#include "SipConfiguration.h"
#include <vector>
-using namespace AsteriskSCF::SIP::V1;
using namespace AsteriskSCF::System::Configuration::V1;
+using namespace AsteriskSCF::Configuration::SipSessionManager::V1;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace std;
@@ -562,7 +562,7 @@ class TLSTransportConfig : public ConfigBase, public boost::enable_shared_from_t
mUpdates.push_back(boost::bind(&TLSTransportConfig::updateRequirements, mConfig, requirementsItem));
}
- void visitSipCryptoItem(const ::AsteriskSCF::SIP::V1::SipCryptoItemPtr& cryptoItem)
+ void visitSipCryptoItem(const SipCryptoItemPtr& cryptoItem)
{
mUpdates.push_back(boost::bind(&TLSTransportConfig::updateCrypto, mConfig, cryptoItem));
}
@@ -1217,32 +1217,32 @@ ConfigurationGroupSeq ConfigurationServiceImpl::getConfiguration(
}
}
- void visitSipGeneralGroup(const ::AsteriskSCF::SIP::V1::SipGeneralGroupPtr& group)
+ void visitSipGeneralGroup(const SipGeneralGroupPtr& group)
{
getGeneric<SipGeneralGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipDomainGroup(const ::AsteriskSCF::SIP::V1::SipDomainGroupPtr& group)
+ void visitSipDomainGroup(const SipDomainGroupPtr& group)
{
getGeneric<SipDomainGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipUDPTransportGroup(const ::AsteriskSCF::SIP::V1::SipUDPTransportGroupPtr& group)
+ void visitSipUDPTransportGroup(const SipUDPTransportGroupPtr& group)
{
getGeneric<SipUDPTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipTCPTransportGroup(const ::AsteriskSCF::SIP::V1::SipTCPTransportGroupPtr& group)
+ void visitSipTCPTransportGroup(const SipTCPTransportGroupPtr& group)
{
getGeneric<SipTCPTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipTLSTransportGroup(const ::AsteriskSCF::SIP::V1::SipTLSTransportGroupPtr& group)
+ void visitSipTLSTransportGroup(const SipTLSTransportGroupPtr& group)
{
getGeneric<SipTLSTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
getGeneric<SipEndpointGroupPtr>(mImpl->getData(), group, mGroups);
};
@@ -1285,32 +1285,32 @@ ConfigurationGroupSeq ConfigurationServiceImpl::getConfigurationAll(
};
private:
- void visitSipGeneralGroup(const ::AsteriskSCF::SIP::V1::SipGeneralGroupPtr& group)
+ void visitSipGeneralGroup(const SipGeneralGroupPtr& group)
{
genericGetAll<SipGeneralGroupPtr>(mImpl->getData(), group, mGroups);
}
- void visitSipDomainGroup(const ::AsteriskSCF::SIP::V1::SipDomainGroupPtr& group)
+ void visitSipDomainGroup(const SipDomainGroupPtr& group)
{
genericGetAll<SipDomainGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipUDPTransportGroup(const ::AsteriskSCF::SIP::V1::SipUDPTransportGroupPtr& group)
+ void visitSipUDPTransportGroup(const SipUDPTransportGroupPtr& group)
{
genericGetAll<SipUDPTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipTCPTransportGroup(const ::AsteriskSCF::SIP::V1::SipTCPTransportGroupPtr& group)
+ void visitSipTCPTransportGroup(const SipTCPTransportGroupPtr& group)
{
genericGetAll<SipTCPTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipTLSTransportGroup(const ::AsteriskSCF::SIP::V1::SipTLSTransportGroupPtr& group)
+ void visitSipTLSTransportGroup(const SipTLSTransportGroupPtr& group)
{
genericGetAll<SipTLSTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
genericGetAll<SipEndpointGroupPtr>(mImpl->getData(), group, mGroups);
};
@@ -1366,32 +1366,32 @@ void ConfigurationServiceImpl::setConfiguration(const AsteriskSCF::System::Confi
private:
- void visitSipGeneralGroup(const ::AsteriskSCF::SIP::V1::SipGeneralGroupPtr& group)
+ void visitSipGeneralGroup(const SipGeneralGroupPtr& group)
{
genericSet<SipGeneralGroupPtr>(mImpl->getData(), group);
}
- void visitSipDomainGroup(const ::AsteriskSCF::SIP::V1::SipDomainGroupPtr& group)
+ void visitSipDomainGroup(const SipDomainGroupPtr& group)
{
genericSet<SipDomainGroupPtr>(mImpl->getData(), group);
};
- void visitSipUDPTransportGroup(const ::AsteriskSCF::SIP::V1::SipUDPTransportGroupPtr& group)
+ void visitSipUDPTransportGroup(const SipUDPTransportGroupPtr& group)
{
genericSet<SipUDPTransportGroupPtr>(mImpl->getData(), group);
};
- void visitSipTCPTransportGroup(const ::AsteriskSCF::SIP::V1::SipTCPTransportGroupPtr& group)
+ void visitSipTCPTransportGroup(const SipTCPTransportGroupPtr& group)
{
genericSet<SipTCPTransportGroupPtr>(mImpl->getData(), group);
};
- void visitSipTLSTransportGroup(const ::AsteriskSCF::SIP::V1::SipTLSTransportGroupPtr& group)
+ void visitSipTLSTransportGroup(const SipTLSTransportGroupPtr& group)
{
genericSet<SipTLSTransportGroupPtr>(mImpl->getData(), group);
};
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
genericSet<SipEndpointGroupPtr>(mImpl->getData(), group);
};
@@ -1418,32 +1418,32 @@ void ConfigurationServiceImpl::removeConfigurationItems(
{
};
- void visitSipGeneralGroup(const ::AsteriskSCF::SIP::V1::SipGeneralGroupPtr& group)
+ void visitSipGeneralGroup(const SipGeneralGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
- void visitSipDomainGroup(const ::AsteriskSCF::SIP::V1::SipDomainGroupPtr& group)
+ void visitSipDomainGroup(const SipDomainGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
- void visitSipUDPTransportGroup(const ::AsteriskSCF::SIP::V1::SipUDPTransportGroupPtr& group)
+ void visitSipUDPTransportGroup(const SipUDPTransportGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
- void visitSipTCPTransportGroup(const ::AsteriskSCF::SIP::V1::SipTCPTransportGroupPtr& group)
+ void visitSipTCPTransportGroup(const SipTCPTransportGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
- void visitSipTLSTransportGroup(const ::AsteriskSCF::SIP::V1::SipTLSTransportGroupPtr& group)
+ void visitSipTLSTransportGroup(const SipTLSTransportGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
@@ -1468,32 +1468,32 @@ void ConfigurationServiceImpl::removeConfigurationGroups(
Visitor(const ConfigurationServiceImplPtr& impl) : mImpl(impl) { };
private:
- void visitSipGeneralGroup(const ::AsteriskSCF::SIP::V1::SipGeneralGroupPtr& group)
+ void visitSipGeneralGroup(const SipGeneralGroupPtr& group)
{
mImpl->getData()->remove(group);
};
- void visitSipDomainGroup(const ::AsteriskSCF::SIP::V1::SipDomainGroupPtr& group)
+ void visitSipDomainGroup(const SipDomainGroupPtr& group)
{
mImpl->getData()->remove(group);
};
- void visitSipUDPTransportGroup(const ::AsteriskSCF::SIP::V1::SipUDPTransportGroupPtr& group)
+ void visitSipUDPTransportGroup(const SipUDPTransportGroupPtr& group)
{
mImpl->getData()->remove(group);
};
- void visitSipTCPTransportGroup(const ::AsteriskSCF::SIP::V1::SipTCPTransportGroupPtr& group)
+ void visitSipTCPTransportGroup(const SipTCPTransportGroupPtr& group)
{
mImpl->getData()->remove(group);
};
- void visitSipTLSTransportGroup(const ::AsteriskSCF::SIP::V1::SipTLSTransportGroupPtr& group)
+ void visitSipTLSTransportGroup(const SipTLSTransportGroupPtr& group)
{
mImpl->getData()->remove(group);
};
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
mImpl->getData()->remove(group);
};
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 63df653..979358a 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -1107,7 +1107,7 @@ AsteriskSCF::Media::V1::SessionPrx& SipSession::getMediaSessionProxy()
/**
* Internal function which sets the listeners explicitly.
*/
-void SipSession::setListeners(const AsteriskSCF::SIP::V1::SessionListenerSeq& listeners)
+void SipSession::setListeners(const SessionListenerSeq& listeners)
{
mImplPriv->mListeners = listeners;
}
diff --git a/src/SipSession.h b/src/SipSession.h
index 2a60c76..f603fb5 100644
--- a/src/SipSession.h
+++ b/src/SipSession.h
@@ -194,7 +194,7 @@ public:
AsteriskSCF::Media::V1::SessionPrx& getMediaSessionProxy();
- void setListeners(const AsteriskSCF::SIP::V1::SessionListenerSeq&);
+ void setListeners(const AsteriskSCF::Replication::SipSessionManager::V1::SessionListenerSeq&);
AsteriskSCF::Media::V1::SessionPrx getHiddenMediaSession();
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 82436a3..6020d4e 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -47,6 +47,7 @@
using namespace std;
using namespace AsteriskSCF::SipSessionManager;
+using namespace AsteriskSCF::Configuration::SipSessionManager::V1;
using namespace AsteriskSCF::Core;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::Core::Discovery::V1;
@@ -379,8 +380,8 @@ void SipSessionManager::locateStateReplicator()
mServiceLocator = ServiceLocatorPrx::checkedCast(mCommunicator->propertyToProxy("LocatorService.Proxy"));
}
- SIP::V1::SipStateReplicatorParamsPtr replicatorParams = new SIP::V1::SipStateReplicatorParams();
- replicatorParams->category = SIP::V1::StateReplicatorDiscoveryCategory;
+ SipStateReplicatorParamsPtr replicatorParams = new SipStateReplicatorParams();
+ replicatorParams->category = StateReplicatorDiscoveryCategory;
replicatorParams->mName =
mCommunicator->getProperties()->getPropertyWithDefault("Sip.StateReplicatorName", "default");
diff --git a/src/SipStateReplicator.h b/src/SipStateReplicator.h
index 02fde05..135daed 100644
--- a/src/SipStateReplicator.h
+++ b/src/SipStateReplicator.h
@@ -29,9 +29,9 @@ namespace SipSessionManager
{
typedef AsteriskSCF::Replication::StateReplicator<
- AsteriskSCF::SIP::V1::SipStateReplicator,
- AsteriskSCF::SIP::V1::SipStateItemPtr, std::string,
- AsteriskSCF::SIP::V1::SipStateReplicatorListenerPrx> SipStateReplicatorI;
+ AsteriskSCF::Replication::SipSessionManager::V1::SipStateReplicator,
+ AsteriskSCF::Replication::SipSessionManager::V1::SipStateItemPtr, std::string,
+ AsteriskSCF::Replication::SipSessionManager::V1::SipStateReplicatorListenerPrx> SipStateReplicatorI;
typedef IceUtil::Handle<SipStateReplicatorI> SipStateReplicatorIPtr;
//
@@ -39,12 +39,12 @@ typedef IceUtil::Handle<SipStateReplicatorI> SipStateReplicatorIPtr;
//
struct SipStateReplicatorListenerImpl;
-class SipStateReplicatorListenerI : public AsteriskSCF::SIP::V1::SipStateReplicatorListener
+class SipStateReplicatorListenerI : public AsteriskSCF::Replication::SipSessionManager::V1::SipStateReplicatorListener
{
public:
SipStateReplicatorListenerI(const boost::shared_ptr<SipEndpointFactory>& factory, PJSipManager *manager);
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
- void stateSet(const AsteriskSCF::SIP::V1::SipStateItemSeq&, const Ice::Current&);
+ void stateSet(const AsteriskSCF::Replication::SipSessionManager::V1::SipStateItemSeq&, const Ice::Current&);
bool operator==(const SipStateReplicatorListenerI &rhs);
private:
boost::shared_ptr<SipStateReplicatorListenerImpl> mImpl;
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index 71f3009..cb07b31 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -35,7 +35,8 @@
using namespace std;
using namespace AsteriskSCF::Core;
using namespace AsteriskSCF::Core::Discovery::V1;
-using namespace AsteriskSCF::SIP::V1;
+using namespace AsteriskSCF::Replication::SipSessionManager::V1;
+using namespace AsteriskSCF::Configuration::SipSessionManager::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SipSessionManager;
@@ -203,25 +204,25 @@ void SipStateReplicatorService::registerWithServiceLocator(const Ice::Communicat
ComponentServicePrx componentServicePrx = ComponentServicePrx::checkedCast(componentServiceObjectPrx);
// The GUID passed in to add service needs to be unique for reporting.
- string componentServiceGuid(AsteriskSCF::SIP::V1::StateReplicatorComponentCategory);
+ string componentServiceGuid(StateReplicatorComponentCategory);
mComponentServiceManagement = ServiceManagementPrx::uncheckedCast(
mServiceLocatorManagement->addService(componentServicePrx, componentServiceGuid));
// Add category as a parameter to enable other components look this component up.
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
- genericparams->category = AsteriskSCF::SIP::V1::StateReplicatorComponentCategory;
+ genericparams->category = StateReplicatorComponentCategory;
mComponentServiceManagement->addLocatorParams(genericparams, "");
Ice::ObjectPrx stateReplicatorObjectPrx = mAdapter->createDirectProxy(ic->stringToIdentity(ServiceDiscoveryId));
SipStateReplicatorPrx stateReplicatorPrx = SipStateReplicatorPrx::checkedCast(stateReplicatorObjectPrx);
- string stateReplicationGuid(AsteriskSCF::SIP::V1::StateReplicatorDiscoveryCategory);
+ string stateReplicationGuid(StateReplicatorDiscoveryCategory);
mStateReplicationManagement = ServiceManagementPrx::uncheckedCast(
mServiceLocatorManagement->addService(stateReplicatorPrx, stateReplicationGuid));
ServiceLocatorParamsPtr discoveryParams = new ServiceLocatorParams();
- discoveryParams->category = AsteriskSCF::SIP::V1::StateReplicatorDiscoveryCategory;
+ discoveryParams->category = StateReplicatorDiscoveryCategory;
string replicatorName = ic->getProperties()->getPropertyWithDefault("SipStateReplicator.Name", "default");
SipStateReplicatorCompare* nameCompare = new SipStateReplicatorCompare(replicatorName);
diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index 7774efe..b04abc3 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -30,7 +30,7 @@ namespace AsteriskSCF
namespace SipSessionManager
{
-using namespace AsteriskSCF::SIP::V1;
+using namespace AsteriskSCF::Replication::SipSessionManager::V1;
class SipStateReplicatorItem
{
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 5ec732a18d0deabd97fad2eaf5b3751fa2fc0eff
Merge: c42aed9 842ac29
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:25:30 2011 -0500
Merge branch 'master' into disintegrated-build
commit c42aed90ba11b750abf5ba4a1be3823a5fbac0d2
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 1d07853..1112098 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ endif()
include_directories(${logger_dir}/include)
include_directories(${ice-util-cpp_dir}/include)
-include_directories(${API_INCLUDE_DIR})
astscf_component_init(SipSessionManager)
astscf_component_add_files(SipSessionManager SipSessionManagerApp.cpp)
@@ -39,6 +38,7 @@ astscf_component_add_slices(SipSessionManager PROJECT SipStateReplicationIf.ice)
astscf_component_add_slices(SipSessionManager PROJECT SipConfigurationIf.ice)
astscf_component_add_ice_libraries(SipSessionManager IceStorm)
astscf_component_add_boost_libraries(SipSessionManager core)
+astscf_component_add_slice_collection_libraries(SipSessionManager ASTSCF)
astscf_component_build_icebox(SipSessionManager)
target_link_libraries(SipSessionManager logging-client ice-util-cpp ${OPENSSL_LIBRARIES})
pjproject_link(SipSessionManager pjsip)
@@ -55,6 +55,7 @@ astscf_component_add_slices(SipStateReplicator PROJECT SipIf.ice)
astscf_component_add_slices(SipStateReplicator PROJECT SipConfigurationIf.ice)
astscf_component_add_ice_libraries(SipStateReplicator IceStorm)
astscf_component_add_boost_libraries(SipStateReplicator thread date_time)
+astscf_component_add_slice_collection_libraries(SipStateReplicator ASTSCF)
astscf_component_build_icebox(SipStateReplicator)
-target_link_libraries(SipStateReplicator logging-client astscf-api ice-util-cpp)
+target_link_libraries(SipStateReplicator logging-client ice-util-cpp)
astscf_component_install(SipStateReplicator)
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
resolvable at link time (in other words, all libraries needed by the
code in the module/library have been specified to the linker). If any
symbols cannot be resolved, an error will be generated at link time (rather
than later at run time).
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 4bdfcad..eff7fc8 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -358,6 +358,13 @@ function(astscf_project NAME ICE_VERSION)
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)
commit 8cfea72afaa1a820910a25bcdfbe4bec3ed99c9d
Author: David M. Lee <dlee at digium.com>
Date: Mon Jun 13 11:03:05 2011 -0500
Removed cmake dep on pjproject's config_site.h
This resolves a couple of issues.
* make clean no longer trashes config_site.h
* incremental builds no longer needlessly regenerate pjproject deps.
diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 5bd04f5..43a193b 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -29,24 +29,17 @@ if (CMAKE_SIZEOF_VOID_P MATCHES 8)
endif()
add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/pjproject/build.mak" COMMAND "./configure" "--disable-sound" ${ADDITIONAL_CONFIGURE_ARGUMENTS} WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Configuring pjproject")
-add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h" COMMAND "make" "dep" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Dependency generating pjproject" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/build.mak")
+add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/pjproject/pjlib/build/.pjlib-asteriskscf.depend" COMMAND "make" "dep" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Dependency generating pjproject" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/build.mak")
add_custom_target(pjproject-clean COMMAND "make" "clean" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Cleaning pjproject")
add_custom_target(pjproject-distclean COMMAND "make" "distclean" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Deep cleaning pjproject")
# Function which adds build targets for the following supported pjproject components: pjlib, pjlib-util, pjnath, pjmedia, pjsip.
function(pjproject_build PJPROJECT_COMPONENT)
- # Make sure that config_site.h exists.
- # Only touch it if you have to to avoid triggering needless builds.
- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h")
- message(STATUS "pjproject: Creating config_site.h")
- file(WRITE "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h" "")
- endif()
-
if(UNIX)
if(${PJPROJECT_COMPONENT} STREQUAL "third_party")
- add_custom_target("pjproject-third_party" COMMAND "make" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject/third_party/build" COMMENT "Building pjproject third party components" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h")
+ add_custom_target("pjproject-third_party" COMMAND "make" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject/third_party/build" COMMENT "Building pjproject third party components" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/build/.pjlib-asteriskscf.depend")
else()
- add_custom_target("pjproject-${PJPROJECT_COMPONENT}" COMMAND "make" "TARGET_NAME=asteriskscf" "DIRS=${PJPROJECT_COMPONENT}/build" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Building pjproject-${PJPROJECT_COMPONENT}" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h")
+ add_custom_target("pjproject-${PJPROJECT_COMPONENT}" COMMAND "make" "TARGET_NAME=asteriskscf" "DIRS=${PJPROJECT_COMPONENT}/build" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Building pjproject-${PJPROJECT_COMPONENT}" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/build/.pjlib-asteriskscf.depend")
add_dependencies("pjproject-${PJPROJECT_COMPONENT}" "pjproject-pjlib")
endif()
if(${PJPROJECT_COMPONENT} STREQUAL "pjsip")
commit 965d3574c20c1d144407613a501a9b0016646508
Author: David M. Lee <dlee at digium.com>
Date: Tue Jun 7 14:45:32 2011 -0500
Disable compilation for C++0x by default.
Added a CMake flag 'ENABLE_CPP0X' to optionally enable C++0x.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 0766521..d039634 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -33,6 +33,12 @@
#
#
+# CMake variables (can be defined using -D on the cmake command line)
+# * ENABLE_CPP0X - Enables C++0x features in the compiler. Will error out if
+# compiler does not support C++0x.
+#
+
+#
# Coding/style guidelines:
#
# * Variables local to a function should be named using lowercase.
@@ -336,16 +342,21 @@ function(asterisk_scf_project NAME ICE_VERSION)
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)
+ 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()
commit 57d18b7364c3b21cccba9b4943ed3548793fb222
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 7 16:29:01 2011 -0500
Add support for a 'make uninstall' Makefile target.
Code for this target came from the CMake wiki at www.cmake.org.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index ecd02c3..4bdfcad 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
... 32206 lines suppressed ...
--
asterisk-scf/integration/sip.git
More information about the asterisk-scf-commits
mailing list