diff options
| author | Marko Grönroos <magi@iki.fi> | 2009-10-09 10:17:37 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2009-10-09 10:17:37 +0000 |
| commit | c5978786864cbf39d691558f000f55b8a39e58ce (patch) | |
| tree | 8fed04eed9b6bd29fe5d2177d3af69b4e1ff8aa8 /build | |
| parent | 248a2a7a99376d9e4e00534b5bdf1a5fc96f54dd (diff) | |
| download | vaadin-framework-c5978786864cbf39d691558f000f55b8a39e58ce.tar.gz vaadin-framework-c5978786864cbf39d691558f000f55b8a39e58ce.zip | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 22 |
1 files 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"/> |