--- build.xml | 71 +++++++++--------------------------------------------------- 1 files changed, 11 insertions(+), 60 deletions(-)
diff --git a/build.xml b/build.xml index 292b967..3f4e5c8 100644 --- a/build.xml +++ b/build.xml @@ -502,11 +502,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.core" unless="qtjambi.typesystem_core.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_core-common.xml" force="yes" - out="${outputDir}/generator/typesystem_core.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_core-java.xml"/> - </xslt> + <xmlmerge victim="core"/> </target> <condition property="qtjambi.typesystem_gui.uptodate"> @@ -522,11 +518,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.gui" unless="qtjambi.typesystem_gui.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_gui-common.xml" force="yes" - out="${outputDir}/generator/typesystem_gui.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_gui-java.xml"/> - </xslt> + <xmlmerge victim="gui"/> </target> <condition property="qtjambi.typesystem_xml.uptodate"> @@ -542,11 +534,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.xml" unless="qtjambi.typesystem_xml.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_xml-common.xml" force="yes" - out="${outputDir}/generator/typesystem_xml.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_xml-java.xml"/> - </xslt> + <xmlmerge victim="xml"/> </target> <condition property="qtjambi.typesystem_network.uptodate"> @@ -562,12 +550,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.network" unless="qtjambi.typesystem_network.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_network-common.xml" - force="yes" - out="${outputDir}/generator/typesystem_network.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_network-java.xml"/> - </xslt> + <xmlmerge victim="network"/> </target> <condition property="qtjambi.typesystem_opengl.uptodate"> @@ -583,11 +566,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.opengl" unless="qtjambi.typesystem_opengl.uptodate"> - <xslt in="generator/typesystem_opengl-common.xml" force="yes" - out="${outputDir}/generator/typesystem_opengl.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_opengl-java.xml"/> - </xslt> + <xmlmerge victim="opengl"/> </target> <condition property="qtjambi.typesystem_sql.uptodate"> @@ -603,11 +582,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.sql" unless="qtjambi.typesystem_sql.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_sql-common.xml" force="yes" - out="${outputDir}/generator/typesystem_sql.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_sql-java.xml"/> - </xslt> + <xmlmerge victim="sql"/> </target> <condition property="qtjambi.typesystem_svg.uptodate"> @@ -623,11 +598,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.svg" unless="qtjambi.typesystem_svg.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_svg-common.xml" force="yes" - out="${outputDir}/generator/typesystem_svg.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_svg-java.xml"/> - </xslt> + <xmlmerge victim="svg"/> </target> <condition property="qtjambi.typesystem_webkit.uptodate"> @@ -643,12 +614,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.webkit" unless="qtjambi.typesystem_webkit.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_webkit-common.xml" - force="yes" - out="${outputDir}/generator/typesystem_webkit.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_webkit-java.xml"/> - </xslt> + <xmlmerge victim="webkit"/> </target> <condition property="qtjambi.typesystem_phonon.uptodate"> @@ -664,12 +630,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.phonon" unless="qtjambi.typesystem_phonon.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_phonon-common.xml" - force="yes" - out="${outputDir}/generator/typesystem_phonon.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_phonon-java.xml"/> - </xslt> + <xmlmerge victim="phonon"/> </target> <condition property="qtjambi.typesystem_xmlpatterns.uptodate"> @@ -687,12 +648,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html <target name="generator.xmlmerge.xmlpatterns" unless="qtjambi.typesystem_xmlpatterns.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_xmlpatterns-common.xml" - force="yes" - out="${outputDir}/generator/typesystem_xmlpatterns.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_xmlpatterns-java.xml"/> - </xslt> + <xmlmerge victim="xmlpatterns"/> </target> <condition property="qtjambi.typesystem_designer.uptodate"> @@ -709,12 +665,7 @@ http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html </condition> <target name="generator.xmlmerge.designer" unless="qtjambi.typesystem_designer.uptodate"> - <xslt in="${sourceDir}/generator/typesystem_designer-common.xml" - force="yes" - out="${outputDir}/generator/typesystem_designer.xml" - style="${sourceDir}/generator/merge.xsl"> - <param name="source" expression="typesystem_designer-java.xml"/> - </xslt> + <xmlmerge victim="designer"/> </target> -- 1.6.5.rc1 _______________________________________________ Qt-jambi-interest mailing list [email protected] http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest
