diff options
| author | Marc Englund <marc.englund@itmill.com> | 2008-05-02 05:45:20 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2008-05-02 05:45:20 +0000 |
| commit | 3246173100cc7edbd7e5e94575641f44c31d9a3a (patch) | |
| tree | 513285ea2dd8a615dfb2c8483da97fd44dd79b06 /build | |
| parent | b05f28fae7ab3eacc79b35514e5e8d78752d0805 (diff) | |
| download | vaadin-framework-3246173100cc7edbd7e5e94575641f44c31d9a3a.tar.gz vaadin-framework-3246173100cc7edbd7e5e94575641f44c31d9a3a.zip | |
Changed os detection back, since os x family is 'unix', and ant docs are lacking in this department. If it works, don't fix it...
svn changeset:4307/svn branch:trunk
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/build/build.xml b/build/build.xml index 09ce8bf6cc..64db26184f 100644 --- a/build/build.xml +++ b/build/build.xml @@ -92,24 +92,24 @@ <!-- Create result dir unless already exists --> <mkdir dir="${result-path}" /> <!-- Find out which platform we are in --> - <if> - <os family="windows" /> - <then> - <property name="platform" value="windows" /> - </then> - </if> - <if> - <os family="unix" /> - <then> - <property name="platform" value="linux" /> - </then> - </if> - <if> - <os family="mac" /> - <then> - <property name="platform" value="mac" /> - </then> - </if> + <if>
+ <contains arg1="${os.name}" arg2="Windows" />
+ <then>
+ <property name="platform" value="windows" />
+ </then>
+ </if>
+ <if>
+ <equals arg1="${os.name}" arg2="Linux" />
+ <then>
+ <property name="platform" value="linux" />
+ </then>
+ </if>
+ <if>
+ <equals arg1="${os.name}" arg2="Mac OS X" />
+ <then>
+ <property name="platform" value="mac" />
+ </then>
+ </if>
<!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) --> <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" /> |