--- build.xml | 121 +++++-------------------------------------------------------- 1 files changed, 10 insertions(+), 111 deletions(-)
diff --git a/build.xml b/build.xml index d0d45e9..a0bcdcd 100644 --- a/build.xml +++ b/build.xml @@ -508,16 +508,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </sequential> </macrodef> - <condition property="qtjambi.typesystem_core.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_core.xml"> - <srcfiles dir="${sourceDir}/generator" includes="typesystem_core-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="core"/> <target name="generator.xmlmerge.core" unless="qtjambi.typesystem_core.uptodate"> <xmlmerge victim="core"/> @@ -539,148 +530,56 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html <xmlmerge victim="gui"/> </target> - <condition property="qtjambi.typesystem_xml.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_xml.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_xml-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="xml"/> <target name="generator.xmlmerge.xml" unless="qtjambi.typesystem_xml.uptodate"> <xmlmerge victim="xml"/> </target> - <condition property="qtjambi.typesystem_network.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_network.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_network-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="network"/> <target name="generator.xmlmerge.network" unless="qtjambi.typesystem_network.uptodate"> <xmlmerge victim="network"/> </target> - <condition property="qtjambi.typesystem_opengl.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_opengl.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_opengl-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="opengl"/> <target name="generator.xmlmerge.opengl" unless="qtjambi.typesystem_opengl.uptodate"> <xmlmerge victim="opengl"/> </target> - <condition property="qtjambi.typesystem_sql.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_sql.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_sql-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="sql"/> <target name="generator.xmlmerge.sql" unless="qtjambi.typesystem_sql.uptodate"> <xmlmerge victim="sql"/> </target> - <condition property="qtjambi.typesystem_svg.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_svg.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_svg-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="svg"/> <target name="generator.xmlmerge.svg" unless="qtjambi.typesystem_svg.uptodate"> <xmlmerge victim="svg"/> </target> - <condition property="qtjambi.typesystem_webkit.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_webkit.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_webkit-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="webkit"/> <target name="generator.xmlmerge.webkit" unless="qtjambi.typesystem_webkit.uptodate"> <xmlmerge victim="webkit"/> </target> - <condition property="qtjambi.typesystem_phonon.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate targetfile="${outputDir}/generator/typesystem_phonon.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_phonon-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="phonon"/> <target name="generator.xmlmerge.phonon" unless="qtjambi.typesystem_phonon.uptodate"> <xmlmerge victim="phonon"/> </target> - <condition property="qtjambi.typesystem_xmlpatterns.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate - targetfile="${outputDir}/generator/typesystem_xmlpatterns.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_xmlpatterns-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="xmlpatterns"/> <target name="generator.xmlmerge.xmlpatterns" unless="qtjambi.typesystem_xmlpatterns.uptodate"> <xmlmerge victim="xmlpatterns"/> </target> - <condition property="qtjambi.typesystem_designer.uptodate"> - <and> - <not> - <isset property="qtjambi.force"/> - </not> - <uptodate - targetfile="${outputDir}/generator/typesystem_designer.xml"> - <srcfiles dir="${sourceDir}/generator" - includes="typesystem_designer-*.*"/> - </uptodate> - </and> - </condition> + <is-merge-necessary victim="designer"/> <target name="generator.xmlmerge.designer" unless="qtjambi.typesystem_designer.uptodate"> <xmlmerge victim="designer"/> -- 1.6.5.rc1 _______________________________________________ Qt-jambi-interest mailing list [email protected] http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest
