Now can use "-Ddebug=true" on the command line to build a non-optimized build with debug symbols. Also added check for ProGuard.

git-svn-id: https://zxing.googlecode.com/svn/trunk@222 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-02-22 18:13:00 +00:00
parent 556225ab0a
commit e8553801b1

View file

@ -72,6 +72,18 @@
</not> </not>
</condition> </condition>
</fail> </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> </target>
<!-- Create the output directories if they don't exist yet. --> <!-- Create the output directories if they don't exist yet. -->
@ -108,7 +120,7 @@
<!-- Compile this project's .java files into .class files. --> <!-- Compile this project's .java files into .class files. -->
<target name="compile" depends="init, dirs, resource-src, aidl"> <target name="compile" depends="init, dirs, resource-src, aidl">
<javac encoding="ascii" target="1.5" debug="false" optimize="true" extdirs="" <javac encoding="ascii" target="1.5" debug="true" optimize="true" extdirs=""
srcdir="." srcdir="."
destdir="${outdir-classes}" destdir="${outdir-classes}"
bootclasspath="${android-jar}"> bootclasspath="${android-jar}">
@ -119,7 +131,7 @@
<unzip src="../core/core.jar" dest="${outdir-classes}"/> <unzip src="../core/core.jar" dest="${outdir-classes}"/>
</target> </target>
<target name="optimize" depends="compile"> <target name="optimize" depends="compile" unless="debug">
<jar basedir="${outdir-classes}" destfile="temp.jar"/> <jar basedir="${outdir-classes}" destfile="temp.jar"/>
<java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true"> <java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">
<arg value="-injars temp.jar"/> <arg value="-injars temp.jar"/>
@ -140,12 +152,30 @@
<!-- Convert this project's .class files into .dex files. --> <!-- Convert this project's .class files into .dex files. -->
<target name="dex" depends="compile, optimize"> <target name="dex" depends="compile, optimize">
<condition property="locals" value="full">
<isset property="debug"/>
</condition>
<condition property="locals" value="none">
<not>
<isset property="debug"/>
</not>
</condition>
<condition property="positions" value="lines">
<isset property="debug"/>
</condition>
<condition property="positions" value="none">
<not>
<isset property="debug"/>
</not>
</condition>
<exec executable="${dx}" failonerror="true"> <exec executable="${dx}" failonerror="true">
<arg value="-JXmx384M"/> <arg value="-JXmx384M"/>
<arg value="--dex"/> <arg value="--dex"/>
<arg value="--output=${intermediate-dex}"/> <arg value="--output=${intermediate-dex}"/>
<arg value="--locals=none"/> <arg value="--locals=${locals}"/>
<arg value="--positions=none"/> <arg value="--positions=${positions}"/>
<arg path="${outdir-classes}"/> <arg path="${outdir-classes}"/>
</exec> </exec>
</target> </target>