svn commit: r1308336 - /ofbiz/trunk/build.xml

[jl...@apache.org]

Author: jleroux
Date: Mon Apr  2 13:09:37 2012
New Revision: 1308336

URL: http://svn.apache.org/viewvc?rev=1308336&view=rev
Log:
A patch from Markus M. May "Allows build.xml in hot-deploy folder to build components in a specific order" https://issues.apache.org/jira/browse/OFBIZ-4736

In the current build.xml in the ofbiz-Home-folder, the build target is executed for each subdirectory (framework, application, specialpurpose) with the fileset:

<filelist dir="." files="specialpurpose/build.xml"/>

Only for the hot-deploy folder the fileset is quite different:

<fileset dir="${basedir}/hot-deploy" casesensitive="no">
<exclude name="disabled/**"/>
<include name="*/build.xml"/>
</fileset>

This is calling the build.xml directly in the hot-deploy components, which is an error, if you do have several dependent components in there, which needs to get build in the right order. I propose to use the following filelist:

<filelist dir="." files="hot-deploy/build.xml"/>

jleroux: a check is done, if no build.xml file is present in hot-deploy dir, then the build.xml files - if present - in hot-deploy sub-dirs will be used. So the previous, simpler, behaviour is kept as long as you don't need to build hot-deploy components in a specific order.

Modified:
    ofbiz/trunk/build.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1308336&r1=1308335&r2=1308336&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Mon Apr  2 13:09:37 2012
@@ -222,12 +222,27 @@ under the License.
         <subant inheritall="false" failonerror="${specialpurpose.present}">
             <filelist dir="." files="specialpurpose/build.xml"/>
         </subant>
-        <subant inheritall="false">
-            <fileset dir="${basedir}/hot-deploy" casesensitive="no">
+
+        <!-- a check is done, if no build.xml file is present in hot-deploy dir,
+            then the build.xml files - if present - in hot-deploy sub-dirs will be used.
+            So the previous, simpler, behaviour is kept as long as you don't need 
+            to build hot-deploy components in a specific order. -->
+        <if>
+          <available file="hot-deploy/build.xml" property="useHotDeployBuild"/>
+          <then>
+            <subant inheritall="false">
+              <filelist dir="." files="hot-deploy/build.xml"/>
+            </subant>
+          </then>
+          <else>
+            <subant inheritall="false">
+              <fileset dir="${basedir}/hot-deploy" casesensitive="no">
                 <exclude name="disabled/**"/>
                 <include name="*/build.xml"/>
-            </fileset>
-        </subant>
+              </fileset>
+            </subant>
+          </else>
+        </if>
         <antcall target="clean-svninfo"/>
 
         <echo message="[build] ========== Done Building (Compile) =========="/>