projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various code tweaks and refactorings suggested by IntelliJ
[zxing.git]
/
javame
/
build.xml
diff --git
a/javame/build.xml
b/javame/build.xml
index
c9ef5c3
..
130eb8b
100644
(file)
--- a/
javame/build.xml
+++ b/
javame/build.xml
@@
-56,7
+56,7
@@
</not>
</condition>
</fail>
</not>
</condition>
</fail>
-
<fail message="Please build 'core' first">
+ <fail message="Please build 'core' first">
<condition>
<not>
<available file="../core/core.jar" type="file"/>
<condition>
<not>
<available file="../core/core.jar" type="file"/>
@@
-78,6
+78,7
@@
fork="true">
<classpath refid="wtk-build-path"/>
</javac>
fork="true">
<classpath refid="wtk-build-path"/>
</javac>
+ <jar jarfile="javame.jar" basedir="build" level="9"/>
</target>
<target name="compile-basic" depends="init">
</target>
<target name="compile-basic" depends="init">
@@
-93,7
+94,7
@@
debug="true"
deprecation="true"
fork="true">
debug="true"
deprecation="true"
fork="true">
-
<classpath refid="wtk-build-path"/>
+ <classpath refid="wtk-build-path"/>
</javac>
<javac srcdir="src"
destdir="build"
</javac>
<javac srcdir="src"
destdir="build"
@@
-107,13
+108,14
@@
<classpath refid="wtk-build-path"/>
<exclude name="com/google/zxing/client/j2me/AdvancedMultimediaManager.java"/>
</javac>
<classpath refid="wtk-build-path"/>
<exclude name="com/google/zxing/client/j2me/AdvancedMultimediaManager.java"/>
</javac>
+ <jar jarfile="javame-basic.jar" basedir="build" level="9"/>
</target>
<target name="package">
<unzip src="../core/core.jar" dest="build"/>
<mkdir dir="build-j2me"/>
</target>
<target name="package">
<unzip src="../core/core.jar" dest="build"/>
<mkdir dir="build-j2me"/>
- <exec executable="${WTK-home}/bin/preverify1.1">
+ <exec executable="${WTK-home}/bin/preverify1.1"
failonerror="true"
>
<arg line="-classpath ${preverify-classpath} -d build-j2me build"/>
</exec>
<arg line="-classpath ${preverify-classpath} -d build-j2me build"/>
</exec>
@@
-123,14
+125,16
@@
</fileset>
</copy>
</fileset>
</copy>
- <copy file="src/com/google/zxing/client/j2me/MANIFEST.MF.template" tofile="src/com/google/zxing/client/j2me/MANIFEST.MF" overwrite="true">
+ <copy file="src/com/google/zxing/client/j2me/MANIFEST.MF.template"
+ tofile="src/com/google/zxing/client/j2me/MANIFEST.MF" overwrite="true">
<filterset>
<filter token="APP_NAME" value="${jar-name}"/>
<filter token="VERSION" value="${version}"/>
</filterset>
</copy>
<filterset>
<filter token="APP_NAME" value="${jar-name}"/>
<filter token="VERSION" value="${version}"/>
</filterset>
</copy>
- <jar jarfile="${jar-name}.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF" level="9"/>
+ <jar jarfile="${jar-name}.jar" basedir="build-j2me" manifest="src/com/google/zxing/client/j2me/MANIFEST.MF"
+ level="9"/>
<move file="${jar-name}.jar" tofile="temp.jar"/>
<java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">
<move file="${jar-name}.jar" tofile="temp.jar"/>
<java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">