Michael Stefaniuc : tools: Import make_announce changes from the devel tree.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 8e4f7ddcef4a9b2913569e96431fe53c1fb20623
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8e4f7ddcef4a9b2913569e96431fe53...

Author: Michael Stefaniuc 
Date:   Mon Nov  7 18:17:11 2022 +0100

tools: Import make_announce changes from the devel tree.

Partial cherry-pick of a1af412482d36c4046061faa676ff7bc774f40eb
Changes by Alexandre Julliard.

Signed-off-by: Michael Stefaniuc

---

tools/make_announce | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/make_announce b/tools/make_announce
index b38b7b0a70a..cd61cbb6bce 100755
--- a/tools/make_announce
+++ b/tools/make_announce
@@ -144,24 +144,20 @@ print NEW "----------------------------------------------------------------\n\n"
 printf NEW "Bugs fixed in %s (total %u):\n\n", $new, scalar( keys %bugs );
 foreach my $id (sort {$a <=> $b} keys %bugs)
 {
-    printf NEW " %6d  %s\n", $id, unescape( $bugs{$id} );
+    printf NEW " - #%-6d %s\n", $id, unescape( $bugs{$id} );
 }

print NEW "\n----------------------------------------------------------------\n\n";
-print NEW "Changes since $old:\n\n";
+print NEW "Changes since $old:\n";

open LOG, "-|" or exec "git", "shortlog", "wine-$old..HEAD" or die "cannot run git shortlog";
 while (<LOG>)
 {
-    if (/^(\S.*)\s(\d+):$/) { $authors{$1} = 1; }
+    next if /^$/;
+    if (/^(\S.*)\s(\d+):$/) { $authors{$1} = 1; print NEW "\n"; }
     print NEW $_;
 }
 close LOG;
-
-while (<ANNOUNCE>) { last if /^--$/; }
-print NEW "--\n";
-while (<ANNOUNCE>) { print NEW $_; }
-
 close ANNOUNCE;
 close NEW;
 update_file( "ANNOUNCE" );