SAK-18655 - Updated pack-demo and pack-bin for osfamily to catch all …

…versions of windows. Left the other the same since it was already specific, and would have probably required two tasks anyway for mac and unix? git-svn-id: https://source.sakaiproject.org/svn/pack/trunk@104775 66ffb92e-73f9-0310-93c1-f5514f145a0a
s50600822 · Feb 16, 2012 · d784297 · d784297
1 parent aa6e2d8
commit d784297
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/pack/pack-bin/build.xml b/pack/pack-bin/build.xml
@@ -27,7 +27,8 @@
 
 	<target name="deploy" depends="prep" description="Build and deploy to target directory.">
 	    <echo message="[INFO] build and deploy Sakai artifacts to /target/pack (faux Tomcat deployment)." />
-	    <exec dir="../../" executable="mvn" failonerror="true">
+    	    <echo>Your OS name is: ${os.name}. If sakai doesn't start to install you might need to add it to the list of OSes.</echo>
+	    <exec dir="../../" executable="mvn" failonerror="true" os="Mac OS X,Linux,FreeBSD,Solaris">
 	        <arg value="-Dmaven.tomcat.home=${basedir}/target/pack" />
 	        <arg value="-Dmaven.test.skip=${sakai.skip.tests}" />
 	        <!-- 
@@ -39,6 +40,22 @@
 	        <arg value="install" />
 	        <arg value="sakai:deploy" />
 	    </exec>
+	    <!-- osfamily Tested on Windows 7 , (Fill in others) -->
+            <exec dir="../../" executable="cmd" failonerror="true" osfamily="windows">
+                <arg value="/c" />
+                <arg value="mvn.bat" />
+                <arg value="-Dmaven.tomcat.home=${basedir}\target\pack" />
+                <arg value="-Dmaven.test.skip=${sakai.skip.tests}" />
+                <!-- next 3 lines *may* be optional so leaving them out, add back in if needed for windows build
+                <arg value="-Dkeystore=${keystore}" />
+                <arg value="-Dalias=${alias}" />
+                <arg value="-Dstorepass=${storepass}" />
+                -->
+                <arg value="clean" />
+                <arg value="install" />
+                <arg value="sakai:deploy" />
+	    </exec>
+
 	</target>
 
 	<target name="delete" depends="deploy" description="Delete extraneous directories.">

diff --git a/pack/pack-demo/build.xml b/pack/pack-demo/build.xml
@@ -58,7 +58,7 @@
 	<target name="build" depends="move" description="Build and deploy Sakai to Tomcat.">
 	    <echo message="[INFO] Build and deploy Sakai to Tomcat." />
 	    <!-- OS Values from http://mindprod.com/jgloss/properties.html#OSNAME -->
-	    <echo>Your OS name is: ${os.name} If this doesn't do anything you might need to add it to the list of OSes.</echo>
+	    <echo>Your OS name is: ${os.name}. If sakai doesn't start to install you might need to add it to the list of OSes.</echo>
 	    <exec dir="../../" executable="mvn" failonerror="true" os="Mac OS X,Linux,FreeBSD,Solaris">
 	        <!-- <arg value="-B" /> -->
 	    	<arg value="-Dmaven.tomcat.home=${basedir}/target/pack" />
@@ -72,8 +72,8 @@
 	        <arg value="install" />
 	        <arg value="sakai:deploy" />
 	    </exec>
-	    <echo>Tested on Windows Server 2008, (Fill in others)</echo>
-            <exec dir="../../" executable="cmd" failonerror="true" os="Windows 98,Windows NT,Windows 2000,Windows XP,Windows 7,Windows Vista,Windows Server 2008,Windows Server 2005">
+	    <!-- osfamily tested on Windows 7 , (Fill in others) -->
+            <exec dir="../../" executable="cmd" failonerror="true" osfamily="windows">
                 <arg value="/c" />
                 <arg value="mvn.bat" />
                 <arg value="-Dmaven.tomcat.home=${basedir}\target\pack" />