summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-05 21:16:26 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:36 +0300
commit660ed3d047254d354aeb848bf9ed24d1803f6bd6 (patch)
treeef0b67abee2ededc06924d026740bf403534466d
parentc14a2cea8dcbeb02442d1888101d4b22cd2d6e6e (diff)
downloadvaadin-framework-660ed3d047254d354aeb848bf9ed24d1803f6bd6.tar.gz
vaadin-framework-660ed3d047254d354aeb848bf9ed24d1803f6bd6.zip
Fixed refactoring problem and added missing dependency
-rwxr-xr-xbuild/ide.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/build/ide.xml b/build/ide.xml
index d4b0497d53..784be9c05c 100755
--- a/build/ide.xml
+++ b/build/ide.xml
@@ -1,6 +1,7 @@
<?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">
+ <!-- FIXME, should use 7.0-SNAPSHOT of client compiler -->
<property name="classes" location="build/classes" />
<property name="gwt.root" location="${basedir}/../trunk" />
<property name="gwt.lib.dir" location="${gwt.root}/build/lib" />
@@ -8,10 +9,14 @@
<property name="gwt.dev.jar" location="${gwt.lib.dir}/gwt-dev.jar" />
<echo>Using gwt-dev.jar from ${gwt.dev.jar}</echo>
+ <ivy:cachepath pathid="ivy.deps" inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA" conf="default,sources" />
+ <ivy:cachepath pathid="ivy.deps2" inline="true" organisation="commons-cli" module="commons-cli" revision="1.2" conf="default" />
+
<path id="classpath">
<pathelement location="${gwt.user.jar}" />
<pathelement location="${gwt.dev.jar}" />
<path refid="ivy.deps" />
+ <path refid="ivy.deps2" />
<path location="${classes}" />
<path location="server/src" />
<path location="shared/src" />
@@ -61,7 +66,6 @@
<echo>Compiling ${module} to ${module.output.dir}</echo>
<!--<ivy:resolve inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA"/>-->
- <ivy:cachepath pathid="ivy.deps" inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA" conf="default,sources" />
<!-- compile the module -->
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m">