X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fbuild.xml;h=797df7981f15711a46855c17b29d5e035735b26e;hb=85520988ce383472fdf99da36ca3935570a2af80;hp=217ff67bbc04d3485c68d0f600f113931ad4a253;hpb=adcb498790b50fa7fa9a76b7c823d9bdb64ff322;p=zxing.git

diff --git a/android/build.xml b/android/build.xml
index 217ff67b..797df798 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -1,131 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <!--
- Copyright 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!-- This is a mildly hacked version of the auto-generated project
-     build.xml file. -->
-<project name="BarcodeReaderM5" default="package">
+Copyright (C) 2008 ZXing authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project name="BarcodeScanner" default="debug">
+  <!-- SDK Locations -->
   <property file="../build.properties"/>
   <property name="sdk-folder" value="${android-home}"/>
   <property name="android-tools" value="${sdk-folder}/tools"/>
-  <property name="android-framework" value="${android-tools}/lib/framework.aidl"/>
+
+  <!-- Application Package Name -->
+  <property name="application-package" value="com.google.zxing.client.android" />
 
   <!-- The intermediates directory -->
   <!-- Eclipse uses "bin" for its own output, so we do the same. -->
-  <property name="outdir" value="bin"/>
+  <property name="outdir" value="bin" />
 
+  <!-- ************************************************************************************* -->
   <!-- No user servicable parts below. -->
 
+  <property name="android-framework" value="${android-tools}/lib/framework.aidl" />
+
   <!-- Input directories -->
-  <property name="resource-dir" value="res"/>
-  <property name="asset-dir" value="assets"/>
-  <property name="srcdir" value="src"/>
+  <property name="resource-dir" value="res" />
+  <property name="asset-dir" value="assets" />
+  <property name="srcdir" value="src" />
+  <condition property="srcdir-ospath"
+             value="${basedir}\${srcdir}"
+             else="${basedir}/${srcdir}" >
+    <os family="windows"/>
+  </condition>
+
+  <property name="external-libs" value="../core" />
+  <condition property="external-libs-ospath"
+             value="${basedir}\${external-libs}"
+             else="${basedir}/${external-libs}" >
+    <os family="windows"/>
+  </condition>
 
   <!-- Output directories -->
-  <property name="outdir-classes" value="${outdir}/classes"/>
+  <property name="outdir-classes" value="${outdir}/classes" />
+  <condition property="outdir-classes-ospath"
+             value="${basedir}\${outdir-classes}"
+             else="${basedir}/${outdir-classes}" >
+    <os family="windows"/>
+  </condition>
 
   <!-- Create R.java in the source directory -->
-  <property name="outdir-r" value="src"/>
+  <property name="outdir-r" value="src" />
 
   <!-- Intermediate files -->
-  <property name="dex-file" value="classes.dex"/>
-  <property name="intermediate-dex" location="${outdir}/${dex-file}"/>
+  <property name="dex-file" value="classes.dex" />
+  <property name="intermediate-dex" value="${outdir}/${dex-file}" />
+  <condition property="intermediate-dex-ospath"
+             value="${basedir}\${intermediate-dex}"
+             else="${basedir}/${intermediate-dex}" >
+    <os family="windows"/>
+  </condition>
 
   <!-- The final package file to generate -->
-  <property name="out-package" value="${outdir}/BarcodeReader.apk"/>
+  <property name="resources-package" value="${outdir}/${ant.project.name}.ap_" />
+  <condition property="resources-package-ospath"
+             value="${basedir}\${resources-package}"
+             else="${basedir}/${resources-package}" >
+    <os family="windows"/>
+  </condition>
+
+  <property name="out-debug-package" value="${outdir}/${ant.project.name}-debug.apk" />
+  <condition property="out-debug-package-ospath"
+             value="${basedir}\${out-debug-package}"
+             else="${basedir}/${out-debug-package}" >
+    <os family="windows"/>
+  </condition>
+
+  <property name="out-unsigned-package" value="${outdir}/${ant.project.name}-unsigned.apk" />
+  <condition property="out-unsigned-package-ospath"
+             value="${basedir}\${out-unsigned-package}"
+             else="${basedir}/${out-unsigned-package}" >
+    <os family="windows"/>
+  </condition>
 
   <!-- Tools -->
