From 524273e50d426ffedd674102befdaf1b063d6bf5 Mon Sep 17 00:00:00 2001
From: Sauli Tähkäpää <sauli@vaadin.com>
Date: Tue, 6 May 2014 14:28:29 +0300
Subject: Use GWT as maven dependency (#13616)

Change-Id: I283820c7dcca7ecd341949bb15275406fe378902
---
 build/ide.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'build')

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" />
-- 
cgit v1.2.3