Bug 1585411 - Port Bug 1452120 "Remove unpacked lightning extension on upgrade" to SeaMonkey. r=IanN a=IanN
authorFrank-Rainer Grahl frgrahl@gmx.net
Tue, 01 Oct 2019 21:44:12 +0200
changeset 32323 dbe6ee7d827e62c908787c1cad911ccb8eddc881
parent 32322 e71c6693877fc37d1d3da784cac30a8c6d398406
child 32324 c96ba7897e0a58e2ca4bd0086165801fdff2e8cc
push id221
push userfrgrahl@gmx.net
push dateTue, 01 Oct 2019 19:44:43 +0000
treeherdercomm-esr60@dbe6ee7d827e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1585411, 1452120
Bug 1585411 - Port Bug 1452120 "Remove unpacked lightning extension on upgrade" to SeaMonkey. r=IanN a=IanN
suite/app/Makefile.in
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -93,19 +93,18 @@ if test -d "$(ABS_STAGE)/$(dir)"; then \
 cd $(ABS_STAGE)/$(dir)/; \
 $(ZIP) -r9mX ../$(dir).xpi * -x \*/.mkdir.done; \
 cd ..; rm -rf $(ABS_STAGE)/$(dir); \
 fi
 
 endef # do not remove the blank line!
 
 # GUIDs
-# {972ce4c6-7e08-4474-a285-3208198ce6fd} Default theme
-# {e2fda1a4-762b-4020-b5ad-a41df1933103} Lightning
-DONOTPACK = {e2fda1a4%
+# Unused for now. All extensions are being packed.
+DONOTPACK = {9999999%
 
 pack-ext: $(STAGEDIST)
 	@echo "Packaging extensions..."
 	$(foreach dir,$(filter-out $(DONOTPACK),$(subst $(STAGEDIST)/,,$(wildcard $(STAGEDIST)/*))),$(_PACKAGE_EXTENSIONS))
 
 tools::
 	$(NSINSTALL) -D $(DIST)/bin/distribution/extensions
 	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -877,13 +877,13 @@ man/*
 [debugqa]
 #ifdef MOZ_PACKAGE_DEBUGQA
 @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #endif
 
 #ifdef MOZ_CALENDAR
 [calendar]
 #ifdef NIGHTLY_BUILD
-@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
 #else
-@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
 #endif
 #endif
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -234,16 +234,26 @@ extensions/p@m/components/palmsync.dll
 extensions/p@m/components/palmsync.xpt
 extensions/p@m/defaults/preferences/palmsync.js
 extensions/p@m/install.rdf
 extensions/p@m/mozABConduit.dll
 #endif
 @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
 @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/components.list
 @DIR_MACOS@extensions/inspector@mozilla.org/components/components.list
+
+# Remove unpacked lightning extension.
+# Depending on the previous installed version it might reside in one of two
+# different places.
+@DIR_RESOURCES@extensions/
+@DIR_RESOURCES@extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/*
+@DIR_RESOURCES@distribution/
+@DIR_RESOURCES@distribution/extensions/
+@DIR_RESOURCES@distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/*
+
 #ifdef UNIX_BUT_NOT_MAC
 gfxpsshar@DLL_SUFFIX@
 #endif
 @DIR_MACOS@@DLL_PREFIX@gfxutils@DLL_SUFFIX@
 #ifdef XP_WIN
 gksvggdiplus.dll
 #endif
 @DIR_MACOS@greprefs/all.js