Bug 1294433 - Fix repacks to remove extensions. r=IanN a=ewong SEA_COMM490_20160927_RELBRANCH SEAMONKEY_2_46_BUILD7
authorFrank-Rainer Grahl <frgrahl@gmx.net
Tue, 06 Dec 2016 09:44:10 +0800
branchSEA_COMM490_20160927_RELBRANCH
changeset 31364 2229823cdfa83745335eb45860571daf1f6fce93
parent 31361 e7b567232679c37b3af209864f35e5e94871becd
child 31365 bb80a0a78259ec72ddece9fbbe147071baa106ef
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, ewong
bugs1294433
Bug 1294433 - Fix repacks to remove extensions. r=IanN a=ewong
suite/app/Makefile.in
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/macosx-universal/release
suite/config/mozconfigs/win32/release
suite/confvars.sh
suite/installer/package-manifest.in
suite/locales/Makefile.in
suite/locales/l10n.ini
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -76,34 +76,33 @@ ifeq ($(MOZ_PACKAGER_FORMAT),omni)
 # if this was done right away for built-in extensions in omnijar mode.
 
 ABS_STAGE = $(abspath $(STAGEDIST))
 
 define _PACKAGE_EXTENSIONS
 @echo "Packaging $(dir).xpi..."
 if test -d "$(ABS_STAGE)/$(dir)"; then \
 cd $(ABS_STAGE)/$(dir)/; \
-$(ZIP) -r9mX ../$(dir).xpi * -x \*/.mkdir.done; \
+$(ZIP) -Dr9mX ../$(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%
 
 pack-ext: $(STAGEDIST)
 	@echo "Packaging extensions..."
 	$(foreach dir,$(filter-out $(DONOTPACK),$(subst $(STAGEDIST)/,,$(wildcard $(STAGEDIST)/*))),$(_PACKAGE_EXTENSIONS))
 
 tools::
 	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
-	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/distribution/extensions"
 
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Anything below the above ifdef won't be included in mac builds. So be very
 # careful what you add here.
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,13 +1,12 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-calendar
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,13 +1,12 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-calendar
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
--- a/suite/config/mozconfigs/macosx-universal/release
+++ b/suite/config/mozconfigs/macosx-universal/release
@@ -10,17 +10,16 @@ fi
 # Make sure Lightning is also unified, this needs to happen before including
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,15 +1,14 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
-ac_add_options --enable-calendar
 ac_add_options --enable-require-all-d3dc-versions
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -8,17 +8,17 @@ MOZ_APP_VENDOR=Mozilla
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_LDAP_XPCOM=1
 MOZ_COMPOSER=1
 MOZ_DISABLE_EXPORT_JS=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
-MOZ_EXTENSIONS_DEFAULT=" inspector irc gio"
+MOZ_EXTENSIONS_DEFAULT=" gio"
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_HELP_VIEWER=1
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -896,72 +896,18 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/llvm-symbolizer
 #endif
 #endif
 
 #if defined(MOZ_ASAN) && defined(CLANG_CL)
 @BINPATH@/clang_rt.asan_dynamic-i386.dll
 #endif
 
-[chatzilla]
-#ifdef MOZ_OMNIJAR
-@RESPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
-#else
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
-#ifdef MOZ_GTK
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
-#elifdef XP_WIN32
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
-#endif
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
-@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
-#endif
-#ifdef LOCALE_BUILD
-#ifdef MOZ_OMNIJAR
-@RESPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
-#else
-@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
-@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
-@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
-@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
-#endif
-#endif
-
-[inspector]
-#ifdef MOZ_OMNIJAR
-@RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
-#else
-@RESPATH@/extensions/inspector@mozilla.org/install.rdf
-@RESPATH@/extensions/inspector@mozilla.org/chrome.manifest
-@RESPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
-#ifdef MOZ_GTK
-@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
-@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
-#elifdef XP_WIN32
-@RESPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
-#endif
-@RESPATH@/extensions/inspector@mozilla.org/components/components.list
-@RESPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
-@RESPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
-#endif
-
 [debugqa]
 #ifdef MOZ_PACKAGE_DEBUGQA
 #ifdef MOZ_OMNIJAR
 @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #else
 @RESPATH@/extensions/debugQA@mozilla.org/install.rdf
 @RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
 @RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
 #endif
 #endif
-
-#ifdef MOZ_CALENDAR
-[calendar]
-#ifdef NIGHTLY_BUILD
-@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
-#else
-@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
-#endif
-#endif
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -159,20 +159,18 @@ clobber-zip:
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD) \
 	  $(STAGEDIST)/extensions/langpack-$(AB_CD)@* \
 	  $(STAGEDIST)/distribution/extensions/langpack-$(AB_CD)@* \
 
 repackage-zip: repackage-extensions
 
 repackage-extensions: $(STAGEDIST)
-	$(MAKE) -C $(DEPTH)/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
 ifeq ($(MOZ_PACKAGER_FORMAT),omni)
 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/extensions;
-	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/distribution/extensions;
 endif
 
 repackage-zip-%: $(call ESCAPE_WILDCARD,$(ZIP_IN)) $(STAGEDIST) libs-%
 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
 
 langpack: langpack-$(AB_CD)
 
 ifdef MOZ_UPDATER
@@ -242,27 +240,25 @@ calendar-wget-en-US:
 calendar-unpack:
 	$(run-calendar-rule)
 calendar-upload:
 	$(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
 
 # Hook into l10n.mk, providing extra arguments to l10n-repack.py
 ifdef NIGHTLY_BUILD
 MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
-else
-MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
 endif
 
 # Hook calendar targets to the mail non-pattern rules
 wget-en-US: calendar-wget-en-US
 unpack: calendar-unpack
 upload: calendar-upload
 
 # Hook into the pattern rules, this will be used later on in the installers-% target.
 CALENDAR_INSTALLERS_TARGETS = calendar-merge-% calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
 endif
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack and installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
-INSTALLERS_TARGETS = clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
+INSTALLERS_TARGETS = clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
 installers-%: $(INSTALLERS_TARGETS)
 	@echo 'repackaging done'
--- a/suite/locales/l10n.ini
+++ b/suite/locales/l10n.ini
@@ -13,18 +13,17 @@ dirs = suite
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 services_sync = mozilla/services/sync/locales/l10n.ini
 
 [extras]
-dirs = mozilla/extensions/inspector
-    mozilla/extensions/spellcheck
+dirs = mozilla/extensions/spellcheck
 
 [include_toolkit]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
 
 [include_services_sync]