X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=build.xml;h=a5dc6ce17ef758aa1e9c96f3d477557a820a28d3;hp=79daf24e24b0b71997f68e213c88e90aab399e9e;hb=48a784144880eab9f726f030bdce41cca1ff8870;hpb=1aff9c849dab0a202a10ee21bbbf19504d0bf456

diff --git a/build.xml b/build.xml
index 79daf24e..a5dc6ce1 100644
--- a/build.xml
+++ b/build.xml
@@ -21,13 +21,13 @@
   <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="android" target="package"/>
-    <ant dir="rim" target="build"/>
-    <ant dir="zxingorg" target="build"/>
+    <ant dir="android" target="compile"/>
+    <ant dir="androidtest" target="compile"/>
+    <ant dir="android-integration" target="build"/>
+    <!--<ant dir="zxingorg" target="build"/>-->
   </target>
 
   <target name="buildwithoutj2me">
@@ -36,12 +36,12 @@
   </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="android" target="clean"/>
-    <ant dir="rim" target="clean"/>
+    <ant dir="androidtest" target="clean"/>
+    <ant dir="android-integration" target="clean"/>
     <ant dir="zxingorg" target="clean"/>
     <delete dir="docs/javadoc"/>
   </target>
@@ -54,24 +54,28 @@
     <zip file="ZXing-${version}.zip">
       <zipfileset dir="." prefix="zxing-${version}">
         <exclude name="**/.*"/> <!-- exclude hidden files -->
+        <exclude name="**/.svn"/>
+        <exclude name="**/.iml"/>
         <include name="AUTHORS"/>
         <include name="COPYING"/>
         <include name="README"/>
         <include name="CHANGES"/>
         <include name="build.xml"/>
         <include name="build.properties"/>
+        <include name="actionscript/**"/>
         <include name="android/**"/>
+        <include name="android-integration/**"/>
+        <include name="androidtest/**"/>
         <include name="bug/**"/>
         <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="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="zxing.appspot.com/**"/>
         <include name="zxingorg/**"/>
         <exclude name="zxingorg/secrets.properties"/>
       </zipfileset>
@@ -81,23 +85,33 @@
   <target name="javadoc">
     <mkdir dir="docs/javadoc"/>
     <javadoc destdir="docs/javadoc"
+             useexternalfile="true"
              footer="&lt;script type=&quot;text/javascript&quot;&gt; var gaJsHost = ((&quot;https:&quot; == document.location.protocol) ?  &quot;https://ssl.&quot; : &quot;http://www.&quot;); document.write(unescape(&quot;%3Cscript src='&quot; + gaJsHost + &quot;google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E&quot;)); &lt;/script&gt; &lt;script type=&quot;text/javascript&quot;&gt; var pageTracker = _gat._getTracker(&quot;UA-788492-5&quot;); pageTracker._initData(); pageTracker._trackPageview(); &lt;/script&gt;">
       <sourcepath>
         <pathelement location="android/src"/>
-        <pathelement location="bug/src"/>
+        <pathelement location="android/gen"/>        
         <pathelement location="core/src"/>
         <pathelement location="javame/src"/>
         <pathelement location="javase/src"/>
-        <pathelement location="rim/src"/>
         <pathelement location="zxingorg/src"/>
       </sourcepath>
       <classpath>
+        <!-- These are used with WTK 2.5.x -->
+        <!--
         <pathelement location="${WTK-home}/lib/cldcapi11.jar"/>
         <pathelement location="${WTK-home}/lib/midpapi20.jar"/>
         <pathelement location="${WTK-home}/lib/mmapi.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="${WTK-home}/lib/cldc_1.1.jar"/>
+        <pathelement location="${WTK-home}/lib/midp_2.0.jar"/>
+        <pathelement location="${WTK-home}/lib/jsr135_1.2.jar"/>
+        <pathelement location="${WTK-home}/lib/jsr234_1.0.jar"/>
+        <pathelement location="${android-home}/platforms/android-1.5/android.jar"/>
+        <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
+        <fileset dir="zxingorg/web/WEB-INF/lib">
+          <include name="*.jar"/>
+        </fileset>
       </classpath>
     </javadoc>
   </target>