projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added an optimization to the Android client's LuminanceSource implementation, and...
[zxing.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
6d98501
..
091f843
100644
(file)
--- a/
build.xml
+++ b/
build.xml
@@
-21,12
+21,13
@@
<property file="build.properties"/>
<target name="build">
<property file="build.properties"/>
<target name="build">
- <ant dir="bug" target="build"/>
<ant dir="core" target="build"/>
<ant dir="javame" target="build"/>
<ant dir="javase" target="build"/>
<ant dir="core" target="build"/>
<ant dir="javame" target="build"/>
<ant dir="javase" target="build"/>
- <ant dir="android" target="package"/>
- <ant dir="javame" target="build-basic"/>
+ <ant dir="bug" target="build"/>
+ <ant dir="android" target="debug-optimized"/>
+ <ant dir="androidtest" target="debug-optimized"/>
+ <ant dir="android-integration" target="build"/>
<ant dir="rim" target="build"/>
<ant dir="zxingorg" target="build"/>
</target>
<ant dir="rim" target="build"/>
<ant dir="zxingorg" target="build"/>
</target>
@@
-37,11
+38,12
@@
</target>
<target name="clean">
</target>
<target name="clean">
- <ant dir="bug" target="clean"/>
<ant dir="core" target="clean"/>
<ant dir="javame" target="clean"/>
<ant dir="javase" target="clean"/>
<ant dir="core" target="clean"/>
<ant dir="javame" target="clean"/>
<ant dir="javase" target="clean"/>
+ <ant dir="bug" target="clean"/>
<ant dir="android" target="clean"/>
<ant dir="android" target="clean"/>
+ <ant dir="androidtest" target="clean"/>
<ant dir="rim" target="clean"/>
<ant dir="zxingorg" target="clean"/>
<delete dir="docs/javadoc"/>
<ant dir="rim" target="clean"/>
<ant dir="zxingorg" target="clean"/>
<delete dir="docs/javadoc"/>
@@
-66,12
+68,10
@@
<exclude name="bug/lib/com.buglabs*"/> <!-- Cannot distributed GPLed libraries -->
<include name="core/**"/>
<include name="cpp/**"/>
<exclude name="bug/lib/com.buglabs*"/> <!-- Cannot distributed GPLed libraries -->
<include name="core/**"/>
<include name="cpp/**"/>
+ <include name="iphone/**"/>
<include name="javame/**"/>
<include name="javase/**"/>
<include name="javame/**"/>
<include name="javase/**"/>
- <include name="rim/build.xml"/>
- <include name="rim/src/**"/>
- <include name="rim/res/**"/>
- <include name="rim/BarcodeReader.jad.template"/>
+ <include name="rim/**"/>
<include name="docs/**"/>
<include name="zxingorg/**"/>
<exclude name="zxingorg/secrets.properties"/>
<include name="docs/**"/>
<include name="zxingorg/**"/>
<exclude name="zxingorg/secrets.properties"/>
@@
-82,6
+82,7
@@
<target name="javadoc">
<mkdir dir="docs/javadoc"/>
<javadoc destdir="docs/javadoc"
<target name="javadoc">
<mkdir dir="docs/javadoc"/>
<javadoc destdir="docs/javadoc"
+ useexternalfile="true"
footer="<script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-788492-5"); pageTracker._initData(); pageTracker._trackPageview(); </script>">
<sourcepath>
<pathelement location="android/src"/>
footer="<script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-788492-5"); pageTracker._initData(); pageTracker._trackPageview(); </script>">
<sourcepath>
<pathelement location="android/src"/>
@@
-99,6
+100,13
@@
<pathelement location="${WTK-home}/lib/jsr234.jar"/>
<pathelement location="${android-home}/android.jar"/>
<pathelement location="${BB-JDK-home}/lib/net_rim_api.jar"/>
<pathelement location="${WTK-home}/lib/jsr234.jar"/>
<pathelement location="${android-home}/android.jar"/>
<pathelement location="${BB-JDK-home}/lib/net_rim_api.jar"/>
+ <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
+ <fileset dir="zxingorg/web/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="bug/lib">
+ <include name="*.jar"/>
+ </fileset>
</classpath>
</javadoc>
</target>
</classpath>
</javadoc>
</target>