Bug 1226822 - Backout parts of Bug 1125689, Pack Classic, to fix fallout from Bug 1216371. r=IanN a=ewong in a CLOSED TREE
authorPhilip Chee <philip.chee@gmail.com>
Mon, 23 Nov 2015 08:15:19 +0800
changeset 18625 8d13bd3c9e2d82f09ad6acf7e7c80bff8576c12d
parent 18624 d1b7fb707ff54a171f359562eafbad206c0c10b6
child 18626 7b4727d6db45679bbc26de4fb8a2d679b2e57394
push id11405
push userewong@pw-wspx.org
push dateMon, 23 Nov 2015 00:16:28 +0000
treeherdercomm-central@8d13bd3c9e2d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, ewong
bugs1226822, 1125689, 1216371
Bug 1226822 - Backout parts of Bug 1125689, Pack Classic, to fix fallout from Bug 1216371. r=IanN a=ewong in a CLOSED TREE
suite/app/Makefile.in
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -85,17 +85,17 @@ cd $(ABS_DIST)/$(dir)/; \
 cd ..; rm -rf $(ABS_DIST)/$(dir); \
 fi
 
 endef # do not remove the blank line!
 
 # GUIDs
 # {972ce4c6-7e08-4474-a285-3208198ce6fd} Default theme
 # {e2fda1a4-762b-4020-b5ad-a41df1933103} Lightning
-DONOTPACK = {972ce4c6% {e2fda1a4%
+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"
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -562,20 +562,24 @@
 ; DevTools
 @RESPATH@/chrome/devtools@JAREXT@
 @RESPATH@/chrome/devtools.manifest
 @RESPATH@/@PREF_DIR@/devtools.js
 
 ; classic theme
 @RESPATH@/chrome/classic@JAREXT@
 @RESPATH@/chrome/classic.manifest
+#ifdef MOZ_OMNIJAR
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+#else
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+#endif
 
 ; modern theme
 #ifdef MOZ_OMNIJAR
 @RESPATH@/extensions/modern@themes.mozilla.org.xpi
 #else
 @RESPATH@/extensions/modern@themes.mozilla.org/chrome/modern@JAREXT@
 @RESPATH@/extensions/modern@themes.mozilla.org/chrome.manifest
 @RESPATH@/extensions/modern@themes.mozilla.org/icon.png
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -747,17 +747,25 @@ Throbber-small.gif
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
   @DIR_MACOS@extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
+#ifndef MOZ_OMNIJAR
   @DIR_MACOS@extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+#else
+  @DIR_MACOS@extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
+  @DIR_MACOS@extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
+  @DIR_MACOS@extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+  @DIR_MACOS@extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+  @DIR_MACOS@extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+#endif
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman.jar
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome.manifest
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/venkman-service.js
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/install.rdf
   @DIR_MACOS@extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi