X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=build.xml;h=45a99fda46fc9cacf20c83b14b141ee625557cac;hp=f90d2cac21d03f795aea9c1dd4fb7e90069041bd;hb=b4f959c37f0d6d2ce55d5e79e893f306aafcea13;hpb=7f9863924905d4cd6d33e2699edf46cc7534cd04

diff --git a/build.xml b/build.xml
index f90d2cac..45a99fda 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
     <ant dir="android" target="compile"/>
     <ant dir="androidtest" target="compile"/>
     <ant dir="android-integration" target="build"/>
-    <ant dir="zxingorg" target="build"/>
+    <!--<ant dir="zxingorg" target="build"/>-->
   </target>
 
   <target name="buildwithoutj2me">
@@ -41,6 +41,7 @@
     <ant dir="javase" target="clean"/>
     <ant dir="android" target="clean"/>
     <ant dir="androidtest" target="clean"/>
+    <ant dir="android-integration" target="clean"/>
     <ant dir="zxingorg" target="clean"/>
     <delete dir="docs/javadoc"/>
   </target>
@@ -53,12 +54,15 @@
     <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/**"/>
@@ -71,6 +75,7 @@
         <include name="javase/**"/>
         <include name="rim/**"/>
         <include name="docs/**"/>
+        <include name="zxing.appspot.com/**"/>
         <include name="zxingorg/**"/>
         <exclude name="zxingorg/secrets.properties"/>
       </zipfileset>
@@ -91,11 +96,18 @@
         <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}/platforms/android-1.5/android.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-3/android.jar"/>
         <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
         <fileset dir="zxingorg/web/WEB-INF/lib">
           <include name="*.jar"/>