Bug 1265130 fix bustage in 'make package' for extensions due to removal of MOZ_OMNIJAR (in Bug 1256979). Use MOZ_PACKAGER_FORMAT==omni instead r=IanN a=Ratty
authorPhilip Chee <philip.chee@gmail.com>
Mon, 25 Apr 2016 01:25:51 +0800
changeset 24849 d0f24d25360654b65343ed6feffebae05d3e0d9e
parent 24848 dfbfdf30f1ca8e96d18b075938bd7ce27bab0481
child 24850 0dc66f3da4481e5f4c8c37de1179f1155991ce47
push id1657
push userclokep@gmail.com
push dateMon, 06 Jun 2016 19:50:21 +0000
treeherdercomm-beta@9fac989284b5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, Ratty
bugs1265130, 1256979
Bug 1265130 fix bustage in 'make package' for extensions due to removal of MOZ_OMNIJAR (in Bug 1256979). Use MOZ_PACKAGER_FORMAT==omni instead r=IanN a=Ratty
suite/app/Makefile.in
suite/installer/Makefile.in
suite/locales/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -62,17 +62,17 @@ ifneq (,$(filter-out WINNT Darwin,$(OS_A
 
 libs:: $(MOZ_APP_NAME).1
 	$(INSTALL) $< $(DIST)/man/man1
 
 GARBAGE += $(MOZ_APP_NAME).1
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, browser-prefs.js)
 endif
 
-ifdef MOZ_OMNIJAR
+ifeq ($(MOZ_PACKAGER_FORMAT),omni)
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # Extensions that appear in dist/bin/extensions will get bundled with the
 # application, ones that appear in dist/bin/distribution/extensions will be
 # copied to the profile in installed builds.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
 
 ABS_STAGE = $(abspath $(STAGEDIST))
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -176,16 +176,20 @@ DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_IC
 DEFINES += -DICU_DATA_FILE=$(ICU_DATA_FILE)
 ifdef CLANG_CXX
 DEFINES += -DCLANG_CXX
 endif
 ifdef CLANG_CL
 DEFINES += -DCLANG_CL
 endif
 
+ifeq ($(MOZ_PACKAGER_FORMAT),omni)
+DEFINES += -DMOZ_OMNIJAR=1
+endif
+
 libs::
 	$(MAKE) -C $(DEPTH)/suite/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =
 else
 PKGCOMP_FIND_OPTS = -L
 endif
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -160,17 +160,17 @@ clobber-zip:
 	  $(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)
-ifdef MOZ_OMNIJAR
+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)