]> source.dussan.org Git - vaadin-framework.git/commitdiff
Added liferay module for building liferay.zip #12748
authorJohn Ahlroos <john@vaadin.com>
Fri, 11 Oct 2013 12:41:49 +0000 (15:41 +0300)
committerVaadin Code Review <review@vaadin.com>
Wed, 16 Oct 2013 08:55:03 +0000 (08:55 +0000)
Change-Id: I16c7ba25387b3e1ad9a56e800c49755306b44890

ivysettings.xml
liferay/build.xml [new file with mode: 0644]
liferay/ivy.xml [new file with mode: 0644]

index e18b2233d17dc9a2f863c2a2d8fc9cb74a5b441e..7112bbf217e8d3cc4b0781f732850b73b67d80fd 100644 (file)
@@ -45,6 +45,8 @@
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-push"
             resolver="build-temp" />
+        <module organisation="com.vaadin" name="vaadin-liferay"
+            resolver="build-temp" />
     </modules>
 
 
diff --git a/liferay/build.xml b/liferay/build.xml
new file mode 100644 (file)
index 0000000..a13cb37
--- /dev/null
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+
+<project name="liferay" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>
+        Builds the Liferay ZIP archive
+    </description>
+
+    <include file="../common.xml" as="common" />
+    <include file="../build.xml" as="vaadin" />
+
+    <property name="module.name" value="vaadin-liferay" />
+    <property name="result.dir" value="result" />
+    <property name="lib.dir" value="${result.dir}/lib" />
+    <property name="work.dir" value="${result.dir}/work" />
+    <property name="liferay.zip" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
+
+    <target name="publish-local" depends="build-zip" if="build.release">
+        <antcall target="common.publish-local">
+            <param name="conf" value="deps" />
+        </antcall>
+    </target>
+
+    <target name="fetch-jars">
+        <echo>Retriving prebuilt jars</echo>
+        <!-- Retrieve pre-build jars -->
+        <ivy:resolve />
+        <mkdir dir="${lib.dir}" />
+        <ivy:retrieve pattern="${lib.dir}/[artifact].[type]" conf="deps" />
+    </target>
+
+    <target name="unpack" depends="fetch-jars">
+        <echo>Unpacking jars into working directory</echo>
+        <mkdir dir="${work.dir}" />
+        <unjar src="${lib.dir}/vaadin-client-compiled.jar" dest="${work.dir}">
+            <patternset>
+                <include name="VAADIN/widgetsets/**/*" />
+            </patternset>
+        </unjar>
+        <unjar src="${lib.dir}/vaadin-themes.jar" dest="${work.dir}">
+            <patternset>
+                <include name="VAADIN/themes/base/**/*" />
+                <include name="VAADIN/themes/chameleon/**/*" />
+                <include name="VAADIN/themes/liferay/**/*" />
+                <include name="VAADIN/themes/runo/**/*" />
+                <include name="VAADIN/themes/reindeer/**/*" />
+            </patternset>
+        </unjar>
+        <unjar src="${lib.dir}/vaadin-push.jar" dest="${work.dir}">
+            <patternset>
+                <include name="VAADIN/vaadinPush.js" />
+                <include name="VAADIN/vaadinPush.debug.js" />
+            </patternset>
+        </unjar>
+        <unjar src="${lib.dir}/vaadin-server.jar" dest="${work.dir}">
+            <patternset>
+                <include name="VAADIN/vaadinBootstrap.js" />
+            </patternset>
+        </unjar>
+    </target>
+
+    <target name="build-zip" depends="unpack">
+        <echo>Building Liferay zip</echo>
+        <zip zipfile="${liferay.zip}">
+            <zipfileset dir="${work.dir}" />
+        </zip>
+    </target>
+
+    <target name="clean">
+        <antcall target="common.clean" />
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/liferay/ivy.xml b/liferay/ivy.xml
new file mode 100644 (file)
index 0000000..fb6d152
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
+
+    <info organisation="com.vaadin" module="vaadin-liferay" revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+        <conf name="build-provided" />
+        <conf name="deps" visibility="private" />
+    </configurations>
+
+    <publications>
+        <artifact type="zip" ext="zip" />
+    </publications>
+
+    <dependencies>
+        <dependency org="com.vaadin" name="vaadin-client-compiled"
+            rev="${vaadin.version}" conf="deps -> build" transitive="false"/>
+        <dependency org="com.vaadin" name="vaadin-themes"
+            rev="${vaadin.version}" conf="deps -> build" transitive="false"/>
+        <dependency org="com.vaadin" name="vaadin-push"
+            rev="${vaadin.version}" conf="deps -> build" transitive="false" />
+        <dependency org="com.vaadin" name="vaadin-server"
+            rev="${vaadin.version}" conf="deps -> build" transitive="false" />
+    </dependencies>
+
+</ivy-module>