X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=rim%2Fbuild.xml;h=338ca6ad0d4b5e751e5197ce3035d08e8514c7d6;hp=462f6b5a7531eb26e7cd7e475d7f190185c8cf7a;hb=279a63c72a04a5c181b520512e2ce69d6ea6b86d;hpb=55937e92102b86ece5f367d98e44907aa70bd6f1

diff --git a/rim/build.xml b/rim/build.xml
index 462f6b5a..338ca6ad 100644
--- a/rim/build.xml
+++ b/rim/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright 2007 Google Inc.
+ Copyright 2007 ZXing authors
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -44,10 +44,10 @@
         </not>
       </condition>
     </fail>
-    <fail message="Please build 'build-basic' in 'javame' first">
+    <fail message="Please build 'javame' first">
       <condition>
         <not>
-          <available file="../javame/javame-basic.jar" type="file"/>
+          <available file="../javame/javame.jar" type="file"/>
         </not>
       </condition>
     </fail>
@@ -67,28 +67,47 @@
            fork="true">
       <classpath>
         <pathelement location="../core/core.jar"/>
-        <pathelement location="../javame/javame-basic.jar"/>        
+        <pathelement location="../javame/javame.jar"/>
       </classpath>
     </javac>
 
     <unzip src="../core/core.jar" dest="build"/>
-    <unzip src="../javame/javame-basic.jar" dest="build"/>
+    <unzip src="../javame/javame.jar" dest="build"/>
 
     <mkdir dir="build-j2me"/>
     <exec executable="${WTK-home}/bin/preverify1.1" failonerror="true">
-      <arg line="-classpath ${rim-api-jar} -d build-j2me build"/>
+      <arg line="-classpath '${rim-api-jar}' -d build-j2me build"/>
     </exec>
 
+    <copy todir="build-j2me">
+      <fileset dir=".">
+        <include name="res/**"/>
+      </fileset>
+    </copy>
+
+    <copy file="BarcodeReader.jad.template" tofile="BarcodeReader.jad" overwrite="true">
+      <filterset>
+        <filter token="VERSION" value="${version}"/>
+      </filterset>
+    </copy>
+    <copy file="BarcodeReader.alx.template" tofile="BarcodeReader.alx" overwrite="true">
+      <filterset>
+        <filter token="VERSION" value="${version}"/>
+      </filterset>
+    </copy>
+
     <jar jarfile="temp.jar" basedir="build-j2me"/>
     <java jar="${BB-JDK-home}/bin/rapc.jar" fork="true">
       <arg value="-quiet"/>
       <arg value="import=${rim-api-jar}"/>
-      <arg value="jad=BarcodeReader.rapc"/>
+      <arg value="jad=BarcodeReader.jad"/>
       <arg value="codename=BarcodeReader"/>
       <arg value="temp.jar"/>
     </java>
-  </target>
 
+    <echo>Remember to sign the .cod file!</echo>
+
+  </target>
 
   <target name="clean">
     <delete dir="build"/>
@@ -98,7 +117,9 @@
     <delete file="BarcodeReader.csl"/>
     <delete file="BarcodeReader.cso"/>
     <delete file="BarcodeReader.debug"/>
-    <delete file="BarcodeReader.jar"/>    
+    <delete file="BarcodeReader.jad"/>        
+    <delete file="BarcodeReader.jar"/>
+    <delete file="LogFile.txt"/>        
   </target>
 
 </project>