From: Marko Grönroos <magi@iki.fi>
Date: Thu, 19 Jun 2008 13:21:54 +0000 (+0000)
Subject: Fixed problem with compiling widgetsets with build.xml file. Ant properties can not... 
X-Git-Tag: 6.7.0.beta1~4567
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e850718edb58c29b301a617189c228a772dbff73;p=vaadin-framework.git

Fixed problem with compiling widgetsets with build.xml file. Ant properties can not be overwritten, it seems.

svn changeset:4925/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index 09c41d6068..0f1acc5cfd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -701,19 +701,23 @@
 
 	<!-- Definitions for building local components, i.e., not for an installation package. -->
 	<target name="init-nonpackage" depends="init-platform">
-        <property file="build/build.properties" />
         <property file="build/VERSION.properties" />
 
-		<!-- Definitions for building the client-side. -->
+        <!-- Definitions for building the client-side. -->
         <property name="output-dir" value="."/>
-		
-		<!-- Override the result path defined in build.properties. -->
-		<property name="result-path" value="."/>
+        
+        <!-- The "result-path" simply contains the sources. -->
+        <property name="result-path" value="."/>
 
-		<!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
+        <!-- Path to GWT directory. TODO: This should be read from build.properties file. -->
+        <property name="gwt-dir" value="build/gwt"/>
+
+        <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
         <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
 
         <echo>We are on ${platform} platform, using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
+        <echo>GWT dir:    ${gwt-dir}</echo>
+        <echo>Output dir: ${output-dir}</echo>
 	</target>
 	
 	<!-- Builds all widgetsets locally, i.e., not for an installation package. -->