svn commit: r1100969 - /ofbiz/trunk/macros.xml

Author: jleroux
Date: Mon May  9 11:49:28 2011
New Revision: 1100969

URL: http://svn.apache.org/viewvc?rev=1100969&view=rev
Log:
I forgot about <if> part ofbiz-jjtree macro (not used OOTB) in r1100903. I checked there are no other cases.

Modified:
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1100969&r1=1100968&r2=1100969&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Mon May  9 11:49:28 2011
@@ -199,37 +199,29 @@ under the License.
   <attribute name="prefix" default=""/>
   <sequential>
    <if>
-    <condition>
      <not>
       <uptodate
        srcfile="@{prefix}src/@{dir}/@{file}.jjt"
        targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/>
      </not>
-    </condition>
-    <commands>
      <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/>
      <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/>
      <jjtree target="@{prefix}src/@{dir}/@{file}.jjt"
       javacchome="${ofbiz.home.dir}/lib/build/javacc"
       outputdirectory="@{prefix}build/gen-src/jjtree/@{dir}"/>
-    </commands>
    </if>
    <if>
-    <condition>
      <not>
       <uptodate
        srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"
        targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/>
      </not>
-    </condition>
-    <commands>
      <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/>
      <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/>
      <javacc target="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"
       javacchome="${ofbiz.home.dir}/lib/build/javacc"
       outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/>
      <delete dir="@{prefix}build/classes/@{dir}"/>
-    </commands>
    </if>
   </sequential>
  </macrodef>