From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 3 Apr 2014 21:25:13 +0000 (-0700)
Subject: CSPACE-6355: Adding missing unix version of mvn validate call -worked only on Windows.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=698e73c5a564d1234de602ea090831d6355adb15;p=tmp%2Fjakarta-migration.git

CSPACE-6355: Adding missing unix version of mvn validate call -worked only on Windows.
---

diff --git a/build.xml b/build.xml
index 13f20a10d..a1ba8b8b0 100644
--- a/build.xml
+++ b/build.xml
@@ -190,16 +190,26 @@
 		<ant antfile="services/build.xml" target="gen_ddl" inheritAll="false" />
 	</target>
 
-	<target name="create_db" description="create database(s), invoke subtasks for indexes, etc.">
+	<target name="create_db" depends="create_db-unix,create_db-windows" description="create database(s), invoke subtasks for indexes, etc.">
+		<antcall target="create_nuxeo_db" />
+		<antcall target="create_cspace_db" />
+	</target>
+	
+	<target name="create_db-unix" if="osfamily-unix">
+		<exec executable="mvn" failonerror="true">
+			<arg value="validate" /> <!-- Ensure proper env vars are set -->
+			<arg value="${mvn.opts}" />
+		</exec>
+	</target>
+	<target name="create_db-windows" if="osfamily-windows">
 		<exec executable="cmd" failonerror="true">
 			<arg value="/c" />
 			<arg value="mvn.bat" />
-			<arg value="validate" />
+			<arg value="validate" /> <!-- Ensure proper env vars are set -->
 			<arg value="${mvn.opts}" />
 		</exec>
-		<antcall target="create_nuxeo_db" />
-		<antcall target="create_cspace_db" />
 	</target>
+	
 
 	<target name="create_nuxeo_db" description="create nuxeo database">
 		<sql driver="${db.jdbc.driver.class}" url="${db.jdbc.csadmin.url}" userid="${db.csadmin.user}" password="${db.csadmin.user.password}" autocommit="true" src="${db.script.dir}/init_nuxeo_db.sql">