[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Bjoern Michaelsen]

 patches/dev300/extractapplyinfo.awk |  225 +++++++++++++++++++-----------------
 1 file changed, 121 insertions(+), 104 deletions(-)

New commits:
commit 13e0b634b0cfe5e93be5d3044c931447dffbf815
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Aug 30 19:28:11 2011 +0200

    some more fixes to the migration script

diff --git a/patches/dev300/extractapplyinfo.awk b/patches/dev300/extractapplyinfo.awk
index 4d4d579..617bfa5 100644
--- a/patches/dev300/extractapplyinfo.awk
+++ b/patches/dev300/extractapplyinfo.awk
@@ -2,114 +2,131 @@
 # Copyright LGPLv3 (or later) / MPL 2011 Canonical Ltd.
 
 BEGIN {
-	state="presection"
-	FS=","
-	patchpattern = "/" PATCHNAME "/"
-	comment = ""
-	lastcomment = ""
-	sectioncomment = ""
+    state="presection"
+    FS=","
+    patchpattern = "/" PATCHNAME "/"
+    comment = ""
+    lastcomment = ""
+    sectioncomment = ""
 }
 
 /\[.*\]/ {
-	section = $0
-	sub(/^\[ */,"",section)
-	sub(/ *]$/,"",section)
-	state = "sectionheader"
-	sectioncomment = ""
+    section = $0
+    sub(/^\[ */,"",section)
+    sub(/ *]$/,"",section)
+    state = "sectionheader"
+    sectioncomment = ""
 }
 
 {
-	if ($0 ~ /^#/)
-	{
-		commentline = $0
-		sub(/^# */,"",commentline)
-		if (state == "sectionheader")
-		{
-			sectioncomment = sectioncomment "\n  " commentline
-		}
-		else if(state == "sectionbody")
-		{
-			comment = comment "\n  " commentline
-		}
-	}
-	else if ($1 ~ PATCHNAME)
-	{
-		issues = ""
-		author = ""
-		for (i = 2; i <= NF; i++)
-		{
-			if ($i ~ /#/)
-			{
-				issues = issues "," $i
-			}
-			else
-			{
-				author = author "," $i
-			}
-		}
-		sub(/^, */, "", issues)
-		sub(/^, */, "", author)
-		if (comment=="")
-		{
-			comment = lastcomment
-			shortmessage = "apply build repository patch " PATCHNAME
-		}
-		else
-		{
-			shortmessage = comment
-			gsub(/\n/, " ", shortmessage)
-			gsub(/  /, " ", shortmessage)
-			gsub(/  /, " ", shortmessage)
-			shortmessage = substr(shortmessage, 0, 70)
-		}
-		if (issues !="")
-			shortmessage = issues ": " shortmessage
-		print "#!/bin/bash"
-		print "set -e"
-		print "[ -n ${SOLARSRC} ] || (echo \"no environment set!\" >&2 && false)"
-		print "cd ${SOLARSRC}"
-		print "MESSAGEFILE=`mktemp`"
-		print "cat > ${MESSAGEFILE} <<\"ENDOFAUTOMATEDLOGMESSAGE\""
-		print shortmessage
-		print ""
-		print "information from the apply file:"
-		print " patchname: " PATCHNAME
-		print " issues: " issues
-		print " author: " author
-		print " section: " section
-		print " comment: " comment
-		print " sectioncomment: " sectioncomment
-		print ""
-		print "git log from build repository:"
-		gitlog = "git log " PATCHNAME
-		while ((gitlog | getline) > 0)
-		{
-			print $0
-		}
-		close(gitlog)
-		print "ENDOFAUTOMATEDLOGMESSAGE"
-		print ""
-		print "patch -p0 <<\"ENDOFMIGRATEDPATCH\""
-		patchcat = "cat " PATCHNAME
-		while ((patchcat | getline) > 0)
-		{
-			print $0
-		}
-		print "ENDOFMIGRATEDPATCH"
-		print ""
-		print "./g add -A"
-		if (author != "")
-			author = " --author='" author "'"
-		# we need to skip hooks because otherwise git logs cannot go in the message file
-		print "./g commit -F ${MESSAGEFILE} --no-verify" author
-		print "rm ${MESSAGEFILE}"
-		state = "sectionbody"
-			
-	}
-	else
-	{
-		lastcomment = comment
-		comment = ""
-		state = "sectionbody"
-	}
+    if ($0 ~ /^#/)
+    {
+        commentline = $0
+        sub(/^# */,"",commentline)
+        if (state == "sectionheader")
+        {
+            sectioncomment = sectioncomment "\n  " commentline
+        }
+        else if(state == "sectionbody")
+        {
+            comment = comment "\n  " commentline
+        }
+    }
+    else if ($1 ~ PATCHNAME)
+    {
+        issues = ""
+        author = ""
+        for (i = 2; i <= NF; i++)
+        {
+            if ($i ~ /#/)
+            {
+                issues = issues "," $i
+            }
+            else
+            {
+                author = author "," $i
+            }
+        }
+        sub(/^, */, "", issues)
+        sub(/^, */, "", author)
+        if (author=="mklose")
+        {
+            author="Matthias Klose <matthias.klose at canonical.com>"
+        }
+        else if (author=="flr")
+        {
+            author="Florian Reuter <freuter at novell.com>"
+        }
+        else if (author=="rene"||author=="rengelha")
+        {
+            author="Rene Engelhard <rene at debian.org>"
+        }
+        else if (author=="michael")
+        {
+            author="Michael Meeks <michael.meeks at novell.com>"
+        }
+
+        if (comment=="")
+        {
+            comment = lastcomment
+            shortmessage = "apply build repository patch " PATCHNAME
+        }
+        else
+        {
+            shortmessage = comment
+            gsub(/\n/, " ", shortmessage)
+            gsub(/  /, " ", shortmessage)
+            gsub(/  /, " ", shortmessage)
+            shortmessage = substr(shortmessage, 0, 70)
+        }
+        if (issues !="")
+            shortmessage = issues ": " shortmessage
+        print "#!/bin/bash"
+        print "set -e"
+        print "[ -n ${SOLARSRC} ] || (echo \"no environment set!\" >&2 && false)"
+        print "cd ${SOLARSRC}"
+        print "MESSAGEFILE=`mktemp`"
+        print "cat > ${MESSAGEFILE} <<\"ENDOFAUTOMATEDLOGMESSAGE\""
+        print shortmessage
+        print ""
+        print "information from the apply file:"
+        print " patchname: " PATCHNAME
+        print " issues: " issues
+        print " author: " author
+        print " section: " section
+        print " comment: " comment
+        print " sectioncomment: " sectioncomment
+        print ""
+        print "git log from build repository:"
+        gitlog = "git log " PATCHNAME
+        while ((gitlog | getline) > 0)
+        {
+            print $0
+        }
+        close(gitlog)
+        print "ENDOFAUTOMATEDLOGMESSAGE"
+        print ""
+        print "patch -lp0 --no-backup-if-mismatch <<\"ENDOFMIGRATEDPATCH\""
+        patchcat = "cat " PATCHNAME
+        while ((patchcat | getline) > 0)
+        {
+            print $0
+        }
+        print "ENDOFMIGRATEDPATCH"
+        print ""
+        print "git add -A"
+        if (author != "")
+            author = " --author='" author "'"
+        # we need to skip hooks because otherwise git logs cannot go in the message file
+        print "git commit -F ${MESSAGEFILE} --no-verify" author
+        print "rm ${MESSAGEFILE}"
+        state = "sectionbody"
+            
+    }
+    else
+    {
+        lastcomment = comment
+        comment = ""
+        state = "sectionbody"
+    }
 }