Issue 460, auto timeout of CaptureActivity after inactivity, for testing. Also break...

[zxing.git] / zxingorg / build.xml

diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index c8def96..0c59a7e 100644 (file)
--- a/zxingorg/build.xml
+++ b/zxingorg/build.xml
@@ -17,7 +17,7 @@
 <project name="zxingorg" basedir="." default="build">
 
   <property file="../build.properties"/>
-  <property file="secrets.properties"/>
+  <!--<property file="secrets.properties"/>-->
 
   <target name="init">
     <tstamp/>
@@ -35,6 +35,13 @@
         </not>
       </condition>
     </fail>
+    <fail message="Please build project javadoc first">
+      <condition>
+        <not>
+          <available file="../docs/javadoc" type="dir"/>
+        </not>
+      </condition>
+    </fail>
     <fail message="Please set 'tomcat-home' in build.properties">
       <condition>
         <not>
@@ -62,12 +69,14 @@
         <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
       </classpath>
     </javac>
-    <copy file="web/WEB-INF/web.xml.template" tofile="web/WEB-INF/web.xml" overwrite="true">
+    <!--
+    <copy file="web/WEB-INF/web.xml" tofile="web/WEB-INF/web.xml" overwrite="true">
       <filterset>
         <filter token="EMAIL_PASSWORD" value="${emailPassword}"/>
       </filterset>
     </copy>
-    <war warfile="zxingorg.war" webxml="web/WEB-INF/web.xml">
+    -->
+    <war warfile="w.war" webxml="web/WEB-INF/web.xml">
       <lib dir="web/WEB-INF/lib">
         <include name="*.jar"/>
       </lib>
@@ -75,16 +84,21 @@
       <fileset dir="web">
         <include name="*.jspx"/>
         <include name="*.png"/>
+        <include name="*.css"/>        
+        <include name="**/*.jad"/>
+        <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="..">
+        <include name="docs/**"/>
       </fileset>
     </war>
   </target>
 
   <target name="clean">
-    <delete dir="web/WEB-INF/web.xml"/>
     <delete dir="web/WEB-INF/classes"/>
     <delete file="web/WEB-INF/lib/core.jar"/>
     <delete file="web/WEB-INF/lib/javase.jar"/>
-    <delete file="zxingorg.war"/>
+    <delete file="w.war"/>
   </target>
 
 </project>