Skip to content

Bug 41065: Cleanup the NSIS script

Pier Angelo Vendrame requested to merge pierov/tor-browser-build:bug_41065 into main

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macos : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : boklm, dan, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

  • Fixed the general styling of the NSIS script
  • Added information about the original authors of the script and corrected the license (the comments were exactly the same as the NSIS examples, as well as the order of the languages, therefore I think we should consider it as derived from NSIS examples)
  • Removed the languages we don't actually support in Tor Browser, added a few new ones, and sorted by language code (in the future we might create some map to populate the list automatically, but I'm wondering about removing the template items and using command line defines -D instead)
  • Added the channel to the application name and default directory for anything that isn't release
  • Since this changes a lot of lines, did a CRLF -> LF (NSIS is happy anyway), --ignore-cr-at-eol will be useful for review 🙂. Probably a --color-moved could also be useful
  • Removed anything about the system installer: we'll need a quite different script, so it'll be easier to have a different file, instead of using a lot of [% IF system_install %]

How Tested

Built a Mullvad Browser testbuild, checked it still installs as expected and that it displays Testbuild for testbuilds.

Merge request reports