From c5978786864cbf39d691558f000f55b8a39e58ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marko=20Gr=C3=B6nroos?= <magi@iki.fi>
Date: Fri, 9 Oct 2009 10:17:37 +0000
Subject: [PATCH] Fixed classpaths for widgetset and widgetset generator builds
 to work properly also outside development environment. Eclipse writes
 compiled classes to build/classes, but the build script must not depend on
 that.

svn changeset:9153/svn branch:6.2
---
 build/build.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index e837ef7151..6eefeeb693 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -780,11 +780,17 @@
 	</target>
 
 	<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">
+		<mkdir dir="${result-path}/classes"/>
+		<javac source="1.5" target="1.5" destdir="${result-path}/classes" debug="true" encoding="UTF-8">
             <src path="${result-path}/src"/>
 			<include name="com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java" />
             <!-- <exclude name="**"/> -->
+			<classpath>
+				<pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+				<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
+				<pathelement location="${result-path}/classes" />
+				<pathelement location="${result-path}/src" />
+			</classpath>
 		</javac>
 	</target>
 	
@@ -802,7 +808,7 @@
 			<classpath>
 				<pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
 				<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
-				<pathelement location="build/classes" />
+				<pathelement location="${result-path}/classes" />
 				<pathelement location="${result-path}/src" />
 			</classpath>
 		</java>
@@ -825,7 +831,7 @@
 				<pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
 				<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
 				<pathelement location="${result-path}/src" />
-				<pathelement location="build/classes" />
+				<pathelement location="${result-path}/classes" />
 			</classpath>
 		</java>
 		<antcall target="remove-widgetset-gwt-tmp"/>
@@ -856,7 +862,7 @@
 				<pathelement location="${googlemaps-jar}" />
 				<!-- demo widgetset sources -->
 				<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
-				<pathelement location="build/classes" />
+				<pathelement location="${result-path}/classes" />
 			</classpath>
 		</java>
 		<antcall target="remove-widgetset-gwt-tmp"/>
@@ -880,7 +886,7 @@
 				<pathelement location="${result-path}/src" />
 				<!-- demo widgetset sources -->
 				<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
-				<pathelement location="build/classes" />
+				<pathelement location="${result-path}/classes" />
 			</classpath>
 		</java>
 		<antcall target="remove-widgetset-gwt-tmp"/>
@@ -903,7 +909,7 @@
 				<pathelement location="${result-path}/src" />
 				<!-- demo widgetset sources -->
 				<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
-				<pathelement location="build/classes" />
+				<pathelement location="${result-path}/classes" />
 			</classpath>
 		</java>
 		<antcall target="remove-widgetset-gwt-tmp"/>
@@ -926,7 +932,7 @@
 				<pathelement location="${result-path}/src" />
 				<!-- demo widgetset sources -->
 				<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
-				<pathelement location="build/classes" />
+				<pathelement location="${result-path}/classes" />
 			</classpath>
 		</java>
 		<antcall target="remove-widgetset-gwt-tmp"/>
-- 
2.39.5