diff options
| author | Henri Sara <hesara@vaadin.com> | 2016-04-02 15:03:11 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2016-04-03 11:25:08 +0300 |
| commit | fd4a506cb2c70665ce91e55e203405826887b4f2 (patch) | |
| tree | 2b9301fb452148b8ad4f58b05750a877aed11eec /build/ide.xml | |
| parent | c2afd4339ae1c8158171da93744abc2c27e2cbf4 (diff) | |
| download | vaadin-framework-fd4a506cb2c70665ce91e55e203405826887b4f2.tar.gz vaadin-framework-fd4a506cb2c70665ce91e55e203405826887b4f2.zip | |
Use Maven artifacts in IDE ivy.xml
Depend on the artifacts built with Maven to get transitive
dependencies.
To handle local changes, the local paths are first on the classpath.
However, a single run of "mvn install" is needed before the Ivy
project and ide.xml are usable.
Change-Id: I6c413a02af0304cea0d489f67f15dfd47c767a79
Diffstat (limited to 'build/ide.xml')
| -rwxr-xr-x | build/ide.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/ide.xml b/build/ide.xml index a675a49e58..a91a29db05 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -9,15 +9,16 @@ <target name="resolve" unless="resolve.done"> <ivy:resolve log="download-only" file="build/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="early.deps" conf="early" /> + <ivy:resolve log="download-only" file="build/ivy.xml" conf="ide" /> <ivy:cachepath pathid="ide.deps" conf="ide" /> <ivy:resolve log="download-only" file="uitest/ivy.xml" conf="ide" /> <ivy:cachepath pathid="uitest.deps" conf="ide" /> <path id="classpath"> + <path refid="early.deps" /> <path location="bin" /> <path location="build/classes" /> - <path refid="ide.deps" /> - <path refid="uitest.deps" /> <path location="server/src/main/java" /> <path location="server/src/main/resources" /> <path location="shared/src/main/java" /> @@ -25,6 +26,8 @@ <path location="uitest/src" /> <path location="client/src/main/java" /> <path location="client/src/main/resources" /> + <path refid="uitest.deps" /> + <path refid="ide.deps" /> </path> <property name="resolve.done" value="true" /> </target> @@ -98,8 +101,9 @@ <jvmarg value="-Djava.awt.headless=true" /> <arg value="--theme" /> <arg value="${theme}" /> + <!-- this assumes "mvn package" has been run for vaadin-themes --> <arg value="--theme-folder" /> - <arg value="themes/src/main/resources/VAADIN/themes" /> + <arg value="themes/target/classes/VAADIN/themes" /> <arg value="--version" /> <arg value="${vaadin.version}" /> </java> |