summaryrefslogtreecommitdiffstats
path: root/client-compiled
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-10 20:15:35 +0300
committerArtur Signell <artur@vaadin.com>2013-06-10 20:21:56 +0300
commit37bc9e41db0278f42263452e12a8b3fc87b664ba (patch)
treeec48ab05ece102bd43e727da253030dac26475b3 /client-compiled
parentd9becf9523fdd71abb1b93072a76df163b9dd2c0 (diff)
downloadvaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.tar.gz
vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.zip
Reformatted using Ant editor (#12040)
Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474
Diffstat (limited to 'client-compiled')
-rw-r--r--client-compiled/build.xml28
1 files changed, 9 insertions, 19 deletions
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 01bf2fa15e..fa5ff262db 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
-<project name="vaadin-client-compiled" basedir="." default="publish-local"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-client-compiled" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
Compiled (JS+HTML) version of client side
</description>
@@ -17,10 +16,8 @@
<property name="gwtar.dir" location="${result.dir}/gwtar" />
<property name="work.dir" location="${result.dir}/work" />
<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
- <property name="compiled.jar"
- location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
- <property name="compiled-cache.jar"
- location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" />
+ <property name="compiled.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+ <property name="compiled-cache.jar" location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" />
<union id="jar.includes">
<fileset dir="${result.dir}">
@@ -42,17 +39,13 @@
<target name="compile-module-cache">
- <fail unless="module"
- message="You must give the module to compile in the 'module' parameter" />
+ <fail unless="module" message="You must give the module to compile in the 'module' parameter" />
<ivy:resolve resolveid="common" conf="compile-module" />
- <ivy:cachepath pathid="classpath.compile.widgetset"
- conf="compile-module" />
+ <ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
<echo>Creating gwtar files for ${module} in ${gwtar.dir}</echo>
<!-- Produce gwtar files for the separate JAR -->
- <java classname="com.google.gwt.dev.CompileModule"
- classpathref="classpath.compile.widgetset" failonerror="yes"
- fork="yes" maxmemory="512m">
+ <java classname="com.google.gwt.dev.CompileModule" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
<arg value="-out" />
<arg value="${gwtar.dir}" />
<arg value="-strict" />
@@ -65,23 +58,20 @@
</target>
<target name="compile-module">
- <fail unless="module"
- message="You must give the module to compile in the 'module' parameter" />
+ <fail unless="module" message="You must give the module to compile in the 'module' parameter" />
<property name="style" value="OBF" />
<property name="localWorkers" value="2" />
<property name="extraParams" value="" />
<ivy:resolve resolveid="common" conf="compile-module" />
- <ivy:cachepath pathid="classpath.compile.widgetset"
- conf="compile-module" />
+ <ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
<mkdir dir="${module.output.dir}" />
<echo>Compiling ${module} to ${module.output.dir}</echo>
<!-- compile the module -->
- <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset"
- failonerror="yes" fork="yes" maxmemory="512m">
+ <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
<classpath location="${compiled-cache.jar}" />
<arg value="-workDir" />
<arg value="${work.dir}" />