[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "db2" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jun 21 13:46:53 CDT 2011
branch "db2" has been created
at 1544a2085af033d12cdec6a9be116acf4ee4f341 (commit)
- Log -----------------------------------------------------------------
commit 1544a2085af033d12cdec6a9be116acf4ee4f341
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:34:37 2011 -0500
Change Mono and Java API library names to be consistent with C++.
diff --git a/build.xml b/build.xml
index 9504ace..63807e3 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<project name="asterisk-scf-api" default="install"
+<project name="astscf-api" default="install"
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property environment="env"/>
<property name="slice2java-dir"
@@ -75,10 +75,10 @@
<target name="package" depends="compile,doc"
description="Packages binaries, sources and javadoc .jar's">
- <jar jarfile="java/asterisk-scf-api.jar" basedir="${classes-dir}"/>
- <jar jarfile="java/asterisk-scf-api-sources.jar"
+ <jar jarfile="java/astscf-api.jar" basedir="${classes-dir}"/>
+ <jar jarfile="java/astscf-api-sources.jar"
basedir="${slice2java-dir}"/>
- <jar jarfile="java/asterisk-scf-api-javadoc.jar"
+ <jar jarfile="java/astscf-api-javadoc.jar"
basedir="${javadoc-dir}"/>
</target>
@@ -87,10 +87,10 @@
<copy file="pom.xml.in" tofile="${generated-pom-dir}/pom.xml"
filtering="true" failonerror="true"/>
<artifact:pom id="pom" file="${generated-pom-dir}/pom.xml"/>
- <artifact:install file="java/asterisk-scf-api.jar" pomrefid="pom">
- <attach file="java/asterisk-scf-api-sources.jar"
+ <artifact:install file="java/astscf-api.jar" pomrefid="pom">
+ <attach file="java/astscf-api-sources.jar"
classifier="sources"/>
- <attach file="java/asterisk-scf-api-javadoc.jar"
+ <attach file="java/astscf-api-javadoc.jar"
classifier="javadoc"/>
</artifact:install>
</target>
diff --git a/make-mono-api.sh b/make-mono-api.sh
index 467daf8..c003c5d 100755
--- a/make-mono-api.sh
+++ b/make-mono-api.sh
@@ -26,6 +26,6 @@ do
done
echo "Compiling generated C# into a library..."
-gmcs -debug -out:mono/asterisk-scf-api.dll -t:library -recurse:'mono/generated/*.cs' Properties/AssemblyInfo.cs "-lib:${ICE_HOME}/bin" -r:Ice
+gmcs -debug -out:mono/astscf-api.dll -t:library -recurse:'mono/generated/*.cs' Properties/AssemblyInfo.cs "-lib:${ICE_HOME}/bin" -r:Ice
echo "Finished."
diff --git a/pom.xml.in b/pom.xml.in
index 3646d3a..e7e18a6 100644
--- a/pom.xml.in
+++ b/pom.xml.in
@@ -9,7 +9,7 @@
<artifactId>api</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>Asterisk SCF Ice API</name>
+ <name>Asterisk SCF API</name>
<dependencies>
<dependency>
commit 8751373590bafab2a98e2128342b904f0a89bea7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:32:38 2011 -0500
Update Java build files for 'slice' subdirectory.
diff --git a/build.xml b/build.xml
index 3d8e485..9504ace 100644
--- a/build.xml
+++ b/build.xml
@@ -31,10 +31,10 @@
<slice2java outputdir="${slice2java-dir}"
stream="true" underscore="true" checksum="AsteriskSCF.APIChecksums">
<fileset dir=".">
- <include name="**/*.ice"/>
+ <include name="slice/**/*.ice"/>
</fileset>
<includepath>
- <pathelement location="."/>
+ <pathelement location="slice"/>
<pathelement location="${env.ICE_HOME}/slice"/>
</includepath>
</slice2java>
commit 8e88ba6bbf08d0ccf50a3a6c47cb8aad7854099e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:21:29 2011 -0500
Update Mono, Python and Ruby API build scripts for 'slice' directory.
diff --git a/make-mono-api.sh b/make-mono-api.sh
index 15ecb93..467daf8 100755
--- a/make-mono-api.sh
+++ b/make-mono-api.sh
@@ -17,12 +17,12 @@ rm -rf mono
mkdir -p mono/generated
-find AsteriskSCF -name \*.ice -print | while read slice
+find slice/AsteriskSCF -name \*.ice -print | while read slice
do
- slicedir=`dirname "${slice}"`
+ slicedir=`dirname "${slice:6}"`
mkdir -p "mono/generated/${slicedir}"
- echo "Translating ${slice} into C#..."
- ${ICE_HOME}/bin/slice2cs -I ${ICE_HOME}/slice -I . --output-dir "mono/generated/${slicedir}" --stream --checksum --plugin SliceVisitorPattern:create "${slice}"
+ echo "Translating ${slice:6} into C#..."
+ ${ICE_HOME}/bin/slice2cs -I ${ICE_HOME}/slice -I slice --output-dir "mono/generated/${slicedir}" --stream --underscore --checksum --plugin SliceVisitorPattern:create "${slice}"
done
echo "Compiling generated C# into a library..."
diff --git a/make-python-api.sh b/make-python-api.sh
index 3300179..006f8a9 100755
--- a/make-python-api.sh
+++ b/make-python-api.sh
@@ -17,12 +17,12 @@ rm -rf python
mkdir python
-find AsteriskSCF -name \*.ice -print | while read slice
+find slice/AsteriskSCF -name \*.ice -print | while read slice
do
- slicedir=`dirname "${slice}"`
+ slicedir=`dirname "${slice:6}"`
prefix="${slicedir//\//_}_"
- echo "Translating ${slice} into Python..."
- ${ICE_HOME}/bin/slice2py -I ${ICE_HOME}/slice -I . --output-dir python --checksum --plugin SliceVisitorPattern:create --prefix "${prefix}" "${slice}"
+ echo "Translating ${slice:6} into Python..."
+ ${ICE_HOME}/bin/slice2py -I ${ICE_HOME}/slice -I slice --output-dir python --underscore --checksum --plugin SliceVisitorPattern:create --prefix "${prefix}" "${slice}"
done
find python -name \*.py -print | while read py
diff --git a/make-ruby-api.sh b/make-ruby-api.sh
index decc27a..50153e8 100755
--- a/make-ruby-api.sh
+++ b/make-ruby-api.sh
@@ -17,12 +17,12 @@ rm -rf ruby
mkdir ruby
-find AsteriskSCF -name \*.ice -print | while read slice
+find slice/AsteriskSCF -name \*.ice -print | while read slice
do
- slicedir=`dirname "${slice}"`
+ slicedir=`dirname "${slice:6}"`
mkdir -p "ruby/${slicedir}"
- echo "Translating ${slice} into Ruby..."
- ${ICE_HOME}/bin/slice2rb -I ${ICE_HOME}/slice -I . --output-dir "ruby/${slicedir}" --checksum --plugin SliceVisitorPattern:create "${slice}"
+ echo "Translating ${slice:6} into Ruby..."
+ ${ICE_HOME}/bin/slice2rb -I ${ICE_HOME}/slice -I slice --output-dir "ruby/${slicedir}" --underscore --checksum --plugin SliceVisitorPattern:create "${slice}"
done
echo "Finished."
commit 4373520fd6130317f96006cbf5d46f476bfa5cf7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:40:16 2011 -0500
Relocate Slice files to a 'slice' subdirectory.
In order to be able to easily use the Slice collections support in AsteriskSCF.cmake,
and have the astscf_slice_collection_install() function produce the desired result,
Slice files need to be located in a subdirectory of the repository, not its root. This commit moves them into a 'slice' directory, just like all the other
repositories have.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d64ead..b8b6d76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,3 @@
astscf_project(API 3.4)
-astscf_slice_collection(GLOBAL
- NAME ASTSCF
- PATH .
- HEADERS "${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF"
- LIBRARY astscf-api
- )
-astscf_slice_include_collection(ASTSCF)
-
-astscf_component_init(astscf-api)
-astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
-astscf_component_build_library(astscf-api)
-astscf_component_install(astscf-api)
-
-astscf_slice_headers_install()
-astscf_slice_install(AsteriskSCF)
+add_subdirectory(slice)
diff --git a/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
rename to slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
diff --git a/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
rename to slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
diff --git a/AsteriskSCF/Core/Endpoint/EndpointIf.ice b/slice/AsteriskSCF/Core/Endpoint/EndpointIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Endpoint/EndpointIf.ice
rename to slice/AsteriskSCF/Core/Endpoint/EndpointIf.ice
diff --git a/AsteriskSCF/Core/Routing/RoutingIf.ice b/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Routing/RoutingIf.ice
rename to slice/AsteriskSCF/Core/Routing/RoutingIf.ice
diff --git a/AsteriskSCF/Media/MediaIf.ice b/slice/AsteriskSCF/Media/MediaIf.ice
similarity index 100%
rename from AsteriskSCF/Media/MediaIf.ice
rename to slice/AsteriskSCF/Media/MediaIf.ice
diff --git a/AsteriskSCF/Media/RTP/MediaRTPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
similarity index 100%
rename from AsteriskSCF/Media/RTP/MediaRTPIf.ice
rename to slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
diff --git a/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
similarity index 100%
rename from AsteriskSCF/SIP/SIPExtensionPointIf.ice
rename to slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
diff --git a/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice b/slice/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
similarity index 100%
rename from AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
rename to slice/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
diff --git a/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice b/slice/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
similarity index 100%
rename from AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
rename to slice/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
similarity index 100%
rename from AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
rename to slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
diff --git a/AsteriskSCF/System/Component/ComponentServiceIf.ice b/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
similarity index 100%
rename from AsteriskSCF/System/Component/ComponentServiceIf.ice
rename to slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
diff --git a/AsteriskSCF/System/Component/ConfigurationIf.ice b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
similarity index 100%
rename from AsteriskSCF/System/Component/ConfigurationIf.ice
rename to slice/AsteriskSCF/System/Component/ConfigurationIf.ice
diff --git a/AsteriskSCF/System/Component/ReplicaIf.ice b/slice/AsteriskSCF/System/Component/ReplicaIf.ice
similarity index 100%
rename from AsteriskSCF/System/Component/ReplicaIf.ice
rename to slice/AsteriskSCF/System/Component/ReplicaIf.ice
diff --git a/AsteriskSCF/System/ExceptionsIf.ice b/slice/AsteriskSCF/System/ExceptionsIf.ice
similarity index 100%
rename from AsteriskSCF/System/ExceptionsIf.ice
rename to slice/AsteriskSCF/System/ExceptionsIf.ice
diff --git a/AsteriskSCF/System/Hook/HookIf.ice b/slice/AsteriskSCF/System/Hook/HookIf.ice
similarity index 100%
rename from AsteriskSCF/System/Hook/HookIf.ice
rename to slice/AsteriskSCF/System/Hook/HookIf.ice
diff --git a/AsteriskSCF/System/Logger/LoggerIf.ice b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
similarity index 100%
rename from AsteriskSCF/System/Logger/LoggerIf.ice
rename to slice/AsteriskSCF/System/Logger/LoggerIf.ice
diff --git a/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice b/slice/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
similarity index 100%
rename from AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
rename to slice/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
diff --git a/AsteriskSCF/System/Time/TimeIf.ice b/slice/AsteriskSCF/System/Time/TimeIf.ice
similarity index 100%
rename from AsteriskSCF/System/Time/TimeIf.ice
rename to slice/AsteriskSCF/System/Time/TimeIf.ice
diff --git a/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice b/slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
similarity index 100%
rename from AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
rename to slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
diff --git a/CMakeLists.txt b/slice/CMakeLists.txt
similarity index 75%
copy from CMakeLists.txt
copy to slice/CMakeLists.txt
index 9d64ead..06616e2 100644
--- a/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -1,5 +1,3 @@
-astscf_project(API 3.4)
-
astscf_slice_collection(GLOBAL
NAME ASTSCF
PATH .
@@ -11,7 +9,4 @@ astscf_slice_include_collection(ASTSCF)
astscf_component_init(astscf-api)
astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
astscf_component_build_library(astscf-api)
-astscf_component_install(astscf-api)
-
-astscf_slice_headers_install()
-astscf_slice_install(AsteriskSCF)
+astscf_slice_collection_install(ASTSCF)
commit b6bd3b77265589eb3d424f17ef499a37893694c7
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/CMakeLists.txt b/CMakeLists.txt
index 1ac2fd6..9d64ead 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,12 @@
astscf_project(API 3.4)
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF PARENT_SCOPE)
+astscf_slice_collection(GLOBAL
+ NAME ASTSCF
+ PATH .
+ HEADERS "${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF"
+ LIBRARY astscf-api
+ )
+astscf_slice_include_collection(ASTSCF)
astscf_component_init(astscf-api)
astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
commit a5e49d8afb63390b01f78db08d4f3405b0f3290c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 7 16:53:52 2011 -0500
Use proper path for generated headers.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 636e6b9..1ac2fd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
astscf_project(API 3.4)
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/slice-ASTSCF PARENT_SCOPE)
+set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF PARENT_SCOPE)
astscf_component_init(astscf-api)
astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
commit ab03f51f5e0a740bba0de6cb3263095196e77c29
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:27 2011 -0500
Slice collections, and consistency of naming in various places.
* Support Slice file 'collections'.
* Make all Slice directories in repositories be called 'slice' and at the
top level in the repository, so the automatic 'PROJECT' collection will
be generated for them.
* Build ice-util-cpp and util-cpp as single libraries.
* Enable building and execution of ice-util-cpp top-level unit tests.
Conflicts:
cmake/example/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5341674..636e6b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,11 @@
astscf_project(API 3.4)
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
-set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/slice-ASTSCF PARENT_SCOPE)
-# Make all of our slice definitions available to... themselves!
-astscf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-astscf_component_init(asterisk-scf-api)
-astscf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
-astscf_component_build_library(asterisk-scf-api)
-astscf_component_install(asterisk-scf-api)
+astscf_component_init(astscf-api)
+astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
+astscf_component_build_library(astscf-api)
+astscf_component_install(astscf-api)
astscf_slice_headers_install()
astscf_slice_install(AsteriskSCF)
commit 245a2ce4db47a58d4b967667f4f69965e5ae0856
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 18:02:07 2011 -0500
Update to use 'astscf' prefix in CMake scripts instead of 'asterisk_scf'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa8dfb6..5341674 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_project(API 3.4)
+astscf_project(API 3.4)
set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
# Make all of our slice definitions available to... themselves!
-asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+astscf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-asterisk_scf_component_init(asterisk-scf-api)
-asterisk_scf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
-asterisk_scf_component_build_library(asterisk-scf-api)
-asterisk_scf_component_install(asterisk-scf-api)
+astscf_component_init(asterisk-scf-api)
+astscf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
+astscf_component_build_library(asterisk-scf-api)
+astscf_component_install(asterisk-scf-api)
-asterisk_scf_slice_headers_install()
-asterisk_scf_slice_install(AsteriskSCF)
+astscf_slice_headers_install()
+astscf_slice_install(AsteriskSCF)
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list