Build vaadin-themes with maven

Change-Id: Ie40ea2c74358f6bf35a5a36a98561fd53fffe23f

.gitignore

@@ -91,6 +91,7 @@ client/target/
 client-compiler/target/
 buildhelpers/target/
 client-compiled/target/
+themes/target/
 
 .sass-cache
 phantomjsdriver.log

buildhelpers/pom.xml

@@ -144,7 +144,7 @@
 
 	<profiles>
 		<profile>
-			<id>release-build</id>
+			<id>release</id>
 			<activation>
 				<activeByDefault>false</activeByDefault>
 			</activation>

client-compiled/pom.xml

@@ -169,9 +169,6 @@
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
 					</archive>
-					<excludes>
-						<exclude>VAADIN/widgetsets/WEB-INF</exclude>
-					</excludes>
 				</configuration>
 			</plugin>
 		</plugins>

ivysettings.xml

@@ -50,7 +50,7 @@
         <module organisation="com.vaadin" name="vaadin-client-compiled"
             resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-themes"
-            resolver="build-temp" />
+            resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-push"
             resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-widgets"

liferay/ivy.xml

@@ -20,7 +20,7 @@
         <dependency org="com.vaadin" name="vaadin-client-compiled"
             rev="${vaadin.version}" conf="deps -> default" transitive="false"/>
         <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false"/>
+            rev="${vaadin.version}" conf="deps -> default" transitive="false"/>
         <dependency org="com.vaadin" name="vaadin-push"
             rev="${vaadin.version}" conf="deps -> default" transitive="false" />
         <dependency org="com.vaadin" name="vaadin-server"

pom.xml

@@ -31,6 +31,7 @@
 
 		<vaadin.sass.version>0.9.13</vaadin.sass.version>
 		<vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
+		<vaadin.plugin.version>7.6.4</vaadin.plugin.version>
 
 		<javax.portlet.version>2.0</javax.portlet.version>
 		<javax.servlet.version>3.0.1</javax.servlet.version>
@@ -59,6 +60,7 @@
 		<module>client</module>
 		<module>client-compiler</module>
 		<module>client-compiled</module>
+		<module>themes</module>
 	</modules>
 
 	<build>
@@ -144,4 +146,16 @@
 		</pluginManagement>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>release</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<vaadin.plugin.version>${project.version}</vaadin.plugin.version>
+			</properties>
+		</profile>
+	</profiles>
+
 </project>

server/src/test/resources/com/vaadin/tests/styles.scss

