X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=zxingorg%2Fbuild.xml;h=0c59a7e6c938f8077389c7c93b5875413db0d72a;hb=9a74c654dcd42f9308893eec241cf7aa2ce15503;hp=493e4e7cf6ccae0ca742fda841d055c25b516f9e;hpb=adcb498790b50fa7fa9a76b7c823d9bdb64ff322;p=zxing.git

diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index 493e4e7c..0c59a7e6 100644
--- a/zxingorg/build.xml
+++ b/zxingorg/build.xml
@@ -17,10 +17,10 @@
 <project name="zxingorg" basedir="." default="build">
 
   <property file="../build.properties"/>
-  <property file="secrets.properties"/>
+  <!--<property file="secrets.properties"/>-->
 
   <target name="init">
-		<tstamp/>
+    <tstamp/>
     <fail message="Please build 'core' first">
       <condition>
         <not>
@@ -35,10 +35,24 @@
         </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>
+          <available file="${tomcat-home}" type="dir"/>
+        </not>
+      </condition>
+    </fail>
   </target>
 
-	<target name="build" depends="init">
-		<mkdir dir="web/WEB-INF/classes"/>
+  <target name="build" depends="init">
+    <mkdir dir="web/WEB-INF/classes"/>
     <copy file="../core/core.jar" todir="web/WEB-INF/lib" overwrite="true"/>
     <copy file="../javase/javase.jar" todir="web/WEB-INF/lib" overwrite="true"/>
     <javac srcdir="src"
@@ -48,19 +62,21 @@
            optimize="true"
            debug="true"
            deprecation="true">
-			<classpath>
-				<fileset dir="web/WEB-INF/lib">
-					<include name="*.jar"/>
-				</fileset>
-				<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">
+      <classpath>
+        <fileset dir="web/WEB-INF/lib">
+          <include name="*.jar"/>
+        </fileset>
+        <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
+      </classpath>
+    </javac>
+    <!--
+    <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>
@@ -68,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"/>
+  <target name="clean">
     <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>