From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 2 May 2008 05:45:20 +0000 (+0000)
Subject: Changed os detection back, since os x family is 'unix', and ant docs are lacking... 
X-Git-Tag: 6.7.0.beta1~4839
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3246173100cc7edbd7e5e94575641f44c31d9a3a;p=vaadin-framework.git

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
---

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" />