[Swift-commit] cog r4025

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r4025 | timgarmstrong | 2014-07-14 15:52:00 -0500 (Mon, 14 Jul 2014) | 1 line

Change CoG build process to ignore missing empty src/lib dirs: friendlier to git-svn client
------------------------------------------------------------------------
Index: mbuild.xml
===================================================================
--- mbuild.xml	(revision 4024)
+++ mbuild.xml	(working copy)
@@ -19,10 +19,10 @@
 		<fileset dir="${dist.dir}">
 			<include name="${extra.lib.dir}/*.jar"/>
 		</fileset>
-    	<fileset dir="${cog.dir}/modules/${module.name}/lib">
+    	<fileset dir="${cog.dir}/modules/${module.name}/lib" erroronmissingdir="false">
 			<include name="**/*.jar"/>
 		</fileset>
-		<fileset dir="${dist.dir}/lib">
+		<fileset dir="${dist.dir}/lib" erroronmissingdir="false">
 			<include name="*.jar"/>
 		</fileset>
 	</path>
@@ -34,7 +34,7 @@
 		<fileset dir="${cog.dir}/modules/${module.name}/lib">
 			<include name="**/*.jar"/>
 		</fileset>
-		<fileset dir="${dist.dir}/lib">
+		<fileset dir="${dist.dir}/lib" erroronmissingdir="false">
 			<include name="*.jar"/>
 		</fileset>
 		<pathelement location="${build.dir}"/>
@@ -215,6 +215,8 @@
     
 	<target name="compile">
 		<echo message="[${module.name}]: COMPILE"/>
+                <!-- Create if not present -->
+		<mkdir dir="src"/>
 		<mkdir dir="${build.dir}"/>
 		<javac  srcdir="src"
 			destdir="${build.dir}"
@@ -454,10 +456,10 @@
 		<!--copy library dependencies-->
 		<echo message="[${module.name}]: JARCOPY"/>
 		<copy todir="${dist.dir}/lib">
-			<fileset dir="lib" includes="${lib.deps}"/>
+			<fileset dir="lib" includes="${lib.deps}" erroronmissingdir="false"/>
 		</copy>
 		<copy todir="${dist.dir}/lib">
-			<fileset dir="${cog.dir}/lib" includes="${lib.deps}"/>
+			<fileset dir="${cog.dir}/lib" includes="${lib.deps}" erroronmissingdir="false"/>
 		</copy>
 		<!--copy runtime configuration files-->
 		<copy todir="${dist.dir}/etc">
@@ -891,4 +893,4 @@
             <arg line="-list -keystore ${keystore} -storepass ${storepass}"/>
         </exec>
     </target>
-</project>
\ No newline at end of file
+</project>