diff options
| author | Marko Grönroos <magi@iki.fi> | 2008-06-19 13:21:54 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2008-06-19 13:21:54 +0000 |
| commit | e850718edb58c29b301a617189c228a772dbff73 (patch) | |
| tree | f9ecae8c8155051f450aec87d4feb5cb0e9811ba /build | |
| parent | e96613c6dc97e1793919c42539fdc20dcb62bdbc (diff) | |
| download | vaadin-framework-e850718edb58c29b301a617189c228a772dbff73.tar.gz vaadin-framework-e850718edb58c29b301a617189c228a772dbff73.zip | |
Fixed problem with compiling widgetsets with build.xml file. Ant properties can not be overwritten, it seems.
svn changeset:4925/svn branch:trunk
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 16 |
1 files changed, 10 insertions, 6 deletions
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. --> |