Disable email-based decoding -- won't be able to support it soon and it is very rarel...

[zxing.git] / zxingorg / build.xml

diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index c8def96..c23a1bc 100644 (file)
--- a/zxingorg/build.xml
+++ b/zxingorg/build.xml
@@ -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,25 +69,32 @@
         <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">
       <lib dir="web/WEB-INF/lib">
         <include name="*.jar"/>
       </lib>
       <classes dir="web/WEB-INF/classes"/>
+      <webinf dir="web/WEB-INF">
+        <include name="appengine-web.xml"/>
+      </webinf>
       <fileset dir="web">
         <include name="*.jspx"/>
         <include name="*.png"/>
       </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"/>