Misc. small updates for 0.1.4

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

diff --git a/CHANGES b/CHANGES
index 67822c8..bdc7135 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,3 +15,11 @@
 - Added EAN-13 support
 - Now builds with class file format version 1.2 -- may solve some compatibility issues?
 - Fixed obfuscation step bug causing NoClassDefFoundError
 - Added EAN-13 support
 - Now builds with class file format version 1.2 -- may solve some compatibility issues?
 - Fixed obfuscation step bug causing NoClassDefFoundError

+
+0.1.4 (13 Dec 2007)
+- Added Blackberry client build script -- does not yet work
+- Big change to handling of content of barcodes:
+  - com.google.zxing.client.result moved from core-ext to core
+  - Rewritten for J2ME
+  - core-ext removed
+  - J2ME client now uses this code for better parsing/handling of results
\ No newline at end of file

diff --git a/build.properties b/build.properties
index 5fb5995..b76c0e4 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=0.1.3
+version=0.1.4

 
 # Set this to a location where Sun's Wireless Toolkit, version 2.5.2 or later, has been installed
 # Location on Linux varies but is typically under /usr/local or /usr/lib
 
 # Set this to a location where Sun's Wireless Toolkit, version 2.5.2 or later, has been installed
 # Location on Linux varies but is typically under /usr/local or /usr/lib

diff --git a/build.xml b/build.xml
index 1eb6165..0f0d665 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -25,11 +25,6 @@
     <ant dir="javame" target="build"/>
     <ant dir="javase" target="build"/>
   </target>
     <ant dir="javame" target="build"/>
     <ant dir="javase" target="build"/>
   </target>

-       
-       <target name="buildwithoutj2me">
-         <ant dir="core" target="build"/>
-         <ant dir="javase" target="build"/>
-       </target>

 
   <target name="clean">
     <ant dir="core" target="clean"/>
 
   <target name="clean">
     <ant dir="core" target="clean"/>


@@ -37,7 +32,11 @@
     <ant dir="javase" target="clean"/>
   </target>
 
     <ant dir="javase" target="clean"/>
   </target>
 

-  <target name="release" depends="build,clean">
+  <target name="test">
+    <ant dir="core" target="test"/>
+  </target>
+
+  <target name="release" depends="build,clean,javadoc">

     <zip file="ZXing-${version}.zip" level="9">
       <zipfileset dir="." prefix="zxing-${version}">
         <include name="COPYING"/>
     <zip file="ZXing-${version}.zip" level="9">
       <zipfileset dir="." prefix="zxing-${version}">
         <include name="COPYING"/>


@@ -48,6 +47,8 @@
         <include name="core/**"/>
         <include name="javame/**"/>
         <include name="javase/**"/>
         <include name="core/**"/>
         <include name="javame/**"/>
         <include name="javase/**"/>

+        <!-- Only include the build script for now -->
+        <include name="rim/build.xml"/>

         <include name="docs/**"/>
         <exclude name="*.iml"/>
       </zipfileset>
         <include name="docs/**"/>
         <exclude name="*.iml"/>
       </zipfileset>


@@ -56,7 +57,7 @@
 
   <target name="javadoc">
     <mkdir dir="docs/javadoc"/>
 
   <target name="javadoc">
     <mkdir dir="docs/javadoc"/>

-    <javadoc destdir="docs/javadoc" footer="&lt;script src=&quot;http://www.google-analytics.com/urchin.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;&lt;script type=&quot;text/javascript&quot;&gt;_uacct = &quot;UA-788492-4&quot;; urchinTracker();&lt;/script&gt;">
+    <javadoc destdir="docs/javadoc" footer="&lt;script src=&quot;http://www.google-analytics.com/urchin.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;&lt;script type=&quot;text/javascript&quot;&gt;_uacct = &quot;UA-788492-5&quot;; urchinTracker();&lt;/script&gt;">

       <sourcepath>
         <pathelement location="core/src"/>
         <pathelement location="javame/src"/>
       <sourcepath>
         <pathelement location="core/src"/>
         <pathelement location="javame/src"/>