X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=javame%2Fbuild.xml;h=1d6726d7ddf366ad49c68d2b239ae4b6dd92b499;hb=96b9f5c5b984867358d1ba7af8a8f8ab3d716f10;hp=6c8597613c4aae5a0ebc700e23143fecec5aff64;hpb=ae8521eab03ce7daa7012ad96eae0065a08a73e3;p=zxing.git

diff --git a/javame/build.xml b/javame/build.xml
index 6c859761..1d6726d7 100644
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -1,37 +1,122 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2007 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 <project name="javame" default="build">
 
   <property file="../build.properties"/>
 
+  <path id="wtk-build-path">
+    <fileset dir="${WTK-home}/lib">
+      <include name="cldcapi11.jar"/>
+      <include name="midpapi20.jar"/>
+      <include name="mmapi.jar"/>
+      <include name="jsr234.jar"/>
+      <include name="satsa-apdu.jar"/>
+    </fileset>
+    <pathelement location="../core/core.jar"/>
+  </path>
+  <property name="preverify-classpath" refid="wtk-build-path"/>
+
+  <path id="javame-compile-bootclasspath">
+    <fileset dir="${WTK-home}/lib">
+      <include name="cldcapi11.jar"/>
+      <include name="midpapi20.jar"/>
+    </fileset>
+  </path>
+  <property name="javame-compile-bootclasspath-path" refid="javame-compile-bootclasspath"/>
+
   <target name="init">
     <tstamp/>
+    <fail message="Please set 'WTK-home' in build.properties">
+      <condition>
+        <not>
+          <available file="${WTK-home}" type="dir"/>
+        </not>
+      </condition>
+    </fail>
+    <fail message="Please put proguard.jar in 'bin' under the WTK install directory">
+      <condition>
+        <not>
+          <available file="${WTK-home}/bin/proguard.jar" type="file"/>
+        </not>
+      </condition>
+    </fail>
+    <fail message="Please build 'core' first">
+      <condition>
+        <not>
+          <available file="../core/core.jar" type="file"/>
+        </not>
+      </condition>
+    </fail>
   </target>
 
-  <target name="build" depends="init">
+  <target name="compile" depends="init">
     <mkdir dir="build"/>
     <javac srcdir="src"
            destdir="build"
-           source="1.4"
-           target="1.4"
-           bootclasspath="${JDK1.4-classes}"
+           source="1.2"
+           target="1.2"
+           bootclasspath="${javame-compile-bootclasspath-path}"
            optimize="true"
            debug="true"
            deprecation="true"
            fork="true">
-      <classpath>
-        <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="../core/core.jar"/>
-      </classpath>
+      <classpath refid="wtk-build-path"/>
     </javac>
+    <jar jarfile="javame.jar" basedir="build" level="9"/>
+  </target>
 
+  <target name="compile-basic" depends="init">
+    <mkdir dir="build"/>
+    <!-- For an explanation of this odd build command, see javadoc in
+         src/com/google/zxing/client/j2me/AdvancedMultimediaManager.java -->
+    <javac srcdir="src-basic"
+           destdir="build"
+           source="1.2"
+           target="1.2"
+           bootclasspath="${javame-compile-bootclasspath-path}"
+           optimize="true"
+           debug="true"
+           deprecation="true"
+           fork="true">
+      <classpath refid="wtk-build-path"/>
+    </javac>
+    <javac srcdir="src"
+           destdir="build"
+           source="1.2"
+           target="1.2"
+           bootclasspath="${javame-compile-bootclasspath-path}"
+           optimize="true"
+           debug="true"
+           deprecation="true"
+           fork="true">
+      <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 ${WTK-home}/lib/cldcapi11.jar:${WTK-home}/lib/midpapi20.jar:${WTK-home}/lib/mmapi.jar:${WTK-home}/lib/jsr234.jar:${WTK-home}/lib/satsa-apdu.jar -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">
@@ -40,25 +125,70 @@
       </fileset>
     </copy>
 
-    <jar jarfile="ZXingReader.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF"/>
+    <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"/>
+
+    <move file="${jar-name}.jar" tofile="temp.jar"/>
+    <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 ${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>
+    <delete file="temp.jar"/>
 
     <!-- get .jar size to include it in the .jad file -->
-    <exec executable="sh" outputproperty="jar-size">
-      <arg line="-c &quot;wc -c ZXingReader.jar | cut -d' ' -f1&quot;"/>
-    </exec>
-    <copy file="ZXingReader.jad.template" tofile="ZXingReader.jad" overwrite="true">
+    <length file="${jar-name}.jar" property="jar-size"/>
+
+    <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}"/>
+        <filter token="VERSION" value="${version}"/>
       </filterset>
     </copy>
 
   </target>
 
+  <target name="build">
+    <description>Builds the main reader .jar file</description>
+    <property name="jar-name" value="BarcodeReader"/>
+    <antcall target="clean"/>
+    <antcall target="compile"/>
+    <antcall target="package"/>
+  </target>
+
+  <target name="build-basic">
+    <description>Builds the basic reader .jar file</description>
+    <property name="jar-name" value="BarcodeReaderBasic"/>
+    <antcall target="clean"/>
+    <antcall target="compile-basic"/>
+    <antcall target="package"/>
+  </target>
+
   <target name="clean">
     <delete dir="build"/>
     <delete dir="build-j2me"/>
-    <delete file="ZXingReader.jar"/>
-    <delete file="ZXingReader.jad"/>    
+    <delete dir="." includes="*.jar"/>
+    <delete dir="." includes="*.jad"/>
+    <delete file="src/com/google/zxing/client/j2me/MANIFEST.MF"/>
   </target>
 
 </project>