richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: c5bfcc1a by Richard Pospesel at 2023-06-23T17:05:58+00:00 ChangeLog.txt updates

- migrated Docs-PB to Docs-MB in browser project - updated browser build script to take new path into account - created separate ChangeLog-MB.txt softlink, migrate ChangeLog.txt softlink to ChangeLog-TBB.txt - updated changelog-format-blog-post script to reference correct file and fix bug in raw changelog link

- - - - -

6 changed files:

- + ChangeLog-MB.txt - ChangeLog.txt → ChangeLog-TBB.txt - + projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt - projects/browser/build - tools/changelog-format-blog-post

Changes:

===================================== ChangeLog-MB.txt ===================================== @@ -0,0 +1 @@ +projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt \ No newline at end of file

===================================== ChangeLog.txt → ChangeLog-TBB.txt =====================================

===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt =====================================

===================================== projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt =====================================

===================================== projects/browser/build ===================================== @@ -241,7 +241,7 @@ do [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \ -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x [% ELSIF c("var/mullvad-browser") -%] - cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH" + cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH" [% END -%] done

===================================== tools/changelog-format-blog-post ===================================== @@ -12,7 +12,7 @@ sub version_type {

my ($changelog, $current_tbversion, $last_tbversion);

-if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog.txt")) { +if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog-TBB.txt")) { print STDERR "Error opening changelog file\n"; exit 1; } @@ -49,6 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) { my @v = split(/./, $current_tbversion); $changelog_branch = "maint-$v[0].$v[1]"; } -print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$chan...) is:\n\n"; +print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$chan...) is:\n\n";

print $changelog;

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c5...