diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-05-06 14:28:29 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-06-13 04:44:07 +0000 |
| commit | 524273e50d426ffedd674102befdaf1b063d6bf5 (patch) | |
| tree | 4d542a46b23c69f4afe4106c49b6b4b5c3ae07c6 /build | |
| parent | 0c00164f368b4a09f766518f7d16618cb5ee25ab (diff) | |
| download | vaadin-framework-524273e50d426ffedd674102befdaf1b063d6bf5.tar.gz vaadin-framework-524273e50d426ffedd674102befdaf1b063d6bf5.zip | |
Use GWT as maven dependency (#13616)
Change-Id: I283820c7dcca7ecd341949bb15275406fe378902
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ide.xml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/build/ide.xml b/build/ide.xml index 678fc49d5b..525e16d88d 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -1,17 +1,8 @@ <?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"> - <include file="${basedir}/gwt-files.xml" /> - - <property name="gwt.dev.classes" location="${gwt.eclipse.basedir}/dev/bin" /> - <property name="gwt.user.classes" location="${gwt.eclipse.basedir}/user/bin" /> - <property name="gwt.dev.src" location="${gwt.basedir}/dev/core/src" /> - <property name="gwt.dev.super.src" location="${gwt.basedir}/dev/core/super" /> - <property name="gwt.user.src" location="${gwt.basedir}/user/src" /> - <property name="gwt.user.super.src" location="${gwt.basedir}/user/super" /> - <property name="work.dir" location="work" /> - <echo>Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes}</echo> + <property file="build.properties" /> <ivy:resolve log="download-only" file="client-compiler/ivy.xml" conf="ide" /> <ivy:cachepath pathid="client-compiler.deps" conf="ide" /> @@ -25,22 +16,19 @@ <ivy:cachepath pathid="uitest.deps" conf="ide" /> <ivy:resolve log="download-only" file="buildhelpers/ivy.xml" /> <ivy:cachepath pathid="buildhelpers.deps" /> + <ivy:resolve log="download-only" file="gwt/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="gwt.deps" conf="ide" /> <path id="classpath"> <path location="bin" /> <path location="build/classes" /> - <path location="${gwt.user.classes}" /> - <path location="${gwt.user.src}" /> - <path location="${gwt.user.super.src}" /> - <path location="${gwt.dev.classes}" /> - <path location="${gwt.dev.super.src}" /> - <path location="${gwt.dev.src}" /> <path refid="client-compiler.deps" /> <path refid="server.deps" /> <path refid="shared.deps" /> <path refid="uitest.deps" /> <path refid="client.deps" /> <path refid="buildhelpers.deps" /> + <path refid="gwt.deps" /> <path location="server/src" /> <path location="shared/src" /> <path location="uitest/src" /> |