Fixing changelog generation
authorKlaus Ethgen <Klaus@Ethgen.de>
Sun, 29 Oct 2017 12:39:18 +0000 (13:39 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sun, 29 Oct 2017 13:31:10 +0000 (14:31 +0100)
.gitignore
.mailmap
gen_changelog.sh

index 8654fd2..c123109 100644 (file)
@@ -84,3 +84,5 @@ Makefile.in
 
 # That two files are autocreated(!)
 /src/gq-marshal.[ch]
+ChangeLog.html
+README.html
index c6eb36e..5dadf80 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,6 @@
 <xsdg@xsdg.org> <xsdg@google.com>
-<cclark@mcb.net> <colin.clark@cclark.uk>
-Colin Clark <cclark@mcb.net>
+<colin.clark@cclark.uk> <cclark@mcb.net>
+Colin Clark <colin.clark@cclark.uk>
 <johne@verizon.net> John Ellis <gqview@users.sf.net>
 <zas@norz.org> Laurent Monin <geeqie@norz.org>
 <mschwendt@fedoraproject.org> <mschwendt@gmail.com>
index 2a6325c..fdb415c 100755 (executable)
@@ -12,7 +12,7 @@
 [ ! -x "$(command -v git)" ] && exit 0
 
 tail -6614 ChangeLog > ChangeLog.$$.old && \
-LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \
+LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \
 cat ChangeLog.$$.old >> ChangeLog.$$.new && \
 mv -f ChangeLog ChangeLog.bak && \
 mv -f ChangeLog.$$.new ChangeLog
@@ -20,11 +20,18 @@ mv -f ChangeLog.$$.new ChangeLog
 rm -f ChangeLog.$$.old
 
 
-echo "<textarea rows='6615' cols='100'" >ChangeLog.$$.old.html && \
-tail -6618 ChangeLog >> ChangeLog.$$.old.html && \
-echo "</textarea" >>ChangeLog.$$.old.html && \
-LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --date=format:'%Y-%m-%d' --no-follow  --pretty=format:"<li><a href=\"http://github.com/BestImageViewer/Geeqie/commit/%H\">view commit </a></li> <para>Author: %an<br>Date: %ad<br><textarea rows=4 cols=100>%s %n%n%b</textarea><br><br></para>" > ChangeLog.$$.new.html && \
-cat ChangeLog.$$.old.html >> ChangeLog.$$.new.html
+echo "<textarea rows='6614' cols='100'>" >ChangeLog.$$.old.html && \
+tail -6613 ChangeLog >> ChangeLog.$$.old.html && \
+echo "</textarea>" >>ChangeLog.$$.old.html && \
+echo "<html>" > ChangeLog.$$.new.html && \
+echo "<body>" >> ChangeLog.$$.new.html && \
+echo "<ul>" >> ChangeLog.$$.new.html && \
+LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --date=format:'%Y-%m-%d' --no-follow --use-mailmap --pretty=format:"<li><a href=\"http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=%H\">view commit </a></li><p>Author: %aN<br>Date: %ad<br><textarea rows=4 cols=100>%s %n%n%b</textarea><br><br></p>" 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD >> ChangeLog.$$.new.html && \
+echo "" >> ChangeLog.$$.new.html && \
+cat ChangeLog.$$.old.html >> ChangeLog.$$.new.html && \
+echo "</ul>" >> ChangeLog.$$.new.html && \
+echo "</body>" >> ChangeLog.$$.new.html && \
+echo "</html>" >> ChangeLog.$$.new.html
 [ -e ChangeLog.html ] && mv -f ChangeLog.html ChangeLog.html.bak
 mv -f ChangeLog.$$.new.html ChangeLog.html