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

diff --git a/build.xml b/build.xml
index 13f20a10db3a4ef0f6d7effa79abf9e89e93543c..a1ba8b8b0642be584a000eeb49c8943c97173d29 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -190,16 +190,26 @@
                <ant antfile="services/build.xml" target="gen_ddl" inheritAll="false" />\r
        </target>\r
 \r
-       <target name="create_db" description="create database(s), invoke subtasks for indexes, etc.">\r
+       <target name="create_db" depends="create_db-unix,create_db-windows" description="create database(s), invoke subtasks for indexes, etc.">\r
+               <antcall target="create_nuxeo_db" />\r
+               <antcall target="create_cspace_db" />\r
+       </target>\r
+       \r
+       <target name="create_db-unix" if="osfamily-unix">\r
+               <exec executable="mvn" failonerror="true">\r
+                       <arg value="validate" /> <!-- Ensure proper env vars are set -->\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+       <target name="create_db-windows" if="osfamily-windows">\r
                <exec executable="cmd" failonerror="true">\r
                        <arg value="/c" />\r
                        <arg value="mvn.bat" />\r
-                       <arg value="validate" />\r
+                       <arg value="validate" /> <!-- Ensure proper env vars are set -->\r
                        <arg value="${mvn.opts}" />\r
                </exec>\r
-               <antcall target="create_nuxeo_db" />\r
-               <antcall target="create_cspace_db" />\r
        </target>\r
+       \r
 \r
        <target name="create_nuxeo_db" description="create nuxeo database">\r
                <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">\r