Removed unneeded 'keep' args to ProGuard

[zxing.git] / javame / build.xml

diff --git a/javame/build.xml b/javame/build.xml
index 2271912..fe20cf7 100644 (file)
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -56,6 +56,13 @@
         </not>
       </condition>
     </fail>
+    <fail message="Please build 'core' first">
+      <condition>
+        <not>
+          <available file="../core/core.jar" type="file"/>
+        </not>
+      </condition>
+    </fail>
   </target>
 
   <target name="compile" depends="init">
@@ -71,6 +78,7 @@
            fork="true">
       <classpath refid="wtk-build-path"/>
     </javac>
+    <jar jarfile="javame.jar" basedir="build" level="9"/>
   </target>
 
   <target name="compile-basic" depends="init">
@@ -86,7 +94,7 @@
            debug="true"
            deprecation="true"
            fork="true">
-       <classpath refid="wtk-build-path"/>
+      <classpath refid="wtk-build-path"/>
     </javac>
     <javac srcdir="src"
            destdir="build"
@@ -100,14 +108,15 @@
       <classpath refid="wtk-build-path"/>
       <exclude name="com/google/zxing/client/j2me/AdvancedMultimediaManager.java"/>
     </javac>
+    <jar jarfile="javame-basic.jar" basedir="build" level="9"/>    
   </target>
 
   <target name="package">
     <unzip src="../core/core.jar" dest="build"/>
 
     <mkdir dir="build-j2me"/>
-    <exec executable="${WTK-home}/bin/preverify1.1">
-      <arg line="-classpath ${preverify-classpath} -d build-j2me build"/>
+    <exec executable="${WTK-home}/bin/preverify1.1" failonerror="true">
+      <arg line="-classpath '${preverify-classpath}' -d build-j2me build"/>
     </exec>
 
     <copy todir="build-j2me">
@@ -116,24 +125,28 @@
       </fileset>
     </copy>
 
-    <copy file="src/com/google/zxing/client/j2me/MANIFEST.MF.template" tofile="src/com/google/zxing/client/j2me/MANIFEST.MF" overwrite="true">
+    <copy file="src/com/google/zxing/client/j2me/MANIFEST.MF.template"
+          tofile="src/com/google/zxing/client/j2me/MANIFEST.MF" overwrite="true">
       <filterset>
         <filter token="APP_NAME" value="${jar-name}"/>
         <filter token="VERSION" value="${version}"/>
       </filterset>
     </copy>
 
-    <jar jarfile="${jar-name}.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF" level="9"/>
+    <jar jarfile="${jar-name}.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF"
+         level="9"/>
 
     <move file="${jar-name}.jar" tofile="temp.jar"/>
-    <java jar="${WTK-home}/bin/proguard.jar" fork="true">
+    <java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">
       <arg value="-injars temp.jar"/>
       <arg value="-outjars ${jar-name}.jar"/>
-      <arg value="-libraryjars ${preverify-classpath}"/>
+      <arg value="-libraryjars ${WTK-home}/lib/cldcapi11.jar"/>
+      <arg value="-libraryjars ${WTK-home}/lib/midpapi20.jar"/>
+      <arg value="-libraryjars ${WTK-home}/lib/mmapi.jar"/>
+      <arg value="-libraryjars ${WTK-home}/lib/jsr234.jar"/>
+      <arg value="-libraryjars ../core/core.jar"/>
       <arg value="-microedition"/>
       <arg value="-keep public class com.google.zxing.client.j2me.ZXingMIDlet"/>
-      <arg value="-keep public class com.google.zxing.qrcode.detector.DefaultGridSampler"/>
-      <arg value="-keep public class com.google.zxing.qrcode.detector.GridSampler"/>
       <arg value="-optimizationpasses 5"/>
       <arg value="-verbose"/>
     </java>
@@ -142,7 +155,7 @@
     <!-- get .jar size to include it in the .jad file -->
     <length file="${jar-name}.jar" property="jar-size"/>
 
-    <copy file="ZXingReader.jad.template" tofile="${jar-name}.jad" overwrite="true">
+    <copy file="BarcodeReader.jad.template" tofile="${jar-name}.jad" overwrite="true">
       <filterset>
         <filter token="JAR_SIZE" value="${jar-size}"/>
         <filter token="APP_NAME" value="${jar-name}"/>
@@ -154,7 +167,7 @@
 
   <target name="build">
     <description>Builds the main reader .jar file</description>
-    <property name="jar-name" value="ZXingReader"/>
+    <property name="jar-name" value="BarcodeReader"/>
     <antcall target="clean"/>
     <antcall target="compile"/>
     <antcall target="package"/>
@@ -162,7 +175,7 @@
 
   <target name="build-basic">
     <description>Builds the basic reader .jar file</description>
-    <property name="jar-name" value="ZXingReaderBasic"/>
+    <property name="jar-name" value="BarcodeReaderBasic"/>
     <antcall target="clean"/>
     <antcall target="compile-basic"/>
     <antcall target="package"/>