Renamed core OSGi bundle to "ZXing"; removed "level=" attribute on <jar> tasks since...

[zxing.git] / build.xml

diff --git a/build.xml b/build.xml
index b64b8b2..5ebe7b4 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -23,50 +23,73 @@
   <target name="build">
     <ant dir="core" target="build"/>
     <ant dir="javame" target="build"/>
-    <ant dir="core-ext" target="build"/>
+    <ant dir="javase" target="build"/>
+    <ant dir="android" target="package"/>
+    <ant dir="javame" target="build-basic"/>
+    <ant dir="rim" target="build"/>
+  </target>
+
+  <target name="buildwithoutj2me">
+    <ant dir="core" target="build"/>
     <ant dir="javase" target="build"/>
   </target>
-       
-       <target name="buildwithoutj2me">
-         <ant dir="core" target="build"/>
-         <ant dir="core-ext" target="build"/>
-         <ant dir="javase" target="build"/>
-       </target>
 
   <target name="clean">
     <ant dir="core" target="clean"/>
     <ant dir="javame" target="clean"/>
-    <ant dir="core-ext" target="clean"/>
     <ant dir="javase" target="clean"/>
+    <ant dir="android" target="clean"/>
+    <ant dir="rim" target="clean"/>
+    <delete dir="docs/javadoc"/>
+  </target>
+
+  <target name="test">
+    <ant dir="core" target="test"/>
   </target>
 
-  <target name="release" depends="build,clean">
-    <zip file="ZXing-${version}.zip" level="9">
+  <target name="release" depends="build,clean,javadoc">
+    <zip file="ZXing-${version}.zip">
       <zipfileset dir="." prefix="zxing-${version}">
+        <exclude name="**/.*"/> <!-- exclude hidden files -->
         <include name="COPYING"/>
         <include name="README"/>
         <include name="CHANGES"/>
         <include name="build.xml"/>
         <include name="build.properties"/>
+        <include name="android/**"/>
         <include name="core/**"/>
         <include name="javame/**"/>
-        <include name="core-ext/**"/>
         <include name="javase/**"/>
+        <include name="rim/build.xml"/>
+        <include name="rim/src/**"/>
+        <include name="rim/res/**"/>
+        <include name="rim/BarcodeReader.jad.template"/>
         <include name="docs/**"/>
-        <exclude name="*.iml"/>
+        <include name="zxingorg/**"/>
+        <exclude name="zxingorg/secrets.properties"/>
       </zipfileset>
     </zip>
   </target>
 
   <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 type=&quot;text/javascript&quot;&gt; var gaJsHost = ((&quot;https:&quot; == document.location.protocol) ?  &quot;https://ssl.&quot; : &quot;http://www.&quot;); document.write(unescape(&quot;%3Cscript src='&quot; + gaJsHost + &quot;google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E&quot;)); &lt;/script&gt; &lt;script type=&quot;text/javascript&quot;&gt; var pageTracker = _gat._getTracker(&quot;UA-788492-5&quot;); pageTracker._initData(); pageTracker._trackPageview(); &lt;/script&gt;">
       <sourcepath>
+        <pathelement location="android/src"/>
         <pathelement location="core/src"/>
-        <pathelement location="core-ext/src"/>
         <pathelement location="javame/src"/>
         <pathelement location="javase/src"/>
+        <pathelement location="rim/src"/>
       </sourcepath>
+      <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="${android-home}/android.jar"/>
+        <pathelement location="${BB-JDK-home}/lib/net_rim_api.jar"/>
+      </classpath>
     </javadoc>
   </target>