The branch master has been updated
via ba28d8470fba25cac99a94b7b9fa27bddbd1622a (commit)
via 52f4b4da8deb49a0c4229951265f40223a286c7f (commit)
via b11a6c4a822ce76e1061fdf2626fc20c673c4676 (commit)
via 860c1786061372ffe7225e5a1a9e89d90630b802 (commit)
from d1915ac75ca02f62e91e72d530515df030103253 (commit)
- Log -----------------------------------------------------------------
commit ba28d8470fba25cac99a94b7b9fa27bddbd1622a
Author: Richard Levitte <[email protected]>
Date: Sat Mar 24 16:27:49 2018 +0100
mk-notes: slight change to include unreleased stuff from other branches
commit 52f4b4da8deb49a0c4229951265f40223a286c7f
Author: Jonathan Champ <[email protected]>
Date: Fri Mar 23 18:49:18 2018 -0400
mk-notes: Find all sections; only print released
commit b11a6c4a822ce76e1061fdf2626fc20c673c4676
Author: Jonathan Champ <[email protected]>
Date: Fri Mar 23 17:08:54 2018 -0400
mk-notes: Allow 'under development' version
commit 860c1786061372ffe7225e5a1a9e89d90630b802
Author: Richard Levitte <[email protected]>
Date: Sat Mar 24 16:15:25 2018 +0100
Make news/cl111.txt as well
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
bin/mk-notes | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 27e4609..d53b50c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ SIMPLE = newsflash.inc sitemap.txt \
community/committers.inc \
docs/faq.inc docs/fips.inc \
news/changelog.inc news/changelog.txt \
- news/cl102.txt news/cl110.txt \
+ news/cl102.txt news/cl110.txt news/cl111.txt \
news/openssl-1.0.2-notes.inc \
news/openssl-1.1.0-notes.inc \
news/openssl-1.1.1-notes.inc \
diff --git a/bin/mk-notes b/bin/mk-notes
index 66c5937..75562ef 100755
--- a/bin/mk-notes
+++ b/bin/mk-notes
@@ -8,12 +8,21 @@ my $copy = 0;
my $in_ul = 0;
while ( <STDIN> ) {
chomp;
- if (/^\s*(Major changes between|Known issues in).*(\d+\.\d+\.\d+)\D.*\[(in
pre-release|\d+\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d+)\]:?$/)
{
+ if (/^\s*(Major changes between|Known issues
in).*(\d+\.\d+\.\d+)\D.*\[(.*)\]:?$/) {
+ my $release_series = $2;
+ my $release_date = $3;
+ if ($release_date !~ /^in
pre-release|\d+\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d+$/) {
+ # The rationale to not simply stop when encountering another title
+ # line is that it's unreleased stuff that also exist in another
+ # series, but is also part of this one and should therefore be
+ # included.
+ next;
+ }
if ($in_ul) {
print "</ul>\n";
$in_ul = 0;
}
- if ($2 eq $SERIES) {
+ if ($release_series eq $SERIES) {
print "<h3>";
print;
print "</h3>\n";
@@ -36,4 +45,7 @@ while ( <STDIN> ) {
print;
}
}
-print "</ul>";
+if ($in_ul) {
+ print "</ul>\n";
+ $in_ul = 0;
+}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
