[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "disintegrated-build" updated.

[Commits to the Asterisk SCF project code repositories]

branch "disintegrated-build" has been updated
       via  c638655b3d17ea8cb0810950f803c40d8c2c0678 (commit)
       via  e9bc64fc7cd79f0bb02e225b99d98f41adb73a24 (commit)
      from  4f839ac1d9b5b7bb786014538dbdfefb440cae65 (commit)

Summary of changes:
 build.xml        |   18 +++++++++---------
 make-mono-api.sh |    2 +-
 pom.xml.in       |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit c638655b3d17ea8cb0810950f803c40d8c2c0678
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 e9bc64fc7cd79f0bb02e225b99d98f41adb73a24
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>

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/slice.git