From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 30 Apr 2008 13:11:54 +0000 (+0000)
Subject: changed os.name if-classes to ant built-in <os>
X-Git-Tag: 6.7.0.beta1~4840
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b05f28fae7ab3eacc79b35514e5e8d78752d0805;p=vaadin-framework.git

changed os.name if-classes to ant built-in <os>

svn changeset:4304/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index db8eecb7c3..09ce8bf6cc 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -42,8 +42,8 @@
 	</target>
 
 	<target name="package-jar" depends="clean-all, init, libs" description="Create itmill-toolkit-x.y.z.jar file.">
-	</target>
-
+	</target>
+	
 	<target name="package-war" depends="clean-all, init, build, docs, internal-package-mac, internal-package-war">
 	</target>
 
@@ -93,19 +93,19 @@
 		<mkdir dir="${result-path}" />
 		<!-- Find out which platform we are in -->
 		<if>
-			<contains arg1="${os.name}" arg2="Windows" />
+			<os family="windows" />
 			<then>
 				<property name="platform" value="windows" />
 			</then>
 		</if>
 		<if>
-			<equals arg1="${os.name}" arg2="Linux" />
+			<os family="unix" />
 			<then>
 				<property name="platform" value="linux" />
 			</then>
 		</if>
 		<if>
-			<equals arg1="${os.name}" arg2="Mac OS X" />
+			<os family="mac" />
 			<then>
 				<property name="platform" value="mac" />
 			</then>
@@ -652,7 +652,7 @@
 	</target>
 
 	<target name="libs" depends="compile-java, compile-client-side">
-		<echo>Creating libs (server-side)</echo>
+		<echo>Creating libs (server-side) ${lib-jar-name}</echo>
 		<!-- Create Toolkit JAR -->
 		<jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true">
 			<fileset dir="${result-path}/classes">