avoid unnecessary xml_pp dependency, patch by Alberto Ruiz, fixes bug

2007-09-01  Juerg Billeter  <j@bitron.ch>

	* vapigen/gidlgen/gapi2xml.pl, vapigen/gidlgen/gidlgen.in: avoid
	  unnecessary xml_pp dependency, patch by Alberto Ruiz, fixes bug 472658

svn path=/trunk/; revision=571

diff --git a/ChangeLog b/ChangeLog
index 649d93c66bb3ffcb89b5496c03b20defd637736d..e0314fcf29024f4927f2f5cc874d309b2702946d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-01  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/gidlgen/gapi2xml.pl, vapigen/gidlgen/gidlgen.in: avoid
+         unnecessary xml_pp dependency, patch by Alberto Ruiz, fixes bug 472658
+
 2007-09-01  Jürg Billeter  <j@bitron.ch>
 
        * vapigen/gidlgen/gidlgen.in: improve gidlgen command-line options,

diff --git a/vapigen/gidlgen/gapi2xml.pl b/vapigen/gidlgen/gapi2xml.pl
index 64a9f3420bd051fc6f36711b28e038ce0e7a4a9b..e1651970f080706c99a91a6d52e3add420df53ae 100755 (executable)
--- a/vapigen/gidlgen/gapi2xml.pl
+++ b/vapigen/gidlgen/gapi2xml.pl
@@ -479,10 +479,10 @@ foreach $define (sort (keys (%defines))) {
 if ($ARGV[1]) {
        open(XMLFILE, ">$ARGV[1]") || 
                                die "Couldn't open $ARGV[1] for writing.\n";
-       print XMLFILE $doc->toString();
+       print XMLFILE $doc->toString(1);
        close(XMLFILE);
 } else {
-       print $doc->toString();
+       print $doc->toString(1);
 }
 
 ##############################################################

diff --git a/vapigen/gidlgen/gidlgen.in b/vapigen/gidlgen/gidlgen.in
index 764ce4b10c8744f58b2eee4d713390ef286f3388..771107f8905557d6ba3714576f88c56e12394aa7 100755 (executable)
--- a/vapigen/gidlgen/gidlgen.in
+++ b/vapigen/gidlgen/gidlgen.in
@@ -31,8 +31,8 @@ then
        patch -d $PKGBASE-src -Np1 < $PKGBASE.patch
 fi
 
-perl $pkglibdir/gapi_pp.pl `cat $PKGBASE.files | sed -e "s@^@$PKGBASE-src/@"` | perl $pkglibdir/gapi2xml.pl $(cat $PKGBASE.namespace) $PKGBASE.raw
+rm -f $PKGBASE.gidl
 
-xml_pp $PKGBASE.raw > $PKGBASE.gidl
+perl $pkglibdir/gapi_pp.pl `cat $PKGBASE.files | sed -e "s@^@$PKGBASE-src/@"` | perl $pkglibdir/gapi2xml.pl $(cat $PKGBASE.namespace) $PKGBASE.gidl
 
-rm -rf $PKGBASE-src $PKGBASE.raw
+rm -rf $PKGBASE-src