Changed os detection back, since os x family is 'unix', and ant docs are lacking...

svn changeset:4307/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index 09ce8bf6cc216c278e55e87c822b42163d106077..64db26184fbab2f2c8f59a679e098c43d89307e0 100644 (file)
--- 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>\r
+                       <contains arg1="${os.name}" arg2="Windows" />\r
+                       <then>\r
+                               <property name="platform" value="windows" />\r
+                       </then>\r
+               </if>\r
+               <if>\r
+                       <equals arg1="${os.name}" arg2="Linux" />\r
+                       <then>\r
+                               <property name="platform" value="linux" />\r
+                       </then>\r
+               </if>\r
+               <if>\r
+                       <equals arg1="${os.name}" arg2="Mac OS X" />\r
+                       <then>\r
+                               <property name="platform" value="mac" />\r
+                       </then>\r
+               </if>\r
                <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
                <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />