svn commit: r422811 - in /incubator/abdera/java/trunk: build/build.xml dependencies/json/ dependencies/src/

[jm...@apache.org]

Author: jmsnell
Date: Mon Jul 17 12:28:12 2006
New Revision: 422811

URL: http://svn.apache.org/viewvc?rev=422811&view=rev
Log:
Moving json into it's own directory in the dependencies module (as suggested by Stephen)

Added:
    incubator/abdera/java/trunk/dependencies/json/
Removed:
    incubator/abdera/java/trunk/dependencies/src/
Modified:
    incubator/abdera/java/trunk/build/build.xml

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=422811&r1=422810&r2=422811&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Mon Jul 17 12:28:12 2006
@@ -51,9 +51,9 @@
       
   <property name="dependencies" value="${basedir}/dependencies" />
   <property name="dependencies.work" value="${dependencies}/work" />
-  <property name="dependencies.src" value="${dependencies}/src" />
-  <property name="dependencies.src.java"
-            value="${dependencies.src}/main/java" />
+  <property name="json.src" value="${dependencies}/json/src" />
+  <property name="json.src.java"
+            value="${json.src}/main/java" />
 
   <property name="json.jar" value="${dependencies}/json.jar" />
 
@@ -64,13 +64,17 @@
   </path>
  
   <target name="compile.dependencies">
-    <mkdir dir="${dependencies.work}" />
+    <mkdir dir="${dependencies.work}/json" />
 
-    <javac srcdir="${dependencies.src.java}" destdir="${dependencies.work}" />
+    <!-- build json -->
+    <javac srcdir="${json.src.java}" destdir="${dependencies.work}/json" />
 
     <jar destfile="${json.jar}"
-         basedir="${dependencies.work}"
+         basedir="${dependencies.work}/json"
          includes="org/json/*.class" />
+    
+    <delete dir="${dependencies.work}" />
+    
   </target>
  
   <target name="dependencies">
@@ -266,6 +270,7 @@
       <fileset dir="${dist}">
         <include name="**/*.jar" />
         <include name="**/legal/*" />
+        <exclude name="**/json/*" />
         <exclude name="**/*.retro.jar" />
         <exclude name="**/retroweaver-rt-1.2.3.jar" />
       </fileset>
@@ -280,6 +285,7 @@
         <fileset dir="${dist}">
           <include name="**/*.jar" />
           <include name="**/legal/*" />
+          <exclude name="**/json/*" />
           <exclude name="**/*.${version}.jar" />
         </fileset>
         <fileset dir="${docs}" includes="**/*" />