aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Grönroos <magi@iki.fi>2009-10-08 15:46:22 +0000
committerMarko Grönroos <magi@iki.fi>2009-10-08 15:46:22 +0000
commit248a2a7a99376d9e4e00534b5bdf1a5fc96f54dd (patch)
treee6c1c12c0cbc14ae6ed796068b4c7c4f3c5c9b9b
parentbbd27c2c80743da3ff81bf5ca9b5da446d6e9389 (diff)
downloadvaadin-framework-248a2a7a99376d9e4e00534b5bdf1a5fc96f54dd.tar.gz
vaadin-framework-248a2a7a99376d9e4e00534b5bdf1a5fc96f54dd.zip
Fixed a problem in running the widgetset generator.
svn changeset:9152/svn branch:6.2
-rw-r--r--build/build.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml
index cdcbef4f74..e837ef7151 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -779,12 +779,12 @@
<delete dir="${output-dir}/WebContent/VAADIN/widgetsets/.gwt-tmp" includeemptydirs="true"/>
</target>
- <target name="compile-widgetset-generator">
+ <target name="compile-widgetset-generator" depends="init, preprocess-src">
<mkdir dir="build/classes"/>
<javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="build/classes" debug="true" encoding="UTF-8">
<src path="${result-path}/src"/>
- <include name="${toolkit-package}/terminal/gwt/widgetsetutils/WidgetMapGenerator" />
- <exclude name="**"/>
+ <include name="com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java" />
+ <!-- <exclude name="**"/> -->
</javac>
</target>
@@ -963,7 +963,7 @@
<target name="compile-client-side" depends="compile-client-side-sequential, compile-client-side-parallel"/>
<!-- Definitions for building local components, i.e., not for an installation package. -->
- <target name="init-nonpackage" depends="init-platform">
+ <target name="init-nonpackage" depends="init-platform, init">
<property file="build/VERSION.properties" />
<property file="build/GWT-VERSION.properties" />