diff options
| author | Henri Sara <hesara@vaadin.com> | 2016-02-26 15:10:26 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2016-02-29 13:16:49 +0200 |
| commit | 16eae732958e7a5841e3f46a5968fa85833da05b (patch) | |
| tree | e90349ac0dd1264597cd8abbcfefd3d65e2bf3a4 /build | |
| parent | 0dee5602cacb46e1120bc2339464c89bea34ddaa (diff) | |
| download | vaadin-framework-16eae732958e7a5841e3f46a5968fa85833da05b.tar.gz vaadin-framework-16eae732958e7a5841e3f46a5968fa85833da05b.zip | |
Use Maven to build vaadin-push
Change-Id: I244182abfe3b72c59786b520eafb663b5c1e5918
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ide.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/build/ide.xml b/build/ide.xml index 68ed24a6a7..89b26a7e7b 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -180,9 +180,19 @@ </java> </target> <target name="vaadinPush.js" depends="resolve"> - <ant antfile="${basedir}/push/build.xml" target="vaadinPush.js" dir="${basedir}/push" /> + <property name="project.root" location="."/> + <ivy:resolve log="download-only" file="${project.root}/ivy-taskdefs.xml" conf="taskdefs" /> + <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> + <!-- ant contrib for Maven integration --> + <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> + + <!-- Must fork to avoid ExitException --> + <artifact:mvn pom="${project.root}/push/pom.xml" fork="true" mavenVersion="3.0.4"> + <arg value="package"/> + </artifact:mvn> + <property name="js.output.dir" location="WebContent" /> - <property name="push.js.dir" location="${basedir}/push/result/js" /> + <property name="push.js.dir" location="${basedir}/push/target/classes/" /> <copy todir="${js.output.dir}"> <fileset dir="${push.js.dir}" includes="VAADIN/vaadinPush*" excludes="**/*.gz"> </fileset> |