Create dirs when unpacking GWT

diff --git a/gwt-files.xml b/gwt-files.xml
index 953a92b87179a1033075f9fecea4d47df067af2a..05ec885d56f1de487b5236181b251cced5a0370d 100755 (executable)
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -1,119 +1,125 @@
 <?xml version="1.0"?>
 
 <project name="GWT files for Vaadin" basedir=".">
-       <include file="common.xml" as="common" />
-
-       <property name="gwt.lib.dir" location="${vaadin.basedir}/../gwt-libs" />
-
-       <property name="gwt.user.jar" location="${gwt.lib.dir}/gwt-user.jar" />
-       <property name="gwt.dev.jar" location="${gwt.lib.dir}/gwt-dev.jar" />
-       <property name="gwt.elemental.jar" location="${gwt.lib.dir}/gwt-elemental.jar" />
-       <property name="gwt.codeserver.jar" location="${gwt.lib.dir}/gwt-codeserver.jar" />
-
-       <available file="${gwt.dev.jar}" property="gwt.dev.jar.found" />
-       <available file="${gwt.user.jar}" property="gwt.user.jar.found" />
-       <available file="${gwt.elemental.jar}" property="gwt.elemental.jar.found" />
-       <available file="${gwt.codeserver.jar}" property="gwt.codeserver.jar.found" />
-
-       <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar" />
-       <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar" />
-       <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar" />
-       <fail unless="gwt.codeserver.jar.found" message="Could not find gwt-codeserver.jar" />
-
-       <property name="gwt.unpack.dir" location="${vaadin.basedir}/build/gwt" />
-
-       <property name="gwt.user.jar.files" location="${gwt.unpack.dir}/gwt-user.jar" />
-       <property name="gwt.dev.jar.files" location="${gwt.unpack.dir}/gwt-dev.jar" />
-       <property name="gwt.elemental.jar.files" location="${gwt.unpack.dir}/gwt-elemental.jar" />
-       <property name="gwt.codeserver.jar.files" location="${gwt.unpack.dir}/gwt-codeserver.jar" />
-
-       <target name="unpack.gwt">
-               <unzip dest="${gwt.user.jar.files}" src="${gwt.user.jar}" />
-               <unzip dest="${gwt.dev.jar.files}" src="${gwt.dev.jar}" />
-               <unzip dest="${gwt.elemental.jar.files}" src="${gwt.elemental.jar}" />
-               <unzip dest="${gwt.codeserver.jar.files}" src="${gwt.codeserver.jar}" />
-       </target>
-
-       <union id="client-compiler.gwt.includes">
-               <!-- GWT development JAR contents including many external dependencies (for now) -->
-               <fileset dir="${gwt.dev.jar.files}">
-                       <exclude name="META-INF/**" />
-                       <exclude name="/license*" />
-                       <exclude name="/LICENSE*" />
-
-                       <!-- Used by client and server apparently... -->
-                       <exclude name="com/google/gwt/thirdparty/guava/**" />
-
-                       <!-- Overridden in Vaadin -->
-                       <exclude name="com/google/gwt/dev/About.properties" />
-
-                       <!-- external dependencies declared in ixy.xml/pom.xml-->
-                       <exclude name="javax/servlet/**" />
-                       <exclude name="javax/xml/**" />
-               </fileset>
-
-               <!-- GWT SuperDevMode -->
-               <fileset dir="${gwt.codeserver.jar.files}">
-                       <exclude name="META-INF/**" />
-                       <include name="**/*.java" />
-                       <include name="**/*.classes" />
-               </fileset>
-       </union>
-
-       <union id="client-compiled.gwt.includes">
-               <!-- Precompiled GWT modules (.gwtar file) -->
-               <fileset dir="${gwt.user.jar.files}">
-                       <exclude name="META-INF/**" />
-
-                       <!-- precompiled GWT modules (.gwtar) -->
-                       <include name="**/*.gwtar" />
-                       <!-- external dependencies -->
-                       <exclude name="javax/servlet/**" />
-                       <exclude name="org/w3c/css/sac/**" />
-
-               </fileset>
-       </union>
-
-       <union id="client.gwt.includes">
-               <fileset dir="${gwt.user.jar.files}">
-                       <exclude name="META-INF/**" />
-                       <!-- precompiled GWT modules (.gwtar) goes into client-compiled -->
-                       <exclude name="**/*.gwtar" />
-                       <!-- These go into server -->
-                       <exclude name="com/google/gwt/*/server/**" />
-                       <!-- These go into shared -->
-                       <exclude name="com/google/gwt/*/shared/**" />
-                       <exclude name="com/google/gwt/*/*/shared/**" />
-                       <exclude name="com/google/web/bindery/*/shared/**" />
-
-
-                       <!-- external dependencies -->
-                       <exclude name="javax/servlet/**" />
-                       <exclude name="org/w3c/css/sac/**" />
-               </fileset>
-       </union>
-
-       <union id="shared.gwt.includes">
-               <fileset dir="${gwt.user.jar.files}">
-                       <!-- Shared files from user-->
-                       <include name="com/google/gwt/*/shared/**" />
-                       <include name="com/google/gwt/*/*/shared/**" />
-                       <include name="com/google/web/bindery/*/shared/**" />
-               </fileset>
-               <fileset dir="${gwt.dev.jar.files}">
-                       <!-- Used by client and server apparently... -->
-                       <include name="com/google/gwt/thirdparty/guava/**" />
-               </fileset>
-               <!-- GWT Elemental -->
-               <fileset dir="${gwt.elemental.jar.files}">
-                       <exclude name="META-INF/**" />
-               </fileset>
-       </union>
-
-       <union id="server.gwt.includes">
-               <fileset dir="${gwt.user.jar.files}">
-                       <!-- Server files from gwt-user-->
-                       <include name="com/google/gwt/*/server/**" />
-               </fileset>
-       </union>
+    <include file="common.xml" as="common" />
+
+    <property name="gwt.lib.dir" location="${vaadin.basedir}/../gwt-libs" />
+
+    <property name="gwt.user.jar" location="${gwt.lib.dir}/gwt-user.jar" />
+    <property name="gwt.dev.jar" location="${gwt.lib.dir}/gwt-dev.jar" />
+    <property name="gwt.elemental.jar" location="${gwt.lib.dir}/gwt-elemental.jar" />
+    <property name="gwt.codeserver.jar" location="${gwt.lib.dir}/gwt-codeserver.jar" />
+
+    <available file="${gwt.dev.jar}" property="gwt.dev.jar.found" />
+    <available file="${gwt.user.jar}" property="gwt.user.jar.found" />
+    <available file="${gwt.elemental.jar}" property="gwt.elemental.jar.found" />
+    <available file="${gwt.codeserver.jar}" property="gwt.codeserver.jar.found" />
+
+    <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar" />
+    <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar" />
+    <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar" />
+    <fail unless="gwt.codeserver.jar.found" message="Could not find gwt-codeserver.jar" />
+
+    <property name="gwt.unpack.dir" location="${vaadin.basedir}/build/gwt" />
+
+    <property name="gwt.user.jar.files" location="${gwt.unpack.dir}/gwt-user.jar" />
+    <property name="gwt.dev.jar.files" location="${gwt.unpack.dir}/gwt-dev.jar" />
+    <property name="gwt.elemental.jar.files" location="${gwt.unpack.dir}/gwt-elemental.jar" />
+    <property name="gwt.codeserver.jar.files" location="${gwt.unpack.dir}/gwt-codeserver.jar" />
+
+    <target name="unpack.gwt">
+        <mkdir dir="${gwt.user.jar.files}" />
+        <mkdir dir="${gwt.dev.jar.files}" />
+        <mkdir dir="${gwt.elemental.jar.files}" />
+        <mkdir dir="${gwt.codeserver.jar.files}" />
+
+        <unzip dest="${gwt.user.jar.files}" src="${gwt.user.jar}" />
+        <unzip dest="${gwt.dev.jar.files}" src="${gwt.dev.jar}" />
+        <unzip dest="${gwt.elemental.jar.files}" src="${gwt.elemental.jar}" />
+        <unzip dest="${gwt.codeserver.jar.files}" src="${gwt.codeserver.jar}" />
+    </target>
+
+    <union id="client-compiler.gwt.includes">
+        <!-- GWT development JAR contents including many external dependencies 
+            (for now) -->
+        <fileset dir="${gwt.dev.jar.files}">
+            <exclude name="META-INF/**" />
+            <exclude name="/license*" />
+            <exclude name="/LICENSE*" />
+
+            <!-- Used by client and server apparently... -->
+            <exclude name="com/google/gwt/thirdparty/guava/**" />
+
+            <!-- Overridden in Vaadin -->
+            <exclude name="com/google/gwt/dev/About.properties" />
+
+            <!-- external dependencies declared in ixy.xml/pom.xml -->
+            <exclude name="javax/servlet/**" />
+            <exclude name="javax/xml/**" />
+        </fileset>
+
+        <!-- GWT SuperDevMode -->
+        <fileset dir="${gwt.codeserver.jar.files}">
+            <exclude name="META-INF/**" />
+            <include name="**/*.java" />
+            <include name="**/*.classes" />
+        </fileset>
+    </union>
+
+    <union id="client-compiled.gwt.includes">
+        <!-- Precompiled GWT modules (.gwtar file) -->
+        <fileset dir="${gwt.user.jar.files}">
+            <exclude name="META-INF/**" />
+
+            <!-- precompiled GWT modules (.gwtar) -->
+            <include name="**/*.gwtar" />
+            <!-- external dependencies -->
+            <exclude name="javax/servlet/**" />
+            <exclude name="org/w3c/css/sac/**" />
+
+        </fileset>
+    </union>
+
+    <union id="client.gwt.includes">
+        <fileset dir="${gwt.user.jar.files}">
+            <exclude name="META-INF/**" />
+            <!-- precompiled GWT modules (.gwtar) goes into client-compiled -->
+            <exclude name="**/*.gwtar" />
+            <!-- These go into server -->
+            <exclude name="com/google/gwt/*/server/**" />
+            <!-- These go into shared -->
+            <exclude name="com/google/gwt/*/shared/**" />
+            <exclude name="com/google/gwt/*/*/shared/**" />
+            <exclude name="com/google/web/bindery/*/shared/**" />
+
+
+            <!-- external dependencies -->
+            <exclude name="javax/servlet/**" />
+            <exclude name="org/w3c/css/sac/**" />
+        </fileset>
+    </union>
+
+    <union id="shared.gwt.includes">
+        <fileset dir="${gwt.user.jar.files}">
+            <!-- Shared files from user -->
+            <include name="com/google/gwt/*/shared/**" />
+            <include name="com/google/gwt/*/*/shared/**" />
+            <include name="com/google/web/bindery/*/shared/**" />
+        </fileset>
+        <fileset dir="${gwt.dev.jar.files}">
+            <!-- Used by client and server apparently... -->
+            <include name="com/google/gwt/thirdparty/guava/**" />
+        </fileset>
+        <!-- GWT Elemental -->
+        <fileset dir="${gwt.elemental.jar.files}">
+            <exclude name="META-INF/**" />
+        </fileset>
+    </union>
+
+    <union id="server.gwt.includes">
+        <fileset dir="${gwt.user.jar.files}">
+            <!-- Server files from gwt-user -->
+            <include name="com/google/gwt/*/server/**" />
+        </fileset>
+    </union>
 </project>