Merged: Fix for #3393 - Update release build configuration to also build Liferay...

svn changeset:9212/svn branch:6.2

diff --git a/build/build.xml b/build/build.xml
index 15f650659f6c0f3c72fc6b017baab5324b4a59a1..da2896f0a5d0f0c2567001e81c76e8f31bd939f4 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -43,7 +43,7 @@
        <!-- 
        Call one of package-* targets unless you understand what you are doing 
        -->
-       <target name="package-all" depends="clean-all, package-init, init, build, docs, internal-package-mac, internal-package-windows, internal-package-linux, internal-package-war" description="Build public packages for Windows, Linux and Mac platforms.">
+       <target name="package-all" depends="clean-all, package-init, init, build, docs, internal-package-mac, internal-package-windows, internal-package-linux, internal-package-war, internal-package-liferay" description="Build public packages for Windows, Linux and Mac platforms.">
        </target>
 
        <target name="package-mac" depends="clean-result, package-init, init, build, docs, internal-package-mac" description="Create public tar.gz package for Mac.">
@@ -64,6 +64,9 @@
        <target name="package-war" depends="clean-result, package-init, init, build, docs, internal-package-linux, internal-package-war">
        </target>
 
+       <target name="package-liferay-zip" depends="clean-result, package-init, init, build, docs, internal-package-linux, internal-package-liferay">
+       </target>
+
     <target name="package-test" depends="clean-result, nightly-init, package-init, init, build, docs, internal-package-linux, nightly-publish">
     </target>
 
@@ -362,6 +365,32 @@
                </war>
        </target>
 
+       <target name="internal-package-liferay" depends="internal-package-war">
+               <!-- We assume the needed files are put in place by internal-package-war -->
+               <echo>Building Liferay zip</echo>
+
+               <zip zipfile="${result-path}/${product-file}-${version}-liferay.zip">
+                       <zipfileset prefix="VAADIN/widgetsets/com.vaadin.portal.gwt.PortalDefaultWidgetSet" dir="${output-dir}/WebContent/VAADIN/widgetsets/com.vaadin.portal.gwt.PortalDefaultWidgetSet">
+                               <patternset>
+                                       <include name="**/*" />
+                               </patternset>
+                       </zipfileset>
+                       <zipfileset prefix="VAADIN/themes" dir="${output-dir}/WebContent/VAADIN/themes">
+                               <patternset>
+                                       <include name="base/**/*" />
+                                       <include name="liferay/**/*" />
+                                       <include name="runo/**/*" />
+                                       <include name="reindeer/**/*" />
+                                       <include name="default/**/*" />
+                               </patternset>
+                       </zipfileset>
+                       
+               </zip>
+               
+        <echo>##teamcity[publishArtifacts '${result-path}/${product-file}-${version}-liferay.zip']</echo>
+
+       </target>
+
        <target name="create-mac-diskimage">
                <!-- create Mac disk image (dmg) also -->
                <property name="mount.dir" value="${result-path}/mac-mounted-image" />