Simplifications to release: consider rim/ and bug/ sorta unsupported so don't bother...

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

diff --git a/build.xml b/build.xml
index 1ae81af..55f30cf 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -24,11 +24,9 @@
     <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="debug-optimized"/>
-    <ant dir="androidtest" target="debug-optimized"/>
+    <ant dir="android" target="compile"/>
+    <ant dir="androidtest" target="compile"/>

     <ant dir="android-integration" target="build"/>
     <ant dir="android-integration" target="build"/>

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

     <ant dir="zxingorg" target="build"/>
   </target>
 
     <ant dir="zxingorg" target="build"/>
   </target>
 


@@ -41,10 +39,8 @@
     <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="androidtest" target="clean"/>
     <ant dir="android" target="clean"/>
     <ant dir="androidtest" target="clean"/>

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

     <ant dir="zxingorg" target="clean"/>
     <delete dir="docs/javadoc"/>
   </target>
     <ant dir="zxingorg" target="clean"/>
     <delete dir="docs/javadoc"/>
   </target>


@@ -87,11 +83,9 @@
       <sourcepath>
         <pathelement location="android/src"/>
         <pathelement location="android/gen"/>        
       <sourcepath>
         <pathelement location="android/src"/>
         <pathelement location="android/gen"/>        

-        <pathelement location="bug/src"/>

         <pathelement location="core/src"/>
         <pathelement location="javame/src"/>
         <pathelement location="javase/src"/>
         <pathelement location="core/src"/>
         <pathelement location="javame/src"/>
         <pathelement location="javase/src"/>

-        <pathelement location="rim/src"/>

         <pathelement location="zxingorg/src"/>
       </sourcepath>
       <classpath>
         <pathelement location="zxingorg/src"/>
       </sourcepath>
       <classpath>


@@ -100,14 +94,10 @@
         <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/mmapi.jar"/>
         <pathelement location="${WTK-home}/lib/jsr234.jar"/>
         <pathelement location="${android-home}/platforms/android-1.5/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>
         <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/javame/build.xml b/javame/build.xml
index b034b1c..8ec9f24 100644 (file)
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -82,10 +82,15 @@
 
     <unzip src="../core/core.jar" dest="build"/>
 
 
     <unzip src="../core/core.jar" dest="build"/>
 

+    <!--

     <mkdir dir="build-j2me"/>
     <exec executable="${WTK-home}/bin/preverify1.1" failonerror="true">
       <arg line="-classpath '${preverify-classpath}' -d build-j2me build"/>
     </exec>
     <mkdir dir="build-j2me"/>
     <exec executable="${WTK-home}/bin/preverify1.1" failonerror="true">
       <arg line="-classpath '${preverify-classpath}' -d build-j2me build"/>
     </exec>

+    -->
+    <copy todir="build-j2me">
+      <fileset dir="build"/>
+    </copy>

 
     <copy todir="build-j2me">
       <fileset dir=".">
 
     <copy todir="build-j2me">
       <fileset dir=".">