[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Aug 4 14:42:22 CDT 2011
branch "master" has been updated
via 8ddb3e91e25814480efa90f215cf432c9f7fbb53 (commit)
via 70bab01f216615674306543f39daaf1c0a779365 (commit)
via 00939724984dd002dacc8c165183ef8f582c5a5a (commit)
from 710ddb716666de4e3a563dbe98c18ba989565d1d (commit)
Summary of changes:
build.xml | 12 ++++++------
install-ice-jar.xml | 29 +++++++++++++++++++++--------
slice/AsteriskSCF/SIP/SIPRegistrarIf.ice | 8 ++++----
3 files changed, 31 insertions(+), 18 deletions(-)
- Log -----------------------------------------------------------------
commit 8ddb3e91e25814480efa90f215cf432c9f7fbb53
Author: David M. Lee <dlee at digium.com>
Date: Thu Aug 4 12:56:59 2011 -0500
Fixed comments for slice2java.
slice2java, with an unpatched libmcpp, doesn't properly handle trailing
C++-style comments.
diff --git a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
index 9190677..dde63e9 100644
--- a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@ -121,7 +121,7 @@ interface Registrar
["amd"] BindingSeq getAORBindings(string aor);
};
-}; // end module V1
-}; // end module Registration
-}; // end module SIP
-}; // end module AsteriskSCF
+}; /* end module V1 */
+}; /* end module Registration */
+}; /* end module SIP */
+}; /* end module AsteriskSCF */
commit 70bab01f216615674306543f39daaf1c0a779365
Author: David M. Lee <dlee at digium.com>
Date: Thu Aug 4 12:54:06 2011 -0500
Allow auto-detection of ICE_HOME w/o env variable
diff --git a/build.xml b/build.xml
index 443d790..bac549a 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
classpathref="maven-ant-tasks.classpath"/>
<target name="init" depends="ice.fail-if-no-ice-home">
- <taskdef name="slice2java" classpath="${env.ICE_HOME}/lib/ant-ice.jar"
+ <taskdef name="slice2java" classpath="${ice.home}/lib/ant-ice.jar"
classname="Slice2JavaTask"/>
</target>
@@ -41,7 +41,7 @@
</fileset>
<includepath>
<pathelement location="slice"/>
- <pathelement location="${env.ICE_HOME}/slice"/>
+ <pathelement location="${ice.home}/slice"/>
</includepath>
</slice2java>
</target>
@@ -51,7 +51,7 @@
<mkdir dir="${classes-dir}"/>
<javac srcdir="${slice2java-dir}" destdir="${classes-dir}" debug="true">
<classpath>
- <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
+ <pathelement location="${ice.home}/lib/Ice.jar"/>
</classpath>
</javac>
</target>
@@ -63,7 +63,7 @@
<javadoc destdir="${javadoc-dir}" use="true"
verbose="false">
<classpath>
- <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
+ <pathelement location="${ice.home}/lib/Ice.jar"/>
</classpath>
<fileset dir="${slice2java-dir}">
<exclude name="**/*Holder.java"/>
diff --git a/install-ice-jar.xml b/install-ice-jar.xml
index 0da1dec..5402602 100644
--- a/install-ice-jar.xml
+++ b/install-ice-jar.xml
@@ -4,7 +4,6 @@
<property environment="env"/>
<property name="generated-pom-dir"
value="java/tmp/pom"/>
- <property name="ice.jar" location="${env.ICE_HOME}/lib/Ice.jar"/>
<property name="mvn.version" value="2.1.1"/>
@@ -14,14 +13,28 @@
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath"/>
- <available property="ice-home-set" file="${env.ICE_HOME}"/>
+ <!-- Find ICE_HOME -->
+ <condition property="ice.home" value="${env.ICE_HOME}">
+ <available file="${env.ICE_HOME}"/>
+ </condition>
+ <condition property="ice.home" value="/opt/Ice-3.4">
+ <available file="/opt/Ice-3.4"/>
+ </condition>
+ <condition property="ice.home" value="/opt/Ice-3.4.2">
+ <available file="/opt/Ice-3.4.2"/>
+ </condition>
+ <condition property="ice.home" value="C:\Ice-3.4.2">
+ <available file="C:\Ice-3.4.2"/>
+ </condition>
- <target name="fail-if-no-ice-home" unless="ice-home-set">
+ <property name="ice.jar" location="${ice.home}/lib/Ice.jar"/>
+
+ <target name="fail-if-no-ice-home" unless="ice.home">
<fail message="ICE_HOME not set correctly (${env.ICE_HOME})"/>
</target>
<target name="get-ice-version" depends="fail-if-no-ice-home">
- <exec executable="${env.ICE_HOME}/bin/slice2java"
+ <exec executable="${ice.home}/bin/slice2java"
outputproperty="ice-version">
<arg value="--version"/>
</exec>
@@ -40,7 +53,7 @@
<copy file="ice-pom.xml.in" tofile="${generated-pom-dir}/ice-pom.xml"
filtering="true" failonerror="true" overwrite="true"/>
<artifact:pom id="ice-pom" file="${generated-pom-dir}/ice-pom.xml"/>
- <artifact:install file="${env.ICE_HOME}/lib/Ice.jar"
+ <artifact:install file="${ice.home}/lib/Ice.jar"
pomrefid="ice-pom">
<attach file="java/Ice-sources.jar" classifier="sources"/>
</artifact:install>
@@ -51,7 +64,7 @@
<copy file="ice-pom.xml.in" tofile="${generated-pom-dir}/ice-pom.xml"
filtering="true" failonerror="true" overwrite="true"/>
<artifact:pom id="ice-pom" file="${generated-pom-dir}/ice-pom.xml"/>
- <artifact:deploy file="${env.ICE_HOME}/lib/Ice.jar"
+ <artifact:deploy file="${ice.home}/lib/Ice.jar"
pomrefid="ice-pom">
<attach file="java/Ice-sources.jar" classifier="sources"/>
</artifact:deploy>
commit 00939724984dd002dacc8c165183ef8f582c5a5a
Author: David M. Lee <dlee at digium.com>
Date: Thu Aug 4 12:49:24 2011 -0500
Properly copy pom.xml updates
diff --git a/build.xml b/build.xml
index cc2fd0d..443d790 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@
<target name="install" depends="package,ice.get-ice-version"
description="installs packages into local Maven repo">
<copy file="pom.xml.in" tofile="${generated-pom-dir}/pom.xml"
- filtering="true" failonerror="true"/>
+ filtering="true" failonerror="true" overwrite="true"/>
<artifact:pom id="pom" file="${generated-pom-dir}/pom.xml"/>
<artifact:install file="java/astscf-api.jar" pomrefid="pom">
<attach file="java/astscf-api-sources.jar"
@@ -116,7 +116,7 @@ Either configure in ~/.ant/repositories.properties, or configure using -D
<target name="deploy" depends="package,ice.get-ice-version,fail-if-no-snapshot-repo,fail-if-no-release-repo"
description="deploys packages into local Maven repo">
<copy file="pom.xml.in" tofile="${generated-pom-dir}/pom.xml"
- filtering="true" failonerror="true"/>
+ filtering="true" failonerror="true" overwrite="true"/>
<artifact:pom id="pom" file="${generated-pom-dir}/pom.xml"/>
<artifact:deploy file="java/astscf-api.jar" pomrefid="pom">
<attach file="java/astscf-api-sources.jar"
diff --git a/install-ice-jar.xml b/install-ice-jar.xml
index 902a118..0da1dec 100644
--- a/install-ice-jar.xml
+++ b/install-ice-jar.xml
@@ -38,7 +38,7 @@
<target name="install-ice" depends="get-ice-version,ice-src"
description="Installs ice.jar from ICE_HOME into local Maven repo">
<copy file="ice-pom.xml.in" tofile="${generated-pom-dir}/ice-pom.xml"
- filtering="true" failonerror="true"/>
+ filtering="true" failonerror="true" overwrite="true"/>
<artifact:pom id="ice-pom" file="${generated-pom-dir}/ice-pom.xml"/>
<artifact:install file="${env.ICE_HOME}/lib/Ice.jar"
pomrefid="ice-pom">
@@ -49,7 +49,7 @@
<target name="deploy-ice" depends="get-ice-version,ice-src"
description="Deploys ice.jar from ICE_HOME into local Maven repo">
<copy file="ice-pom.xml.in" tofile="${generated-pom-dir}/ice-pom.xml"
- filtering="true" failonerror="true"/>
+ filtering="true" failonerror="true" overwrite="true"/>
<artifact:pom id="ice-pom" file="${generated-pom-dir}/ice-pom.xml"/>
<artifact:deploy file="${env.ICE_HOME}/lib/Ice.jar"
pomrefid="ice-pom">
-----------------------------------------------------------------------
--
asterisk-scf/release/slice.git
More information about the asterisk-scf-commits
mailing list