-  <property name="aapt" value="${android-tools}/aapt"/>
-  <property name="adb" value="${android-tools}/adb"/>
-  <property name="aidl" value="${android-tools}/aidl"/>
-  <!-- dx is a special case as it is a .bat file on Windows -->
-  <condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx">
+  <condition property="aapt" value="${android-tools}/aapt.exe" else="${android-tools}/aapt" >
+    <os family="windows"/>
+  </condition>
+  <condition property="aidl" value="${android-tools}/aidl.exe" else="${android-tools}/aidl" >
     <os family="windows"/>
   </condition>
-  <property name="adb" value="${android-tools}/adb" />
+  <condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb" >
+    <os family="windows"/>
+  </condition>
+  <condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx" >
+    <os family="windows"/>
+  </condition>
+  <condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
+    <os family="windows"/>
+  </condition>
+
   <property name="android-jar" value="${sdk-folder}/android.jar" />
-  <property name="zip" value="zip"/>
 
   <!-- Rules -->
 
-  <target name="init">
-    <tstamp/>
-    <fail message="Please set 'android-home' in build.properties">
-      <condition>
-        <not>
-          <available file="${android-home}" type="dir"/>
-        </not>
-      </condition>
-    </fail>
-    <fail message="Please build 'core' first">
-      <condition>
-        <not>
-          <available file="../core/core.jar" type="file"/>
-        </not>
-      </condition>
-    </fail>
-    <fail message="Please put proguard.jar in 'bin' under the WTK install directory">
-      <condition>
-        <and>
-          <not>
-            <isset property="debug"/>
-          </not>
-          <not>
-            <available file="${WTK-home}/bin/proguard.jar" type="file"/>
-          </not>
-        </and>
-      </condition>
-    </fail>
-  </target>
-
   <!-- Create the output directories if they don't exist yet. -->
   <target name="dirs">
-    <mkdir dir="${outdir}"/>
-    <mkdir dir="${outdir-classes}"/>
+    <echo>Creating output directories if needed...</echo>
+    <mkdir dir="${outdir}" />
+    <mkdir dir="${outdir-classes}" />
   </target>
 
   <!-- Generate the R.java file for this project's resources. -->
   <target name="resource-src" depends="dirs">
-
-    <copy file="strings.xml.template" tofile="res/values/strings.xml" overwrite="true">
-      <filterset>
-        <filter token="VERSION" value="${version}"/>
-      </filterset>
-    </copy>
-
-    <echo>Generating R.java...</echo>
+    <echo>Generating R.java / Manifest.java from the resources...</echo>
     <exec executable="${aapt}" failonerror="true">
-      <arg value="compile"/>
-      <arg value="-m"/>
-      <arg value="-J"/>
-      <arg value="${outdir-r}"/>
-      <arg value="-M"/>
-      <arg value="AndroidManifest.xml"/>
-      <arg value="-S"/>
-      <arg value="${resource-dir}"/>
-      <arg value="-I"/>
-      <arg value="${android-jar}"/>
+      <arg value="package" />
+      <arg value="-m" />
+      <arg value="-J" />
+      <arg value="${outdir-r}" />
+      <arg value="-M" />
+      <arg value="AndroidManifest.xml" />
+      <arg value="-S" />
+      <arg value="${resource-dir}" />
+      <arg value="-I" />
+      <arg value="${android-jar}" />
     </exec>
   </target>
 
   <!-- Generate java classes from .aidl files. -->
   <target name="aidl" depends="dirs">
+    <echo>Compiling aidl files into Java classes...</echo>
     <apply executable="${aidl}" failonerror="true">
-      <arg value="-p${android-framework}"/>
-      <arg value="-I${srcdir}"/>
+      <arg value="-p${android-framework}" />
+      <arg value="-I${srcdir}" />
       <fileset dir="${srcdir}">
         <include name="**/*.aidl"/>
       </fileset>
@@ -133,79 +149,44 @@
   </target>
 
   <!-- Compile this project's .java files into .class files. -->
-  <target name="compile" depends="init, clean, dirs, resource-src, aidl">
-    <javac encoding="ascii" target="1.5" debug="true" optimize="true" extdirs=""
+  <target name="compile" depends="dirs, resource-src, aidl">
+    <javac encoding="ascii" target="1.5" debug="true" extdirs=""
            srcdir="."
            destdir="${outdir-classes}"
            bootclasspath="${android-jar}">
       <classpath>
