[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  de60753b83864661cd9eeeef50fbcf094b1fea8f (commit)
      from  067d8f5af43b78921aad0a7218c84cbc84f4f4c1 (commit)

Summary of changes:
 .gitignore          |    4 +++-
 build.xml           |   22 +++++++++++-----------
 install-ice-jar.xml |    6 +++---
 3 files changed, 17 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit de60753b83864661cd9eeeef50fbcf094b1fea8f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Sat Feb 5 07:54:55 2011 +0100

    Build Java files in 'java' subdirectory instead of 'target'.

diff --git a/.gitignore b/.gitignore
index eb5a316..b3c7ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-target
+java
+python
+
diff --git a/build.xml b/build.xml
index 16add0c..5c1ddf3 100644
--- a/build.xml
+++ b/build.xml
@@ -3,11 +3,11 @@
          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
     <property environment="env"/>
     <property name="slice2java-dir"
-              value="target/generated-sources/slice2java"/>
+              value="java/generated-sources/slice2java"/>
     <property name="generated-pom-dir"
-              value="target/tmp/pom"/>
-    <property name="classes-dir" value="target/classes"/>
-    <property name="javadoc-dir" value="target/javadoc"/>
+              value="java/tmp/pom"/>
+    <property name="classes-dir" value="java/classes"/>
+    <property name="javadoc-dir" value="java/javadoc"/>
 
     <property name="mvn.version" value="2.1.1"/>
 
@@ -74,10 +74,10 @@
 
     <target name="package" depends="compile,doc"
             description="Packages binaries, sources and javadoc .jar's">
-        <jar jarfile="target/asterisk-scf-api.jar" basedir="${classes-dir}"/>
-        <jar jarfile="target/asterisk-scf-api-sources.jar"
+        <jar jarfile="java/asterisk-scf-api.jar" basedir="${classes-dir}"/>
+        <jar jarfile="java/asterisk-scf-api-sources.jar"
              basedir="${slice2java-dir}"/>
-        <jar jarfile="target/asterisk-scf-api-javadoc.jar"
+        <jar jarfile="java/asterisk-scf-api-javadoc.jar"
              basedir="${javadoc-dir}"/>
     </target>
 
@@ -86,16 +86,16 @@
         <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="target/asterisk-scf-api.jar" pomrefid="pom">
-            <attach file="target/asterisk-scf-api-sources.jar"
+        <artifact:install file="java/asterisk-scf-api.jar" pomrefid="pom">
+            <attach file="java/asterisk-scf-api-sources.jar"
                     classifier="sources"/>
-            <attach file="target/asterisk-scf-api-javadoc.jar"
+            <attach file="java/asterisk-scf-api-javadoc.jar"
                     classifier="javadoc"/>
         </artifact:install>
     </target>
 
     <target name="clean"
             description="Clean">
-        <delete dir="target"/>
+        <delete dir="java"/>
     </target>
 </project>
diff --git a/install-ice-jar.xml b/install-ice-jar.xml
index d1b2227..70c0571 100644
--- a/install-ice-jar.xml
+++ b/install-ice-jar.xml
@@ -3,7 +3,7 @@
          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
     <property environment="env"/>
     <property name="generated-pom-dir"
-              value="target/tmp/pom"/>
+              value="java/tmp/pom"/>
     <property name="ice.jar" location="${env.ICE_HOME}/lib/Ice.jar"/>
 
     <property name="mvn.version" value="2.1.1"/>
@@ -30,7 +30,7 @@
 
     <target name="ice-src" depends="fail-if-no-ice-home">
         <!-- Ice.jar contains the sources.  Extract them to a separate .jar -->
-        <jar destfile="target/Ice-sources.jar">
+        <jar destfile="java/Ice-sources.jar">
             <zipfileset includes="**/*.java" src="${ice.jar}"/>
         </jar>
     </target>
@@ -42,7 +42,7 @@
         <artifact:pom id="ice-pom" file="${generated-pom-dir}/ice-pom.xml"/>
         <artifact:install file="${env.ICE_HOME}/lib/Ice.jar"
                           pomrefid="ice-pom">
-            <attach file="target/Ice-sources.jar" classifier="sources"/>
+            <attach file="java/Ice-sources.jar" classifier="sources"/>
         </artifact:install>
     </target>
 

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


-- 
asterisk-scf/release/slice.git