diff options
author | Artur Signell <artur@vaadin.com> | 2013-05-30 17:06:30 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-05-30 15:08:00 +0000 |
commit | 9a3dc4e99c7a417778342db83cd6e7c05558e5fb (patch) | |
tree | 4a77e0b93e48c9f2fec4839ffae76c3334ec337b /themes | |
parent | d850db60f9f7e144307bcf525d96665d1be64fc8 (diff) | |
download | vaadin-framework-9a3dc4e99c7a417778342db83cd6e7c05558e5fb.tar.gz vaadin-framework-9a3dc4e99c7a417778342db83cd6e7c05558e5fb.zip |
Formatted XML files using defined rules (#11956)
Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995
Diffstat (limited to 'themes')
-rw-r--r-- | themes/build.xml | 214 | ||||
-rw-r--r-- | themes/ivy.xml | 4 |
2 files changed, 113 insertions, 105 deletions
diff --git a/themes/build.xml b/themes/build.xml index 75b3e5a903..5bca50e5f5 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -1,107 +1,115 @@ <?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/**" /> - </fileset> - </union> - - <target name="compile-themes"> - <ivy:resolve 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> - </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" /> - - <copy todir="${theme.result.dir}"> - <fileset dir="${theme.source.dir}"> - <include name="${theme}/**" /> - </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 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="--theme-version" /> - <arg value="${vaadin.version}" /> - <jvmarg value="-Xss8M" /> - <jvmarg value="-XX:MaxPermSize=256M" /> - <jvmarg value="-Djava.awt.headless=true" /> - </java> - - </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 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/**" /> + </fileset> + </union> + + <target name="compile-themes"> + <ivy:resolve 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> + </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" /> + + <copy todir="${theme.result.dir}"> + <fileset dir="${theme.source.dir}"> + <include name="${theme}/**" /> + </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 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="--theme-version" /> + <arg value="${vaadin.version}" /> + <jvmarg value="-Xss8M" /> + <jvmarg value="-XX:MaxPermSize=256M" /> + <jvmarg value="-Djava.awt.headless=true" /> + </java> + + </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> diff --git a/themes/ivy.xml b/themes/ivy.xml index e0e22429ab..beb1b16a00 100644 --- a/themes/ivy.xml +++ b/themes/ivy.xml @@ -14,8 +14,8 @@ </configurations> <publications> <artifact type="jar" ext="jar" /> -<!-- <artifact type="source" ext="jar" m:classifier="sources" /> --> -<!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> --> + <!-- <artifact type="source" ext="jar" m:classifier="sources" /> --> + <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> --> <artifact type="pom" ext="pom" /> </publications> <dependencies> |