Revision: 10262
Author:   rchan...@google.com
Date:     Wed Jun  1 11:14:07 2011
Log:      Allow source samples to forgo having a war folder
Removed war folders from expenses and mobilewebapp samples
Removed redundant task in samples's source target

Review at http://gwt-code-reviews.appspot.com/1451807

Review by: rj...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=10262

Deleted:
 /trunk/samples/expenses/war
 /trunk/samples/mobilewebapp/war
Modified:
 /trunk/samples/common.ant.xml

=======================================
--- /trunk/samples/common.ant.xml       Fri May  6 08:20:47 2011
+++ /trunk/samples/common.ant.xml       Wed Jun  1 11:14:07 2011
@@ -38,10 +38,15 @@
     <copy todir="${sample.build}/src">
       <fileset dir="src" />
     </copy>
-    <mkdir dir="${sample.build}/war" />
-    <copy todir="${sample.build}/war">
-      <fileset dir="war" excludes="WEB-INF/classes/**"/>
-    </copy>
+    <if>
+      <available file="war" type="dir" />
+      <then>
+        <mkdir dir="${sample.build}/war" />
+        <copy todir="${sample.build}/war">
+          <fileset dir="war" excludes="WEB-INF/classes/**"/>
+        </copy>
+      </then>
+    </if>
     <if>
       <available file="pom.xml"/>
       <then>
@@ -61,12 +66,6 @@
       </then>
     </if>
     <if>
-      <available file="user-build.xml"/>
-      <then>
-        <copy tofile="${sample.build}/build.xml" file="user-build.xml"/>
-      </then>
-    </if>
-    <if>
       <available file="user-build.xml"/>
       <then>
         <copy tofile="${sample.build}/build.xml" file="user-build.xml"/>

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to