commit 0f6ebe396fad0834388fd2424218582b32493816 Author: Sukhbir Singh sukhbir@torproject.org Date: Tue Jun 12 22:02:03 2018 -0400
Bug 26205: Don't build the uninstaller for Windows during Firefox compilation --- projects/firefox/build | 4 ++ projects/firefox/config | 2 + projects/firefox/nsis-uninstall.patch | 73 +++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+)
diff --git a/projects/firefox/build b/projects/firefox/build index 09620ae..1b3a0d0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -136,6 +136,10 @@ fi patch -p1 < $rootdir/STL_win64.patch [% END -%]
+[% IF c("var/windows") %] + patch -p1 < $rootdir/nsis-uninstall.patch +[% END -%] + [% IF c("var/osx") %] patch -p1 < $rootdir/no-dmg.patch [% END -%] diff --git a/projects/firefox/config b/projects/firefox/config index 120ad35..9d0829d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -106,6 +106,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' + - filename: nsis-uninstall.patch + enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm diff --git a/projects/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch new file mode 100644 index 0000000..765ef67 --- /dev/null +++ b/projects/firefox/nsis-uninstall.patch @@ -0,0 +1,73 @@ +From 4ef264b601ac92a0b385c40bd011ef94618a176a Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh sukhbir@torproject.org +Date: Tue, 12 Jun 2018 21:58:24 -0400 +Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during + Firefox compilation + +--- + browser/Makefile.in | 4 ---- + browser/installer/Makefile.in | 4 ---- + .../mozbuild/mozbuild/repackaging/installer.py | 17 +---------------- + 3 files changed, 1 insertion(+), 24 deletions(-) + +diff --git a/browser/Makefile.in b/browser/Makefile.in +index 2eb9e708f68e..0c9442183942 100644 +--- a/browser/Makefile.in ++++ b/browser/Makefile.in +@@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk + + ifdef MAKENSISU + +-# For Windows build the uninstaller during the application build since the +-# uninstaller is included with the application for mar file generation. +-libs:: +- $(MAKE) -C installer/windows uninstaller + ifdef MOZ_MAINTENANCE_SERVICE + $(MAKE) -C installer/windows maintenanceservice_installer + endif +diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in +index 1bf11252ee06..dee6d5434106 100644 +--- a/browser/installer/Makefile.in ++++ b/browser/installer/Makefile.in +@@ -98,10 +98,6 @@ ifdef NECKO_WIFI + DEFINES += -DNECKO_WIFI + endif + +-ifdef MAKENSISU +-DEFINES += -DHAVE_MAKENSISU=1 +-endif +- + ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore + MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png +diff --git a/python/mozbuild/mozbuild/repackaging/installer.py b/python/mozbuild/mozbuild/repackaging/installer.py +index 9b49eb555153..1e6f6e73c3d8 100644 +--- a/python/mozbuild/mozbuild/repackaging/installer.py ++++ b/python/mozbuild/mozbuild/repackaging/installer.py +@@ -27,22 +27,7 @@ def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name, + tmpdir = tempfile.mkdtemp() + old_cwd = os.getcwd() + try: +- if package: +- z = zipfile.ZipFile(package) +- z.extractall(tmpdir) +- z.close() +- +- # Copy setup.exe into the root of the install dir, alongside the +- # package. +- shutil.copyfile(setupexe, mozpath.join(tmpdir, mozpath.basename(setupexe))) +- +- # archive_exe requires us to be in the directory where the package is +- # unpacked (the tmpdir) +- os.chdir(tmpdir) +- +- sfx_package = mozpath.join(topsrcdir, sfx_stub) +- +- archive_exe(package_name, tag, sfx_package, output) ++ pass + + finally: + os.chdir(old_cwd) +-- +2.17.1 +