SAK-29931 Solve fail in pack task.

DaweiXia · Sep 29, 2015 · 86f462a · 86f462a
1 parent b8dbffd
commit 86f462a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/pack/pack-bin/build.xml b/pack/pack-bin/build.xml
@@ -40,10 +40,12 @@
 	        <arg value="install" />
 	        <arg value="sakai:deploy" />
 	    </exec>
+		<mkdir dir="${basedir}\target\pack"/>
+		<mkdir dir="${basedir}\target\pack\lib"/>
 	    <!-- 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="mvn" />
                 <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
@@ -115,7 +117,7 @@
 	        <tarfileset
 	            dir="${basedir}/target/pack/common"
 	            prefix="/common" dirmode="750"
-	            filemode="750" />
+	            filemode="750" erroronmissingdir="false"  />
 	        <tarfileset
 	            dir="${basedir}/target/pack/components"
 	            prefix="/components" dirmode="750"
@@ -131,6 +133,10 @@
 	        <tarfileset
 	            dir="${basedir}/target/pack/shared"
 	            prefix="/shared" dirmode="750"
+	            filemode="750" erroronmissingdir="false"  />
+	        <tarfileset
+	            dir="${basedir}/target/pack/lib"
+	            prefix="/lib" dirmode="750"
 	            filemode="750" />
 	        <tarfileset
 	            dir="${basedir}/target/pack/webapps"
@@ -157,7 +163,7 @@
 	        <zipfileset
 	            dir="${basedir}/target/pack/common"
 	            prefix="/common" dirmode="750"
-	            filemode="750" />
+	            filemode="750" erroronmissingdir="false" />
 	        <zipfileset
 	            dir="${basedir}/target/pack/components"
 	            prefix="/components" dirmode="750"
@@ -173,6 +179,10 @@
 	        <zipfileset
 	            dir="${basedir}/target/pack/shared"
 	            prefix="/shared" dirmode="750"
+	            filemode="750" erroronmissingdir="false" />
+	        <zipfileset
+	            dir="${basedir}/target/pack/lib"
+	            prefix="/lib" dirmode="750"
 	            filemode="750" />
 	        <zipfileset
 	            dir="${basedir}/target/pack/webapps"

diff --git a/pack/pack-demo/build.xml b/pack/pack-demo/build.xml
@@ -75,7 +75,7 @@
 	    <!-- 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="mvn" />
                 <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