diff options
Diffstat (limited to 'build/ide.xml')
-rwxr-xr-x | build/ide.xml | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/build/ide.xml b/build/ide.xml index 37cd3dd802..ab5749edaf 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" /> @@ -73,8 +70,7 @@ </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" /> @@ -94,8 +90,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> @@ -116,8 +111,7 @@ 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" /> @@ -144,12 +138,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}" /> |