X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fbuild.xml;h=ad307cc51dd420ebcd44eafc68779e7027e5c625;hb=8d527ac1e19afb5172315ccd86260e8114db6acf;hp=a042e783251590a0f282961e0a98f79303b67304;hpb=1f548fe98790ac2742791f1f326ed94d287de82e;p=zxing.git

diff --git a/core/build.xml b/core/build.xml
index a042e783..ad307cc5 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -42,7 +42,7 @@
         <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="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>
@@ -63,6 +63,38 @@
     </antcall>
   </target>
 
+  <!-- This target builds an optimized core.jar using ProGuard. It is not intended for our Android
+  client - use build-no-debug intead, then build the client which runs ProGuard on everything. -->
+  <target name="build-optimized" depends="clean">
+    <antcall target="compile">
+      <param name="generate-debug" value="false"/>
+    </antcall>
+
+    <delete file="core.jar"/>
+    <mkdir dir="optimized"/>
+    <java jar="${proguard-jar}" fork="true" failonerror="true">
+      <jvmarg value="-Dmaximum.inlined.code.length=48"/>
+      <arg value="-injars build"/>
+      <arg value="-outjars optimized"/>
+      <!-- Needed for Mac OS. -->
+      <!--<arg value="-libraryjars ${java.home}/../Classes/classes.jar"/>-->
+      <!-- Needed for other Android apps besides Barcode Scanner. -->
+      <!--<arg value="-libraryjars ${android-home}/platforms/android-3/android.jar"/>-->
+      <arg value="-keep class com.google.zxing.* {public protected *;}"/>
+      <arg value="-keep class com.google.zxing.common.*Binarizer {public protected *;}"/>
+      <!-- Remove this line is you only use the Result base object and want the smallest jar. -->
+      <arg value="-keep class com.google.zxing.client.result.* {public protected *;}"/>
+      <!-- Contains a useful UPC-E to UPC-A method. -->
+      <arg value="-keep class com.google.zxing.oned.UPCEReader {public *;}"/>
+      <arg value="-target 1.2"/>
+      <arg value="-optimizationpasses 4"/>
+      <arg value="-dontobfuscate"/>
+      <arg value="-dontskipnonpubliclibraryclasses"/>
+      <arg value="-verbose"/>
+    </java>
+    <jar jarfile="core.jar" basedir="optimized"/>
+  </target>
+
   <target name="build-test" depends="init,build">
     <fail message="Please build 'javase' first">
       <condition>
@@ -116,11 +148,11 @@
       <assertions>
         <enable/>
       </assertions>
-      <jvmarg value="-Xint"/> <!-- works around weird JIT bug in Java 6 -->
+      <jvmarg value="-Djava.awt.headless=true"/>      
       <batchtest>
         <fileset dir="test/src">
           <include name="**/${subdir}/*BlackBox*TestCase.java"/>
-          <exclude name="**/Abstract*.java"/>            
+          <exclude name="**/Abstract*.java"/>
         </fileset>
       </batchtest>
     </junit>
@@ -138,10 +170,10 @@
       <assertions>
         <enable/>
       </assertions>
-      <jvmarg value="-Xint"/> <!-- works around weird JIT bug in Java 6 -->
+      <jvmarg value="-Djava.awt.headless=true"/>
       <batchtest>
         <fileset dir="test/src">
-          <include name="**/*TestCase.java"/>          
+          <include name="**/*TestCase.java"/>
           <exclude name="**/*BlackBox*TestCase.java"/>
           <exclude name="**/Abstract*.java"/>
         </fileset>
@@ -154,6 +186,7 @@
   <target name="clean">
     <delete dir="build"/>
     <delete dir="build-test"/>
+    <delete dir="optimized"/>
     <delete file="core.jar"/>
     <delete file="ZXingReader.*"/>
     <delete file="proguard-dump.txt"/>