Update build files

markathomas · Oct 14, 2011 · c6a39e8 · c6a39e8
1 parent e812ea6
commit c6a39e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -8,6 +8,7 @@
     </target>
 
     <target name="samples" description="Builds samples">
+        <ant antfile="build.xml" target="all" dir="samples/locationform"/>
     </target>
 
 </project>
diff --git a/modules/forms/build.xml b/modules/forms/build.xml
@@ -67,9 +67,13 @@
       description="--> cleans project, checks for style violations, builds war file, generates all reports"/>
 
     <target name="dist" depends="clean, mkdirs, vaadin-dist"
-      description="--> cleans project and builds WAR file"/>
+      description="--> cleans project and builds file for distribution"/>
 
-    <target name="vaadin-dist" depends="mkdirs, javac"
+    <target name="samples" description="--> builds samples">
+        <ant antfile="build.xml" target="all" dir="../../samples/locationform" inheritall="false"/>
+    </target>
+
+    <target name="vaadin-dist" depends="mkdirs, samples"
       unless="vaadin-dist.completed" description="--> make Vaadin add-on archive">
         <antcontrib:outofdate>
             <sourcefiles>
@@ -85,28 +89,28 @@
                         <attribute name="Build-User" value="${user.name}"/>
                         <attribute name="Build-Time" value="${TODAY} ${TSTAMP}"/>
                         <attribute name="Vaadin-Package-Version" value="1"/>
-                        <attribute name="Implementation-Title" value="ServerPush"/>
+                        <attribute name="Implementation-Title" value="Forms"/>
                         <attribute name="Implementation-Version" value="${base.version}"/>
                         <attribute name="Vaadin-Addon" value="${base.name}-${base.version}.jar"/>
                     </manifest>
                     <fileset dir="src/main/java" includes="**/*"/>
                 </jar>
 
                 <!-- Build zip file -->
-                <jar destfile="build/dist/${base.name}-${base.version}.zip" basedir="build/dist">
+                <jar destfile="build/dist/${base.name}-${base.version}.zip" basedir="build/dist" excludes="*">
                     <manifest>
                         <attribute name="Build-User" value="${user.name}"/>
                         <attribute name="Build-Time" value="${TODAY} ${TSTAMP}"/>
                         <attribute name="Vaadin-Package-Version" value="1"/>
-                        <attribute name="Implementation-Title" value="ServerPush"/>
+                        <attribute name="Implementation-Title" value="Forms"/>
                         <attribute name="Implementation-Version" value="${base.version}"/>
                         <attribute name="Vaadin-Addon" value="${base.name}-${base.version}.jar"/>
                     </manifest>
                     <fileset dir="build/dist">
                         <exclude name="*.zip"/>
                         <include name="${base.name}-${base.version}.jar"/>
                     </fileset>
-                    <fileset dir="src/main/webapp"/>
+                    <fileset dir="../../samples/locationform/build/dist/" includes="*.war"/>
                     <fileset dir="../../" includes="README"/>
                 </jar>
             </sequential>