-        <pathelement location="../core/core.jar"/>
+        <fileset dir="${external-libs}" includes="*.jar"/>
       </classpath>
     </javac>
-    <unzip src="../core/core.jar" dest="${outdir-classes}"/>
-  </target>
-
-  <target name="optimize" depends="compile" unless="debug">
-    <jar basedir="${outdir-classes}" destfile="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 optimized.jar"/>
-      <arg value="-libraryjars ${android-jar}"/>
-      <arg value="-dontpreverify"/>
-      <arg value="-dontobfuscate"/>
-      <!-- Temporary workaround to keep important stuff in the client, while inlining core. -->
-      <arg value="-keep class com.google.zxing.client.android.BarcodeReaderCaptureActivity { *; }"/>
-      <arg value="-keep class com.google.zxing.client.android.CameraManager { *; }"/>
-      <arg value="-keep class com.google.zxing.client.android.CameraThread { *; }"/>
-      <arg value="-optimizationpasses 7"/>
-      <arg value="-overloadaggressively"/>
-      <arg value="-verbose"/>
-      <!-- Needed to allow getters which refer to private members to be inlined. -->
-      <arg value="-allowaccessmodification"/>
-    </java>
-    <delete file="temp.jar"/>
-    <delete dir="${outdir-classes}"/>
-    <mkdir dir="${outdir-classes}"/>
-    <unzip src="optimized.jar" dest="${outdir-classes}"/>
-    <delete file="optimized.jar"/>
   </target>
 
   <!-- Convert this project's .class files into .dex files. -->
-  <target name="dex" depends="compile, optimize">
-
-    <condition property="locals" value="full" else="none">
-      <isset property="debug"/>
-    </condition>
-    <condition property="positions" value="lines" else="none">
-      <isset property="debug"/>
-    </condition>
-
-    <exec executable="${dx}" failonerror="true">
-      <arg value="--dex"/>
-      <arg value="--output=${intermediate-dex}"/>
-      <arg value="--locals=${locals}"/>
-      <arg value="--positions=${positions}"/>
-      <arg path="${basedir}/${outdir-classes}"/>
-    </exec>
+  <target name="dex" depends="compile">
+    <echo>Converting compiled files and external libraries into ${outdir}/${dex-file}...</echo>
+    <apply executable="${dx}" failonerror="true" parallel="true">
+      <arg value="--dex" />
+      <arg value="--output=${intermediate-dex-ospath}" />
+      <arg path="${outdir-classes-ospath}" />
+      <fileset dir="${external-libs}" includes="*.jar"/>
+    </apply>
   </target>
 
   <!-- Put the project's resources into the output package file. -->
   <target name="package-res-and-assets">
     <echo>Packaging resources and assets...</echo>
     <exec executable="${aapt}" failonerror="true">
-      <arg value="package"/>
-      <arg value="-f"/>
-      <arg value="-c"/>
-      <arg value="-M"/>
-      <arg value="AndroidManifest.xml"/>
-      <arg value="-S"/>
-      <arg value="${resource-dir}"/>
-      <arg value="-A"/>
-      <arg value="${asset-dir}"/>
-      <arg value="-I"/>
-      <arg value="${android-jar}"/>
-      <arg value="${out-package}"/>
+      <arg value="package" />
+      <arg value="-f" />
+      <arg value="-M" />
+      <arg value="AndroidManifest.xml" />
+      <arg value="-S" />
+      <arg value="${resource-dir}" />
+      <arg value="-A" />
+      <arg value="${asset-dir}" />
+      <arg value="-I" />
+      <arg value="${android-jar}" />
+      <arg value="-F" />
+      <arg value="${resources-package}" />
     </exec>
   </target>
 
@@ -213,17 +194,17 @@
   <target name="package-res-no-assets">
     <echo>Packaging resources...</echo>
     <exec executable="${aapt}" failonerror="true">
-      <arg value="package"/>
-      <arg value="-f"/>
-      <arg value="-c"/>
-      <arg value="-M"/>
-      <arg value="AndroidManifest.xml"/>
-      <arg value="-S"/>
-      <arg value="${resource-dir}"/>
+      <arg value="package" />
+      <arg value="-f" />
+      <arg value="-M" />
+      <arg value="AndroidManifest.xml" />
+      <arg value="-S" />
+      <arg value="${resource-dir}" />
       <!-- No assets directory -->