@@ -1,4 +1,4 @@
-@import "../../../../../../WebContent/VAADIN/themes/valo/valo";
+@import "../../../../../../themes/src/main/resources/VAADIN/themes/valo/valo";
 
 .my-label {
     @include transition-property (transform);

themes/build.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-themes" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Themes compiled to CSS
-    </description>
-
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-themes" />
-    <property name="module.symbolic" value="com.vaadin.themes" />
-    <property name="result.dir" value="result" />
-    <property name="theme.result.dir" value="${result.dir}/VAADIN/themes/" />
-
-    <union id="jar.includes">
-        <fileset dir="${result.dir}">
-            <include name="VAADIN/themes/**" />
-            <exclude name="VAADIN/themes/*-tests*/**" />
-            <exclude name="VAADIN/themes/tests-*/**" />
-        </fileset>
-    </union>
-
-    <target name="compile-themes">
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="build" />
-        <ivy:cachepath pathid="classpath.compile.theme"
-            conf="build" />
-
-        <antcall target="compile-theme">
-            <param name="theme" value="base" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="runo" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="reindeer" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="chameleon" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="liferay" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="valo" />
-        </antcall>
-    </target>
-
-    <target name="jar" depends="compile-themes">
-        <antcall target="common.jar">
-            <param name="osgi.extra.package.prefixes" value="VAADIN/themes" />
-            <reference torefid="extra.jar.includes" refid="jar.includes" />
-        </antcall>
-    </target>
-
-    <target name="copy-theme">
-        <fail unless="theme"
-            message="You must give the theme name to copy n the 'theme' parameter" />
-        <property name="theme.source.dir" location="../WebContent/VAADIN/themes/${theme}/" />
-
-        <copy todir="${theme.result.dir}/${theme}">
-            <fileset dir="${theme.source.dir}">
-                <include name="**/*.scss" />
-            </fileset>
-            <filterset refid="filter-vaadin.version" />
-        </copy>
-        <copy todir="${theme.result.dir}/${theme}">
-            <fileset dir="${theme.source.dir}">
-                <exclude name="**/*.scss" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="compile-theme" depends="copy-theme">
-        <fail unless="theme"
-            message="You must give the theme name to compile in the 'theme' parameter" />
-
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.compile.theme"
-            conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.runtime.theme"
-            conf="build" />
-
-        <echo>Compiling ${theme}</echo>
-        <mkdir dir="${theme.result.dir}" />
-
-        <!-- compile the theme -->
-        <java classname="com.vaadin.buildhelpers.CompileTheme"
-            classpathref="classpath.compile.theme" failonerror="yes"
-            fork="yes" maxmemory="512m">
-            <arg value="--theme" />
-            <arg value="${theme}" />
-            <arg value="--theme-folder" />
-            <arg value="${theme.result.dir}" />
-            <arg value="--version" />
-            <arg value="${vaadin.version}" />
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-        </java>
-
-        <!-- Compress theme to serve using gzip -->
-        <gzip src="${theme.result.dir}/${theme}/styles.css"
-            destfile="${theme.result.dir}/${theme}/styles.css.gz" />
-    </target>
-
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.publish-local">
-
-        </antcall>
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <echo>No java files in module</echo>
-    </target>
-    <target name="test" depends="checkstyle">
-        <!--<antcall target="common.test.run" /> -->
-        <echo>WHAT? No tests for ${module.name}!</echo>
-    </target>
-
-</project>

themes/pom.xml

@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-themes</artifactId>
+	<name>vaadin-themes</name>
+	<packaging>jar</packaging>
+
+	<organization>
+		<name>Vaadin Ltd</name>
+	</organization>
+	<url>https://vaadin.com/</url>
+	<description>Vaadin themes</description>
+
+	<dependencies>
+		<!-- Maven plugin scans for vaadin-server... -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-buildhelpers</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-sass-compiler</artifactId>
+			<version>${vaadin.sass.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- remove cssparser override once sass-compiler is updated -->
+		<dependency>
+			<groupId>net.sourceforge.cssparser</groupId>
+			<artifactId>cssparser</artifactId>
+			<version>0.9.11</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.carrotsearch</groupId>
+			<artifactId>smartsprites</artifactId>
+			<version>0.2.10</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<excludes>
+					<exclude>**/base.scss</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>**/base.scss</include>
+				</includes>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>com.vaadin</groupId>
+				<artifactId>vaadin-maven-plugin</artifactId>
+				<version>${vaadin.plugin.version}</version>
+				<configuration>
+					<compressTheme>true</compressTheme>
+					<warSourceDirectory>${project.build.outputDirectory}</warSourceDirectory>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>compile-theme</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.4.0</version>
+				<executions>
+					<execution>
+						<id>smart-sprite-reindeer</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>org.carrot2.labs.smartsprites.SmartSprites</argument>
+
+								<argument>--sprite-png-depth</argument>
+								<argument>AUTO</argument>
+
+								<argument>--css-file-encoding</argument>
+								<argument>UTF-8</argument>
+
+								<argument>--root-dir-path</argument>
+								<argument>${project.build.outputDirectory}/VAADIN/themes/reindeer</argument>
+
+								<argument>--log-level</argument>
+								<argument>WARN</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>generate-export-package</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-Dvaadin.version=${project.version}</argument>
+								<argument>-DincludeNumberPackages=0</argument>
+
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
+
+								<argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
+								<argument>VAADIN/themes</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>repackage-reindeer</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<property name="reindeer.theme.path"
+									value="${project.build.outputDirectory}/VAADIN/themes/reindeer/" />
+
+								<move file="${reindeer.theme.path}/styles-sprite.css"
+									tofile="${reindeer.theme.path}/styles.css" />
+
+								<gzip src="${reindeer.theme.path}/styles.css" destfile="${reindeer.theme.path}/styles.css.gz" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<!-- Export package is handled in exec plugin -->
+						<Export-Package></Export-Package>
+						<Import-Package></Import-Package>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

WebContent/VAADIN/themes/base/base.scss → themes/src/main/resources/VAADIN/themes/base/base.scss

@@ -54,7 +54,7 @@ $v-line-height: $line-height !default;
 @import "browserframe/browserframe.scss";
 
 .v-vaadin-version:after {
-	content: "@version@";
+	content: "${project.version}";
 }
 
 /* References the BODY tag generated by Vaadin application servlet */