More fixes to the build files after trying to build the whole thing again for release

git-svn-id: http://zxing.googlecode.com/svn/trunk@514 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/bug/build.xml b/bug/build.xml
index 417a98a..4e25373 100644 (file)
--- a/bug/build.xml
+++ b/bug/build.xml
@@ -70,6 +70,7 @@
 
   <target name="clean">
     <delete dir="build"/>
 
   <target name="clean">
     <delete dir="build"/>

+    <delete file="bug.jar"/>

   </target>
 
 </project>
   </target>
 
 </project>

diff --git a/build.xml b/build.xml
index 79daf24..b043524 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -21,10 +21,10 @@
   <property file="build.properties"/>
 
   <target name="build">
   <property file="build.properties"/>
 
   <target name="build">

-    <ant dir="bug" target="build"/>

     <ant dir="core" target="build"/>
     <ant dir="javame" target="build"/>
     <ant dir="javase" target="build"/>
     <ant dir="core" target="build"/>
     <ant dir="javame" target="build"/>
     <ant dir="javase" target="build"/>

+    <ant dir="bug" target="build"/>

     <ant dir="android" target="package"/>
     <ant dir="rim" target="build"/>
     <ant dir="zxingorg" target="build"/>
     <ant dir="android" target="package"/>
     <ant dir="rim" target="build"/>
     <ant dir="zxingorg" target="build"/>


@@ -36,10 +36,10 @@
   </target>
 
   <target name="clean">
   </target>
 
   <target name="clean">

-    <ant dir="bug" target="clean"/>

     <ant dir="core" target="clean"/>
     <ant dir="javame" target="clean"/>
     <ant dir="javase" target="clean"/>
     <ant dir="core" target="clean"/>
     <ant dir="javame" target="clean"/>
     <ant dir="javase" target="clean"/>

+    <ant dir="bug" target="clean"/>    

     <ant dir="android" target="clean"/>
     <ant dir="rim" target="clean"/>
     <ant dir="zxingorg" target="clean"/>
     <ant dir="android" target="clean"/>
     <ant dir="rim" target="clean"/>
     <ant dir="zxingorg" target="clean"/>


@@ -65,12 +65,10 @@
         <exclude name="bug/lib/com.buglabs*"/> <!-- Cannot distributed GPLed libraries -->
         <include name="core/**"/>
         <include name="cpp/**"/>
         <exclude name="bug/lib/com.buglabs*"/> <!-- Cannot distributed GPLed libraries -->
         <include name="core/**"/>
         <include name="cpp/**"/>

+        <include name="iphone/**"/>

         <include name="javame/**"/>
         <include name="javase/**"/>
         <include name="javame/**"/>
         <include name="javase/**"/>

-        <include name="rim/build.xml"/>
-        <include name="rim/src/**"/>
-        <include name="rim/res/**"/>
-        <include name="rim/BarcodeReader.jad.template"/>
+        <include name="rim/**"/>

         <include name="docs/**"/>
         <include name="zxingorg/**"/>
         <exclude name="zxingorg/secrets.properties"/>
         <include name="docs/**"/>
         <include name="zxingorg/**"/>
         <exclude name="zxingorg/secrets.properties"/>


@@ -98,6 +96,13 @@
         <pathelement location="${WTK-home}/lib/jsr234.jar"/>
         <pathelement location="${android-home}/android.jar"/>
         <pathelement location="${BB-JDK-home}/lib/net_rim_api.jar"/>
         <pathelement location="${WTK-home}/lib/jsr234.jar"/>
         <pathelement location="${android-home}/android.jar"/>
         <pathelement location="${BB-JDK-home}/lib/net_rim_api.jar"/>

+        <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
+        <fileset dir="zxingorg/web/WEB-INF/lib">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="bug/lib">
+          <include name="*.jar"/>
+        </fileset>

       </classpath>
     </javadoc>
   </target>
       </classpath>
     </javadoc>
   </target>

diff --git a/core/build.xml b/core/build.xml
index ab16bd1..192b4a7 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -171,6 +171,7 @@
     <delete dir="build"/>
     <delete dir="build-test"/>
     <delete file="core.jar"/>
     <delete dir="build"/>
     <delete dir="build-test"/>
     <delete file="core.jar"/>

+    <delete file="ZXingReader.*"/>

   </target>
 
 </project>
   </target>
 
 </project>