-      <arg value="-I"/>
-      <arg value="${android-jar}"/>
-      <arg value="${out-package}"/>
+      <arg value="-I" />
+      <arg value="${android-jar}" />
+      <arg value="-F" />
+      <arg value="${resources-package}" />
     </exec>
   </target>
 
@@ -233,42 +214,71 @@ an assets directory is present. -->
 only when the assets dir exists. -->
   <target name="package-res">
     <available file="${asset-dir}" type="dir"
-               property="res-target" value="and-assets"/>
-    <property name="res-target" value="no-assets"/>
-    <antcall target="package-res-${res-target}"/>
+               property="res-target" value="and-assets" />
+    <property name="res-target" value="no-assets" />
+    <antcall target="package-res-${res-target}" />
   </target>
 
-  <!-- Put the project's .class files into the output package file. -->
-  <target name="package-java" depends="compile, package-res">
-    <echo>Packaging java...</echo>
-    <jar destfile="${out-package}"
-         basedir="${outdir-classes}"
-         update="true"/>
+  <!-- Package the application and sign it with a debug key.
+      This is the default target when building. It is used for debug. -->
+  <target name="debug" depends="dex, package-res">
+    <echo>Packaging ${out-debug-package}, and signing it with a debug key...</echo>
+    <exec executable="${apk-builder}" failonerror="true">
+      <arg value="${out-debug-package-ospath}" />
+      <arg value="-z" />
+      <arg value="${resources-package-ospath}" />
+      <arg value="-f" />
+      <arg value="${intermediate-dex-ospath}" />
+      <arg value="-rf" />
+      <arg value="${srcdir-ospath}" />
+      <arg value="-rj" />
+      <arg value="${external-libs-ospath}" />
+    </exec>
   </target>
 
-  <!-- Put the project's .dex files into the output package file.
-       Use the "zip" command, available on most un*x/Linux/MacOS systems,
-       to create the new package (Ant 1.7 has an internal 'zip' command,
-       however Ant 1.6.5 lacks it and is still widely installed.)
-  -->
-  <target name="package-dex" depends="dex, package-res">
-    <echo>Packaging dex...</echo>
-    <exec executable="${zip}" failonerror="true">
-      <arg value="-qj"/>
-      <arg value="${out-package}"/>
-      <arg value="${intermediate-dex}"/>
+  <!-- Package the application without signing it.
+        This allows for the application to be signed later with an official publishing key. -->
+  <target name="release" depends="dex, package-res">
+    <echo>Packaging ${out-unsigned-package} for release...</echo>
+    <exec executable="${apk-builder}" failonerror="true">
+      <arg value="${out-unsigned-package-ospath}" />
+      <arg value="-u" />
+      <arg value="-z" />
+      <arg value="${resources-package-ospath}" />
+      <arg value="-f" />
+      <arg value="${intermediate-dex-ospath}" />
+      <arg value="-rf" />
+      <arg value="${srcdir-ospath}" />
+      <arg value="-rj" />
+      <arg value="${external-libs-ospath}" />
     </exec>
+    <echo>It will need to be signed with jarsigner before being published.</echo>
   </target>
 
-  <!-- Create the package file for this project from the sources. -->
-  <target name="package" depends="package-dex"/>
+  <!-- Install the package on the default emulator -->
+  <target name="install" depends="debug">
+    <echo>Installing ${out-debug-package} onto default emulator...</echo>
+    <exec executable="${adb}" failonerror="true">
+      <arg value="install" />
+      <arg value="${out-debug-package}" />
+    </exec>
+  </target>
 
-  <!-- Install package on the default emulator -->
-  <target name="install">
-    <echo>Sending package to default emulator...</echo>
+  <target name="reinstall" depends="debug">
+    <echo>Installing ${out-debug-package} onto default emulator...</echo>
     <exec executable="${adb}" failonerror="true">
       <arg value="install" />
-      <arg value="${out-package}" />
+      <arg value="-r" />
+      <arg value="${out-debug-package}" />
+    </exec>
+  </target>
+
+  <!-- Uinstall the package from the default emulator -->
+  <target name="uninstall">
+    <echo>Uninstalling ${application-package} from the default emulator...</echo>
+    <exec executable="${adb}" failonerror="true">
+      <arg value="uninstall" />
+      <arg value="${application-package}" />
     </exec>
   </target>