]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed refactoring problem and added missing dependency
authorArtur Signell <artur@vaadin.com>
Wed, 5 Sep 2012 18:16:26 +0000 (21:16 +0300)
committerArtur Signell <artur@vaadin.com>
Sun, 9 Sep 2012 08:23:36 +0000 (11:23 +0300)
build/ide.xml

index d4b0497d53f0e255df82fcb26ba6490f81b2c374..784be9c05ce3814d3bf18becae0b5e52d19917e1 100755 (executable)
@@ -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">