X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fbuild.xml;h=633d81b3fe5bf6866033f91a3888a21af2ccc333;hb=67bb87dea0eb848f80814f0353196079023a7aaf;hp=c76c709933fde71f648bc835ac24877b0bd124e7;hpb=b669dee60fe811b34ddd23de2c266c5766c88574;p=zxing.git

diff --git a/core/build.xml b/core/build.xml
index c76c7099..633d81b3 100644
--- a/core/build.xml
+++ b/core/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.
@@ -31,7 +31,7 @@
     <tstamp/>
   </target>
 
-  <target name="build" depends="init">
+  <target name="compile" depends="init">
     <mkdir dir="build"/>
     <javac srcdir="src"
            destdir="build"
@@ -39,31 +39,42 @@
            target="1.2"
            bootclasspath="${javame-compile-bootclasspath-path}"
            optimize="true"
-           debug="true"
+           debug="${generate-debug}"
            deprecation="true"
-           fork="true"/>
-    <jar jarfile="core.jar" basedir="build" level="9"/>
+           fork="true">
+      <!-- TODO re-add this package -->
+      <exclude name="com/google/zxing/qrcode/encoder/**"/>
+    </javac>
+    <jar jarfile="core.jar" basedir="build">
+      <!-- These entries allow core.jar to function as an OSGi bundle, and also specifices
+           additional attributes for compatibility with BugLabs's BUG platform.
+           Thanks to David Albert for this change. -->
+      <manifest>
+        <attribute name="Bundle-Name" value="ZXing"/>
+        <attribute name="Bundle-Vendor" value="ZXing Project"/>
+        <attribute name="Bundle-SymbolicName" value="ZXing"/>
+        <attribute name="Bundle-Version" value="${version}"/>        
+        <attribute name="Export-Package" value="com.google.zxing,com.google.zxing.common,com.google.zxing.client.result"/>
+        <attribute name="Bug-Bundle-Type" value="Application"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="build" depends="clean">
+    <antcall target="compile">
+      <param name="generate-debug" value="true"/>
+    </antcall>
   </target>
 
-  <target name="build-optimized" depends="build">
-    <move file="core.jar" tofile="temp.jar"/>
-    <java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">
-      <jvmarg value="-Dmaximum.inlined.code.length=32"/>
-      <arg value="-injars temp.jar"/>
-      <arg value="-outjars core.jar"/>
-      <arg value="-libraryjars ${WTK-home}/lib/cldcapi11.jar"/>
-      <arg value="-renamesourcefileattribute SourceFile"/>
-      <arg value="-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod"/>
-      <arg value="-keep class * { !private *; }"/>
-      <arg value="-optimizationpasses 7"/>
-      <arg value="-overloadaggressively"/>
-      <arg value="-allowaccessmodification"/>
-      <arg value="-verbose"/>
-    </java>
-    <delete file="temp.jar"/>
+  <!-- This target is needed for building a core.jar which the Android client can use and run
+       ProGuard on successfully, because dx doesn't like debugging info. -->
+  <target name="build-no-debug" depends="clean">
+    <antcall target="compile">
+      <param name="generate-debug" value="false"/>
+    </antcall>
   </target>
 
-  <target name="build-test" depends="init,build-optimized">
+  <target name="build-test" depends="init,build">
     <fail message="Please build 'javase' first">
       <condition>
         <not>
@@ -85,6 +96,23 @@
   </target>
 
   <target name="test-blackbox" depends="build-test">
+    <parallel failonany="true">
+      <antcall target="test-blackbox-subset">
+        <param name="subdir" value="datamatrix"/>
+      </antcall>
+      <antcall target="test-blackbox-subset">
+        <param name="subdir" value="negative"/>
+      </antcall>
+      <antcall target="test-blackbox-subset">
+        <param name="subdir" value="oned"/>
+      </antcall>
+      <antcall target="test-blackbox-subset">
+        <param name="subdir" value="qrcode"/>
+      </antcall>
+    </parallel>
+  </target>
+
+  <target name="test-blackbox-subset">
     <junit printsummary="on" haltonfailure="on" haltonerror="on" fork="true" dir=".">
       <formatter type="plain" usefile="false"/>
       <classpath>
@@ -98,8 +126,8 @@
       </assertions>
       <batchtest>
         <fileset dir="test/src">
-          <include name="**/*BlackBox*TestCase.java"/>
-          <exclude name="com/google/zxing/common/AbstractBlackBoxTestCase.java"/>
+          <include name="**/${subdir}/*BlackBox*TestCase.java"/>
+          <exclude name="**/Abstract*.java"/>            
         </fileset>
       </batchtest>
     </junit>
@@ -119,7 +147,9 @@
       </assertions>
       <batchtest>
         <fileset dir="test/src">
+          <include name="**/*TestCase.java"/>          
           <exclude name="**/*BlackBox*TestCase.java"/>
+          <exclude name="**/Abstract*.java"/>
         </fileset>
       </batchtest>
     </junit>
@@ -131,6 +161,8 @@
     <delete dir="build"/>
     <delete dir="build-test"/>
     <delete file="core.jar"/>
+    <delete file="ZXingReader.*"/>
+    <delete file="proguard-dump.txt"/>
   </target>
 
 </project>