summaryrefslogtreecommitdiffstats
path: root/build/package
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-03-30 08:20:13 +0000
committerArtur Signell <artur.signell@itmill.com>2010-03-30 08:20:13 +0000
commit3cd989afd26e4824d893e60b9afe3b7bdb3d937f (patch)
treeed87fff6f9c0b73d31f054337ed1220cb052a2a7 /build/package
parent42b3c3c750fc7929f088415c3e20868042f9b234 (diff)
downloadvaadin-framework-3cd989afd26e4824d893e60b9afe3b7bdb3d937f.tar.gz
vaadin-framework-3cd989afd26e4824d893e60b9afe3b7bdb3d937f.zip
Toolkit -> Vaadin
svn changeset:12226/svn branch:6.3
Diffstat (limited to 'build/package')
-rw-r--r--build/package/build-widgetset.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 7fd7bd073d..506a263fc8 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -34,7 +34,7 @@ See configure target to adjust this buildfile.
<property name="gwt-location" value="${base}gwt" />
<!-- where Vaadin jar is located -->
- <property name="toolkit-jar-location" value="${base}WebContent/WEB-INF/lib/vaadin-@version@.jar" />
+ <property name="vaadin-jar-location" value="${base}WebContent/WEB-INF/lib/vaadin-@version@.jar" />
<!-- where project client-side widgetset source files are located -->
<property name="src-location" value="${base}WebContent/WEB-INF/src" />
@@ -86,14 +86,14 @@ See configure target to adjust this buildfile.
<echo>Requirements for classpath:</echo>
<echo> ${gwt-location}/gwt-dev.jar</echo>
<echo> ${gwt-location}/gwt-user.jar</echo>
- <echo> ${toolkit-jar-location}</echo>
+ <echo> ${vaadin-jar-location}</echo>
<echo> ${src-location}</echo>
<echo>Output will be written into ${client-side-destination}</echo>
<!-- Check that files exist -->
<fail message="Some of the required files (listed above) are missing.">
<condition><not><resourcecount count="3">
- <filelist files="${gwt-location}/gwt-dev.jar,${gwt-location}/gwt-user.jar,${toolkit-jar-location}"/>
+ <filelist files="${gwt-location}/gwt-dev.jar,${gwt-location}/gwt-user.jar,${vaadin-jar-location}"/>
</resourcecount></not></condition>
</fail>
@@ -103,7 +103,7 @@ See configure target to adjust this buildfile.
<!-- The source location must be first, as required by generate-widgetset. -->
<pathelement path="${src-location}" />
<pathelement path="${server-side-destination}" />
- <pathelement path="${toolkit-jar-location}" />
+ <pathelement path="${vaadin-jar-location}" />
<pathelement path="${gwt-location}/gwt-user.jar" />
<pathelement path="${gwt-location}/gwt-dev.jar" />
<fileset dir="${base}WebContent/WEB-INF/lib/">