Improve handling of MultimediaManager to make it a bit easier to make a 'basic' build

[zxing.git] / build.xml

diff --git a/build.xml b/build.xml
index 6d98501..8b5d120 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -21,12 +21,11 @@
   <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="bug" target="build"/>
     <ant dir="android" target="package"/>
-    <ant dir="javame" target="build-basic"/>
     <ant dir="rim" target="build"/>
     <ant dir="zxingorg" target="build"/>
   </target>
@@ -37,11 +36,12 @@
   </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="bug" 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"/>
@@ -66,12 +66,10 @@
         <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="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"/>
@@ -82,6 +80,7 @@
   <target name="javadoc">
     <mkdir dir="docs/javadoc"/>
     <javadoc destdir="docs/javadoc"
+             useexternalfile="true"
              footer="&lt;script type=&quot;text/javascript&quot;&gt; var gaJsHost = ((&quot;https:&quot; == document.location.protocol) ?  &quot;https://ssl.&quot; : &quot;http://www.&quot;); document.write(unescape(&quot;%3Cscript src='&quot; + gaJsHost + &quot;google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E&quot;)); &lt;/script&gt; &lt;script type=&quot;text/javascript&quot;&gt; var pageTracker = _gat._getTracker(&quot;UA-788492-5&quot;); pageTracker._initData(); pageTracker._trackPageview(); &lt;/script&gt;">
       <sourcepath>
         <pathelement location="android/src"/>
@@ -99,6 +98,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="${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>