Reference JDK 1.4 classes file location directly to accommodate Mac users, and also...

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

diff --git a/build.properties b/build.properties
index 0da4d5f..7b5ae73 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,5 @@
 version=0.1
 WTK-home=/usr/local/WTK2.5.2
-JDK1.4-home=/usr/lib/jvm/j2sdk1.4.2_16
\ No newline at end of file
+JDK1.4-classes=/usr/lib/jvm/j2sdk1.4.2_16/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
\ No newline at end of file

diff --git a/build.xml b/build.xml
index a84f828..8a81952 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -21,6 +21,8 @@
     <zip file="ZXing-${version}.zip" basedir=".">
       <include name="COPYING"/>
       <include name="README"/>
+      <include name="build.xml"/>
+      <include name="build.properties"/>
       <include name="core/**"/>
       <include name="javame/**"/>
       <include name="core-ext/**"/>

diff --git a/core/build.xml b/core/build.xml
index 29b55ed..7b66d1e 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -13,7 +13,7 @@
            destdir="build"
            source="1.4"
            target="1.4"
-           bootclasspath="${JDK1.4-home}/jre/lib/rt.jar"
+           bootclasspath="${JDK1.4-classes}"
            optimize="true"
            debug="true"
            deprecation="true"

diff --git a/javame/build.xml b/javame/build.xml
index cd97017..6c85976 100644 (file)
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -13,7 +13,7 @@
            destdir="build"
            source="1.4"
            target="1.4"
-           bootclasspath="${JDK1.4-home}/jre/lib/rt.jar"
+           bootclasspath="${JDK1.4-classes}"
            optimize="true"
            debug="true"
            deprecation="true"