From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 22 Mar 2005 03:48:05 +0000 (+0000)
Subject: Avoid forcing extra newlines when using template files. (#171005)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=39f7b0680c101387bace5757200e0313e4702871;p=dana%2Fcg-glib.git

Avoid forcing extra newlines when using template files. (#171005)

2005-03-21  Matthias Clasen  <mclasen@redhat.com>

	* glib-mkenums.in: Avoid forcing extra newlines when using
	template files.  (#171005)
---

diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index 800e9630..6782e0b7 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -240,6 +240,7 @@ if (length($fhead)) {
     $prod =~ s/\@filename\@/$ARGV[0]/g;
     $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
     $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+    chomp ($prod);
 		
     print "$prod\n";
 }
@@ -366,6 +367,7 @@ while (<>) {
 		$prod =~ s/\@filename\@/$ARGV/g;
 		$prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
 		$prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+	        chomp ($prod);
 		
 		print "$prod\n";
 	    }
@@ -383,6 +385,7 @@ while (<>) {
 	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
 	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
 	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+            chomp ($prod);
 
 	    print "$prod\n";
 	}
@@ -399,6 +402,7 @@ while (<>) {
 	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
             $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
             $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+            chomp ($prod);
 	    
             print "$prod\n";
 	}
@@ -417,6 +421,7 @@ while (<>) {
 		if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
 		if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
 		if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
+		chomp ($tmp_prod);
 
 		print "$tmp_prod\n";
 	    }
@@ -434,6 +439,7 @@ while (<>) {
 	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
             $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
             $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+            chomp ($prod);
 	    
             print "$prod\n";
 	}
@@ -446,6 +452,7 @@ if (length($ftail)) {
     $prod =~ s/\@filename\@/$ARGV/g;
     $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
     $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+    chomp ($prod);
 		
     print "$prod\n";
 }