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 db8eecb7c3c0e632f2718fcebef5edc71af80797..09ce8bf6cc216c278e55e87c822b42163d106077 100644 (file)
--- 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>\r
+       
        <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">