This bundles the is-merge-necessary and xmlmerge macros all into one. This has required to invert the test previously done by the is-merge-necessary macro. --- build.xml | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml index 542e92a..743818b 100644 --- a/build.xml +++ b/build.xml @@ -484,6 +484,32 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html ************************************************************ --> + <macrodef name="xmlmerge-if-necessary"> + <attribute name="victim"/> + <sequential> + <if> + <or> + <isset property="qtjambi.force"/> + <not> + <uptodate + targetfile="${outputDir}/generator/typesyst...@{victim}.xml"> + <srcfiles dir="${sourceDir}/generator" + includes="typesyst...@{victim}-*.*"/> + </uptodate> + </not> + </or> + <then> + <xslt force="yes" style="${sourceDir}/generator/merge.xsl" + in="${sourceDir}/generator/typesyst...@{victim}-common.xml" + out="${outputDir}/generator/typesyst...@{victim}.xml"> + <param name="source" + expression="typesyst...@{victim}-java.xml"/> + </xslt> + </then> + </if> + </sequential> + </macrodef> + <macrodef name="is-merge-necessary"> <attribute name="victim"/> <sequential> -- 1.6.5.rc1 _______________________________________________ Qt-jambi-interest mailing list [email protected] http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest
