mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 07:45:30 +00:00
aebc0e7f7e
To not merge the en-US language pack, the merge-% steps are in a conditional function that disables that for en-US. Using a function here as that's easier than a shell if in the merge rule, and Makefile conditionals don't get evaluated late enough. To liberate the l10n builds from settings in the automation, we move the patch logic from LOCALE_MERGEDIR to REAL_LOCALE_MERGEDIR. To determine strongly when we're in a repack or building a langpack, the trick here is to export IS_LANGUAGE_REPACK in l10n.mk, and only set that to true in the entry-point rules. Now, we can use that value in config.mk to define the l10n-specific rules. I did the same thing for langpack-%, which allows us to disable the crashreporter files for language packs, for example. With that, make installers-de just works, if you have localizations checked out. For a while, we might run l10n-merge twice in automation, but it's really not optional, so let's just make sure we run it. MozReview-Commit-ID: 3nr33CKxkBQ --HG-- extra : rebase_source : 0605a4adba018fa4b85d563cdafba80b0533bc91
94 lines
3.1 KiB
Makefile
94 lines
3.1 KiB
Makefile
# 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)/toolkit/mozapps/installer/package-name.mk
|
|
|
|
CONFIG_DIR = instgen
|
|
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
|
|
|
|
INSTALLER_FILES = \
|
|
app.tag \
|
|
nsis/installer.nsi \
|
|
nsis/uninstaller.nsi \
|
|
nsis/stub.nsi \
|
|
nsis/shared.nsh \
|
|
stub.tag \
|
|
$(NULL)
|
|
|
|
ifdef MOZ_MAINTENANCE_SERVICE
|
|
INSTALLER_FILES += \
|
|
nsis/maintenanceservice_installer.nsi \
|
|
$(NULL)
|
|
endif
|
|
|
|
BRANDING_FILES = \
|
|
bgstub.bmp \
|
|
branding.nsi \
|
|
firefox64.ico \
|
|
wizHeader.bmp \
|
|
wizHeaderRTL.bmp \
|
|
wizWatermark.bmp \
|
|
$(NULL)
|
|
|
|
include $(topsrcdir)/config/config.mk
|
|
|
|
ifdef IS_LANGUAGE_REPACK
|
|
PPL_LOCALE_ARGS = \
|
|
--l10n-dir=$(REAL_LOCALE_MERGEDIR)/browser/installer \
|
|
--l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \
|
|
--l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \
|
|
$(NULL)
|
|
else
|
|
PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer
|
|
endif
|
|
|
|
OVERRIDE_DEFAULT_GOAL := installer
|
|
installer::
|
|
$(MAKE) -C .. installer-stage
|
|
$(MAKE) $(CONFIG_DIR)/setup.exe
|
|
|
|
# For building the uninstaller during the application build so it can be
|
|
# included for mar file generation.
|
|
uninstaller::
|
|
$(RM) -r $(CONFIG_DIR)
|
|
$(MKDIR) $(CONFIG_DIR)
|
|
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
|
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
|
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
|
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
|
|
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
|
--preprocess-locale $(topsrcdir) \
|
|
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
|
|
|
# For building the maintenanceservice installer
|
|
ifdef MOZ_MAINTENANCE_SERVICE
|
|
maintenanceservice_installer::
|
|
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
|
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
|
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
|
|
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
|
--preprocess-locale $(topsrcdir) \
|
|
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
|
endif
|
|
|
|
$(CONFIG_DIR)/setup.exe::
|
|
$(RM) -r $(CONFIG_DIR)
|
|
$(MKDIR) $(CONFIG_DIR)
|
|
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
|
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
|
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
|
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
|
|
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
|
--preprocess-locale $(topsrcdir) \
|
|
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
|
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
|
--preprocess-single-file $(topsrcdir) \
|
|
$(PPL_LOCALE_ARGS) $(CONFIG_DIR) \
|
|
nsisstrings.properties nsisstrings.nlf
|
|
|
|
GARBARGE_DIRS += instgen
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
|