Now makes sure JDK 1.4 / WTK are present. No longer requires Unix-style wc binary...

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

diff --git a/build.properties b/build.properties
index 14b107f..7c5f8f8 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,11 @@
-version=0.1.1
+version=0.1.2
+
+# Set this to a location where Sun's Wireless Toolkit, version 2.5.2 or later, has been installed

 WTK-home=/usr/local/WTK2.5.2
 WTK-home=/usr/local/WTK2.5.2

-JDK1.4-classes=/usr/lib/jvm/j2sdk1.4.2_16/jre/lib/rt.jar
+
+# Set this to a location where the platform classes included with Java SDK version 1.4 (not later)
+# have been installed. This is typically the installation root of the JDK followed by
+# 'jre/lib/rt.jar'

 # Mac users, this should be set to:
 # JDK1.4-classes=/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar
 # Mac users, this should be set to:
 # JDK1.4-classes=/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar

+JDK1.4-classes=/usr/lib/jvm/j2sdk1.4.2_16/jre/lib/rt.jar

diff --git a/core/build.xml b/core/build.xml
index 7b66d1e..61a1643 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -8,6 +8,13 @@
   </target>
 
   <target name="build" depends="init">
   </target>
 
   <target name="build" depends="init">

+    <fail message="Please set 'JDK1.4-classes' in build.properties">
+      <condition>
+        <not>
+          <available file="${JDK1.4-classes}" type="file"/>
+        </not>
+      </condition>
+    </fail>

     <mkdir dir="build"/>
     <javac srcdir="src"
            destdir="build"
     <mkdir dir="build"/>
     <javac srcdir="src"
            destdir="build"

diff --git a/javame/build.xml b/javame/build.xml
index aefb05f..0f887f2 100644 (file)
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -19,6 +19,22 @@
   </target>
 
   <target name="build" depends="init">
   </target>
 
   <target name="build" depends="init">

+
+    <fail message="Please set 'JDK1.4-classes' in build.properties">
+      <condition>
+        <not>
+          <available file="${JDK1.4-classes}" type="file"/>
+        </not>
+      </condition>
+    </fail>
+    <fail message="Please set 'WTK-home' in build.properties">
+      <condition>
+        <not>
+          <available file="${WTK-home}" type="dir"/>
+        </not>
+      </condition>
+    </fail>
+

     <mkdir dir="build"/>
     <javac srcdir="src"
            destdir="build"
     <mkdir dir="build"/>
     <javac srcdir="src"
            destdir="build"


@@ -49,9 +65,8 @@
     <jar jarfile="ZXingReader.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF"/>
 
     <!-- get .jar size to include it in the .jad file -->
     <jar jarfile="ZXingReader.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF"/>
 
     <!-- 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>
+    <length file="ZXingReader.jar" property="jar-size"/>
+    

     <copy file="ZXingReader.jad.template" tofile="ZXingReader.jad" overwrite="true">
       <filterset>
         <filter token="JAR_SIZE" value="${jar-size}"/>
     <copy file="ZXingReader.jad.template" tofile="ZXingReader.jad" overwrite="true">
       <filterset>
         <filter token="JAR_SIZE" value="${jar-size}"/>