diff options
author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2008-06-28 16:15:39 +0000 |
---|---|---|
committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2008-06-28 16:15:39 +0000 |
commit | fd1cc021ccad3ebfa24b9473e3560e378efe850f (patch) | |
tree | c41fe0c7c34bce2a150340ffb700bd8ab53be13f /build | |
parent | 9e60dfdb56ba2ec09de9c0e430b59e35ac3ff251 (diff) | |
download | vaadin-framework-fd1cc021ccad3ebfa24b9473e3560e378efe850f.tar.gz vaadin-framework-fd1cc021ccad3ebfa24b9473e3560e378efe850f.zip |
Fixed Mac OS X 10.5 to detect as mac_leopard instead of mac
svn changeset:4965/svn branch:trunk
Diffstat (limited to 'build')
-rw-r--r-- | build/build.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 0f1acc5cfd..9d9a04613a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -21,7 +21,7 @@ NOTE: This build script requires directories named ${gwt-dir}/(linux|windows|mac|mac_leopard) . See build.properties to define path where your gwt installation is located. You must unpack platform specific binaries under linux, windows and mac directories. - ${gwt-dir}/${platform} (linux|windows|mac) are used for + ${gwt-dir}/${platform} (linux|windows|mac|mac_leopard) are used for a) compile WebContent/ITMILL/widgetsets b) creating platform specific release ZIP/TGZ packages. --> @@ -102,7 +102,15 @@ <if> <equals arg1="${os.name}" arg2="Mac OS X" /> <then> - <property name="platform" value="mac" /> + <if> + <contains string="${os.version}" substring="10.5." /> + <then> + <property name="platform" value="mac_leopard" /> + </then> + <else> + <property name="platform" value="mac" /> + </else> + </if> </then> </if> </target> @@ -123,7 +131,7 @@ <!-- 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>We are on ${platform} platform (${os.name} ${os.version}), using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo> <!-- Destination files --> <property name="lib-jar-name" value="${product-file}-${version}.jar" /> |