52347eb134
There's a lot here. The main thing is that rather than invoking `INNER_UNMAKE_PACKAGE`, we use the new `mach artifact install --unfiltered-project-package` flag to do that work. In automation, this gets configured using `MOZ_ARTIFACT_TASK` and is deterministic; locally, this is far easier to work with. This replacement allows us to clean up a bunch of Makefile goo, some of which is done here. More clean up is surely possible; the `mozharness` config files are a good place to look next. The `MOZ_PKG_MAC_*` settings previously referred to the unpacked DMG resources. There's no need for that complication; we can always take them from the branding resources. (The relevant `mozconfig` entries *look* to always have Nightly branding, but merge automation ensures that the branding is correctly set for Beta and Release.) Differential Revision: https://phabricator.services.mozilla.com/D249448
87 lines
3.0 KiB
Makefile
87 lines
3.0 KiB
Makefile
# vim:set ts=8 sw=8 sts=8 noet:
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
include $(topsrcdir)/config/config.mk
|
|
|
|
|
|
SUBMAKEFILES += \
|
|
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
|
|
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
|
|
$(NULL)
|
|
|
|
# This makefile uses variable overrides from the l10n-% target to
|
|
# build non-default locales to non-default dist/ locations. Be aware!
|
|
|
|
PWD := $(CURDIR)
|
|
|
|
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
|
|
|
|
ifdef MOZ_DEV_EDITION
|
|
MOZ_LANGPACK_EID=langpack-$(AB_CD)@devedition.mozilla.org
|
|
else
|
|
MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org
|
|
endif
|
|
|
|
# Required for l10n.mk - defines a list of app sub dirs that should
|
|
# be included in langpack xpis.
|
|
DIST_SUBDIRS = $(DIST_SUBDIR)
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
include $(topsrcdir)/toolkit/locales/l10n.mk
|
|
|
|
l10n-%: AB_CD=$*
|
|
l10n-%:
|
|
$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
|
|
$(NSINSTALL) -D $(DIST)/install
|
|
@$(MAKE) -C ../themes/shared/app-marketplace-icons AB_CD=$* XPI_NAME=locale-$*
|
|
@$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
|
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
|
|
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
|
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
|
@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
|
|
@$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
|
|
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
chrome-%: AB_CD=$*
|
|
chrome-%: IS_LANGUAGE_REPACK=1
|
|
chrome-%:
|
|
$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
|
|
@$(MAKE) -C ../themes/shared/app-marketplace-icons chrome AB_CD=$*
|
|
@$(MAKE) -C ../../toolkit/locales chrome-$*
|
|
@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
|
|
@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
|
|
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
|
|
@$(MAKE) chrome AB_CD=$*
|
|
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
|
|
|
|
package-win32-installer: $(SUBMAKEFILES)
|
|
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
|
|
|
langpack: langpack-$(AB_CD)
|
|
|
|
# This is a generic target that will make a langpack, repack ZIP (+tarball)
|
|
# builds, and repack an installer if applicable. It is called from the
|
|
# tinderbox scripts. Alter it with caution.
|
|
|
|
installers-%: IS_LANGUAGE_REPACK=1
|
|
installers-%:
|
|
@$(MAKE) clobber-$*
|
|
@$(MAKE) l10n-$*
|
|
@$(MAKE) package-langpack-$*
|
|
@$(MAKE) repackage-zip-$*
|
|
ifeq (WINNT,$(OS_ARCH))
|
|
@$(MAKE) package-win32-installer AB_CD=$*
|
|
endif
|
|
@echo 'repackaging done'
|
|
|
|
ident:
|
|
@printf 'fx_revision '
|
|
@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
|
|
'$(STAGEDIST)'/application.ini App SourceStamp
|
|
@printf 'buildid '
|
|
@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
|
|
'$(STAGEDIST)'/application.ini App BuildID
|