It removes even more lines from build.xml, and you don't have to define one property per target to decide whether to build it or not.
This commit only replaces the previous calls to is-merge-necessary and xmlmerge by calls to xmlmerge-if-necessary. It does not remove the definition of the old macros. --- build.xml | 67 ++++++++++++++++++++----------------------------------------- 1 files changed, 22 insertions(+), 45 deletions(-) diff --git a/build.xml b/build.xml index 743818b..36f0686 100644 --- a/build.xml +++ b/build.xml @@ -540,74 +540,51 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </sequential> </macrodef> - <is-merge-necessary victim="core"/> - - <target name="generator.xmlmerge.core" unless="qtjambi.typesystem_core.uptodate"> - <xmlmerge victim="core"/> + <target name="generator.xmlmerge.core"> + <xmlmerge-if-necessary victim="core"/> </target> - <is-merge-necessary victim="gui"/> - - <target name="generator.xmlmerge.gui" unless="qtjambi.typesystem_gui.uptodate"> - <xmlmerge victim="gui"/> + <target name="generator.xmlmerge.gui"> + <xmlmerge-if-necessary victim="gui"/> </target> - <is-merge-necessary victim="xml"/> - - <target name="generator.xmlmerge.xml" unless="qtjambi.typesystem_xml.uptodate"> - <xmlmerge victim="xml"/> + <target name="generator.xmlmerge.xml"> + <xmlmerge-if-necessary victim="xml"/> </target> - <is-merge-necessary victim="network"/> - - <target name="generator.xmlmerge.network" unless="qtjambi.typesystem_network.uptodate"> - <xmlmerge victim="network"/> + <target name="generator.xmlmerge.network"> + <xmlmerge-if-necessary victim="network"/> </target> - <is-merge-necessary victim="opengl"/> - - <target name="generator.xmlmerge.opengl" unless="qtjambi.typesystem_opengl.uptodate"> - <xmlmerge victim="opengl"/> + <target name="generator.xmlmerge.opengl"> + <xmlmerge-if-necessary victim="opengl"/> </target> - <is-merge-necessary victim="sql"/> - - <target name="generator.xmlmerge.sql" unless="qtjambi.typesystem_sql.uptodate"> - <xmlmerge victim="sql"/> + <target name="generator.xmlmerge.sql"> + <xmlmerge-if-necessary victim="sql"/> </target> - <is-merge-necessary victim="svg"/> - - <target name="generator.xmlmerge.svg" unless="qtjambi.typesystem_svg.uptodate"> - <xmlmerge victim="svg"/> + <target name="generator.xmlmerge.svg"> + <xmlmerge-if-necessary victim="svg"/> </target> - <is-merge-necessary victim="webkit"/> - - <target name="generator.xmlmerge.webkit" unless="qtjambi.typesystem_webkit.uptodate"> - <xmlmerge victim="webkit"/> + <target name="generator.xmlmerge.webkit"> + <xmlmerge-if-necessary victim="webkit"/> </target> - <is-merge-necessary victim="phonon"/> - - <target name="generator.xmlmerge.phonon" unless="qtjambi.typesystem_phonon.uptodate"> - <xmlmerge victim="phonon"/> + <target name="generator.xmlmerge.phonon"> + <xmlmerge-if-necessary victim="phonon"/> </target> - <is-merge-necessary victim="xmlpatterns"/> - <target name="generator.xmlmerge.xmlpatterns" - unless="qtjambi.typesystem_xmlpatterns.uptodate"> - <xmlmerge victim="xmlpatterns"/> + > + <xmlmerge-if-necessary victim="xmlpatterns"/> </target> - <is-merge-necessary victim="designer"/> - - <target name="generator.xmlmerge.designer" unless="qtjambi.typesystem_designer.uptodate"> - <xmlmerge victim="designer"/> + <target name="generator.xmlmerge.designer"> + <xmlmerge-if-necessary victim="designer"/> </target> - <target name="generator.xmlmerge" description="Merges the XML files used by the Qt Jambi generator." depends="generator.xmlmerge.core, generator.xmlmerge.gui, generator.xmlmerge.network, generator.xmlmerge.svg, generator.xmlmerge.xml, generator.xmlmerge.xmlpatterns, generator.xmlmerge.opengl, generator.xmlmerge.sql, generator.xmlmerge.designer, generator.xmlmerge.webkit, generator.xmlmerge.phonon"/> -- 1.6.5.rc1 _______________________________________________ Qt-jambi-interest mailing list [email protected] http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest
