diff options
Diffstat (limited to 'build/ide.xml')
| -rwxr-xr-x | build/ide.xml | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/build/ide.xml b/build/ide.xml index 5380536e2e..45130e9d01 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -1,9 +1,6 @@ <?xml version="1.0"?> -<project xmlns:antcontrib="antlib:net.sf.antcontrib" - xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" - name="Build script for IDE users" basedir=".." - default="theme-and-default-widgetset"> +<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset"> <include file="${basedir}/gwt-files.xml" /> <property name="gwt.dev.classes" location="${gwt.eclipse.basedir}/dev/bin" /> @@ -14,9 +11,7 @@ <property name="gwt.user.super.src" location="${gwt.basedir}/user/super" /> <property name="work.dir" location="work" /> - <property name="theme-version" location="9.9.9.INTERNAL-DEBUG-BUILD" /> - <echo>Using gwt files from ${gwt.user.classes} and - ${gwt.dev.classes}</echo> + <echo>Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes}</echo> <ivy:resolve file="client-compiler/ivy.xml" conf="ide" /> <ivy:cachepath pathid="client-compiler.deps" conf="ide" /> @@ -74,14 +69,11 @@ </target> <target name="compile-theme"> - <java classname="com.vaadin.buildhelpers.CompileTheme" - failonerror="yes" fork="yes"> + <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes"> <classpath refid="classpath" /> <jvmarg value="-Djava.awt.headless=true" /> <arg value="--theme" /> <arg value="${theme}" /> - <arg value="--theme-version" /> - <arg value="${theme-version}" /> <arg value="--theme-folder" /> <arg value="WebContent/VAADIN/themes" /> </java> @@ -97,8 +89,7 @@ <target name="testing-widgetset"> <antcall target="compile-widgetset"> - <param name="widgetset" - value="com.vaadin.tests.widgetset.TestingWidgetSet" /> + <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" /> </antcall> </target> @@ -111,16 +102,13 @@ <mkdir dir="${module.output.dir}" /> - <echo>Compiling ${module} to ${module.output.dir} with - parameters -logLevel TRACE -style ${style} -localWorkers - ${localWorkers} -strict ${extraParams}</echo> + <echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel TRACE -style ${style} -localWorkers ${localWorkers} -strict ${extraParams}</echo> <!--<ivy:resolve inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA"/> --> <!-- compile the module --> - <java classname="com.google.gwt.dev.Compiler" classpathref="classpath" - failonerror="yes" fork="yes" maxmemory="512m"> + <java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m"> <arg value="-workDir" /> <arg value="${work.dir}" /> <arg value="-logLevel" /> @@ -147,12 +135,9 @@ <target name="vaadinPush.js"> <property name="vaadinPush.js.output" location="WebContent/VAADIN/vaadinPush.js" /> - <loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js" - property="jquery.js.contents" /> - <loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js" - property="jquery.atmosphere.js.contents" /> - <loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl" - property="vaadinPush.js.contents"> + <loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js" property="jquery.js.contents" /> + <loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> + <loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> <filterchain> <replacetokens begintoken="@" endtoken="@"> <token key="jquery.js" value="${jquery.js.contents}" /> |