mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1816266 - Remove use of $(moztopsrcdir) and friends from Makefiles. r=dandarnell 

$moztopsrcdir is always the same as $topsrcdir. This is a leftover from when
it was posssible to build Thunderbird with comm-central as a parent of
mozilla-central in the local filesystem. It's just confusing to have now.

Differential Revision: https://phabricator.services.mozilla.com/D169564

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Rob Lemley 2023-02-15 19:52:11 +00:00
Родитель b27496b016
Коммит d7fdc4d6bc
10 изменённых файлов: 43 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
mail/Makefile.in
Просмотреть файл

@ -2,8 +2,8 @@
# 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 $(moztopsrcdir)/config/config.mk
include $(moztopsrcdir)/config/rules.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
ifdef MAKENSISU
# For Windows build the uninstaller during the application build since the

8
mail/app/Makefile.in
Просмотреть файл

@ -6,8 +6,8 @@ dist_dest = $(DIST)/$(MOZ_MACBUNDLE_NAME)
AB_CD = $(MOZ_UI_LOCALE)
GRE_MILESTONE = $(shell $(PYTHON3) $(moztopsrcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone)
MOZ_BUILDID = $(shell $(PYTHON3) $(moztopsrcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
GRE_MILESTONE = $(shell $(PYTHON3) $(topsrcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone)
MOZ_BUILDID = $(shell $(PYTHON3) $(topsrcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
# Build a binary bootstrapping with XRE_main
@ -19,7 +19,7 @@ MOZ_WINCONSOLE = 0
endif
endif
include $(moztopsrcdir)/config/config.mk
include $(topsrcdir)/config/config.mk
# If we are trying to show an error dialog about the lack of SSE2 support,
# make sure that code itself doesn't use SSE2.
@ -30,7 +30,7 @@ endif
objdir = $(topobjdir)/comm/mail/app
include $(moztopsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk
ifneq ($(OS_ARCH),WINNT)
ifdef COMPILE_ENVIRONMENT

2
mail/branding/thunderbird/locales/Makefile.in
Просмотреть файл

@ -5,4 +5,4 @@
LOCALE_TOPDIR=$(commtopsrcdir)
LOCALE_RELATIVEDIR=mail/branding/thunderbird/locales
include $(moztopsrcdir)/config/config.mk
include $(topsrcdir)/config/config.mk

25
mail/build.mk
Просмотреть файл

@ -2,36 +2,39 @@
# 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/.
# Note that this file is "included" from $topsrcdir/Makefile.in, therefore
# paths are relative to $topobjdir not the location of this file.
package:
@$(MAKE) -C $(commtopobjdir)/mail/installer
@$(MAKE) -C comm/mail/installer
package-compare:
@$(MAKE) -C $(commtopobjdir)/mail/installer package-compare
@$(MAKE) -C comm/mail/installer package-compare
stage-package:
@$(MAKE) -C $(commtopobjdir)/mail/installer stage-package
@$(MAKE) -C comm/mail/installer stage-package
install::
@$(MAKE) -C $(commtopobjdir)/mail/installer install
@$(MAKE) -C comm/mail/installer install
source-package::
@$(MAKE) -C $(commtopobjdir)/mail/installer source-package
@$(MAKE) -C comm/mail/installer source-package
upload::
@$(MAKE) -C $(commtopobjdir)/mail/installer upload
@$(MAKE) -C comm/mail/installer upload
source-upload::
@$(MAKE) -C $(commtopobjdir)/mail/installer source-upload
@$(MAKE) -C comm/mail/installer source-upload
hg-bundle::
@$(MAKE) -C $(commtopobjdir)/mail/installer hg-bundle
@$(MAKE) -C comm/mail/installer hg-bundle
wget-en-US:
$(MAKE) -C $(commtopobjdir)/mail/locales wget-en-US
$(MAKE) -C comm/mail/locales wget-en-US
merge-% post-merge-% installers-% langpack-% chrome-%:
$(MAKE) -C $(commtopobjdir)/mail/locales $@
$(MAKE) -C comm/mail/locales $@
ifdef ENABLE_TESTS
include $(commtopsrcdir)/mail/testsuite-targets.mk
include $(topsrcdir)/comm/mail/testsuite-targets.mk
endif

2
mail/components/search/mdimporter/Makefile.in
Просмотреть файл

@ -22,5 +22,5 @@ CFLAGS += -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
# We don't need mozglue
WRAP_LDFLAGS :=
include $(moztopsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk

10
mail/installer/Makefile.in
Просмотреть файл

@ -5,7 +5,7 @@
STANDALONE_MAKEFILE := 1
# DIST_SUBDIR := mail # Not sure why TB is not using this
include $(moztopsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
@ -21,12 +21,12 @@ ifdef MOZ_ARTIFACT_BUILDS
MOZ_PKG_FATAL_WARNINGS =
endif
DEFINES += -DPKG_LOCALE_MANIFEST=$(commtopobjdir)/mail/installer/locale-manifest.in
DEFINES += -DPKG_LOCALE_MANIFEST=$(topobjdir)/comm/mail/installer/locale-manifest.in
MOZ_CHROME_LOCALE_ENTRIES=@RESPATH@/chrome/
MOZ_PKG_DUPEFLAGS = \
-f $(srcdir)/allowed-dupes.mn \
-f $(moztopsrcdir)/browser/installer/allowed-dupes.mn \
-f $(topsrcdir)/browser/installer/allowed-dupes.mn \
$(NULL)
MOZ_NONLOCALIZED_PKG_LIST = \
@ -135,7 +135,7 @@ MOZ_PACKAGER_MINIFY=1
NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
UPLOAD_EXTRA_FILES = $(MOZ_BUILT_FROM_FILE)
include $(moztopsrcdir)/toolkit/mozapps/installer/packager.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifeq (Darwin,$(OS_TARGET))
BINPATH = $(_BINPATH)
@ -184,7 +184,7 @@ DEFINES += -DTB_LIBOTR_PREBUILT
endif
libs::
$(MAKE) -C $(commtopobjdir)/mail/locales langpack
$(MAKE) -C $(DEPTH)/comm/mail/locales langpack
ifeq (WINNT,$(OS_ARCH))
PKGCOMP_FIND_OPTS =

12
mail/installer/windows/Makefile.in
Просмотреть файл

@ -2,7 +2,7 @@
# 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 $(moztopsrcdir)/toolkit/mozapps/installer/package-name.mk
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
CONFIG_DIR = instgen
SFX_MODULE = $(commtopsrcdir)/other-licenses/7zstub/thunderbird/7zSD.sfx
@ -30,7 +30,7 @@ BRANDING_FILES = \
LOCALE_TOPDIR=$(commtopsrcdir)
LOCALE_RELATIVEDIR=mail/installer/windows
include $(moztopsrcdir)/config/config.mk
include $(topsrcdir)/config/config.mk
ifdef IS_LANGUAGE_REPACK
PPL_LOCALE_ARGS = \
@ -49,11 +49,11 @@ $(CONFIG_DIR)/setup.exe::
$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
$(PYTHON3) $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(moztopsrcdir) \
$(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
GARBARGE_DIRS += instgen
include $(moztopsrcdir)/config/rules.mk
include $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk

14
mail/locales/Makefile.in
Просмотреть файл

@ -5,7 +5,7 @@
LOCALE_TOPDIR=$(commtopsrcdir)
LOCALE_RELATIVEDIR=mail/locales
include $(moztopsrcdir)/config/config.mk
include $(topsrcdir)/config/config.mk
SUBMAKEFILES += \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
@ -40,12 +40,12 @@ NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
# be included in langpack xpis.
DIST_SUBDIRS = $(DIST_SUBDIR)
include $(moztopsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk
include $(moztopsrcdir)/toolkit/locales/l10n.mk
include $(topsrcdir)/toolkit/locales/l10n.mk
ifeq ($(VCS_CHECKOUT_TYPE),hg)
L10N_CO = $(PYTHON3) $(moztopsrcdir)/comm/python/l10n/l10n_clone/l10n_clone.py $(AB_CD) $(L10NBASEDIR)
L10N_CO = $(PYTHON3) $(topsrcdir)/comm/python/l10n/l10n_clone/l10n_clone.py $(AB_CD) $(L10NBASEDIR)
else
L10N_CO = $(error You need to use hg)
endif
@ -98,11 +98,11 @@ endif
ident:
@printf 'comm_revision '
@$(PYTHON3) $(moztopsrcdir)/config/printconfigsetting.py \
@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
'$(STAGEDIST)/application.ini' App SourceStamp
@printf 'moz_revision '
@$(PYTHON3) $(moztopsrcdir)/config/printconfigsetting.py \
@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
'$(STAGEDIST)/platform.ini' Build SourceStamp
@printf 'buildid '
@$(PYTHON3) $(moztopsrcdir)/config/printconfigsetting.py \
@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
'$(STAGEDIST)/application.ini' App BuildID

4
third_party/Makefile.in поставляемый
Просмотреть файл

@ -3,8 +3,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(moztopsrcdir)/config/config.mk
include $(moztopsrcdir)/config/rules.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
print-%: ; @echo $* is $($*)
origin-%: ; @echo $* origin $(origin $*)

2
third_party/botan/Makefile.in поставляемый
Просмотреть файл

@ -2,7 +2,7 @@
# 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 $(moztopsrcdir)/config/config.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
ifdef COMPILE_ENVIRONMENT