kamp
/
RetroZilla
mirror of https://github.com/rn10950/RetroZilla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix regenerating .mozconfig.mk

This commit is contained in:
roytam1 2018-05-01 13:11:22 +08:00
parent 8767d2e59c
commit 550ebdaee7
1 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
client.mk
View File

@ -41,7 +41,7 @@
# Build a mozilla application. # Build a mozilla application.
# #
# To checkout and build a tree, # To checkout and build a tree,
# 1. cvs co mozilla/client.mk # 1. cvs co RetroZilla/client.mk
# 2. cd mozilla # 2. cd mozilla
# 3. create your .mozconfig file with # 3. create your .mozconfig file with
# mk_add_options MOZ_CO_PROJECT=suite,browser,mail,minimo,xulrunner # mk_add_options MOZ_CO_PROJECT=suite,browser,mail,minimo,xulrunner
@ -67,9 +67,9 @@
# macbrowser (aka Camino) # macbrowser (aka Camino)
# #
# Other common MOZ_CO_MODULE options include the following: # Other common MOZ_CO_MODULE options include the following:
# mozilla/other-licenses/libart_lgpl # RetroZilla/other-licenses/libart_lgpl
# mozilla/other-licenses/bsdiff # RetroZilla/other-licenses/bsdiff
# mozilla/tools/codesighs # RetroZilla/tools/codesighs
# #
# Other targets (gmake -f client.mk [targets...]), # Other targets (gmake -f client.mk [targets...]),
# checkout # checkout
@ -116,20 +116,20 @@ AVAILABLE_PROJECTS = \
MODULES_core := \ MODULES_core := \
SeaMonkeyAll \ SeaMonkeyAll \
mozilla/browser/config/version.txt \ RetroZilla/browser/config/version.txt \
mozilla/mail/config/version.txt \ RetroZilla/mail/config/version.txt \
mozilla/calendar/sunbird/config/version.txt \ RetroZilla/calendar/sunbird/config/version.txt \
mozilla/ipc/ipcd \ RetroZilla/ipc/ipcd \
mozilla/modules/libpr0n \ RetroZilla/modules/libpr0n \
mozilla/modules/libmar \ RetroZilla/modules/libmar \
mozilla/modules/libbz2 \ RetroZilla/modules/libbz2 \
mozilla/accessible \ RetroZilla/accessible \
mozilla/security/manager \ RetroZilla/security/manager \
mozilla/toolkit \ RetroZilla/toolkit \
mozilla/storage \ RetroZilla/storage \
mozilla/db/sqlite3 \ RetroZilla/db/sqlite3 \
mozilla/db/morkreader \ RetroZilla/db/morkreader \
mozilla/tools/test-harness \ RetroZilla/tools/test-harness \
$(NULL) $(NULL)
LOCALES_core := \ LOCALES_core := \
@ -139,7 +139,7 @@ LOCALES_core := \
MODULES_toolkit := \ MODULES_toolkit := \
$(MODULES_core) \ $(MODULES_core) \
mozilla/chrome \ RetroZilla/chrome \
$(NULL) $(NULL)
LOCALES_toolkit := \ LOCALES_toolkit := \
@ -150,7 +150,7 @@ LOCALES_toolkit := \
MODULES_suite := \ MODULES_suite := \
$(MODULES_core) \ $(MODULES_core) \
mozilla/suite \ RetroZilla/suite \
$(NULL) $(NULL)
LOCALES_suite := \ LOCALES_suite := \
@ -159,9 +159,9 @@ LOCALES_suite := \
MODULES_browser := \ MODULES_browser := \
$(MODULES_toolkit) \ $(MODULES_toolkit) \
mozilla/browser \ RetroZilla/browser \
mozilla/other-licenses/branding/firefox \ RetroZilla/other-licenses/branding/firefox \
mozilla/other-licenses/7zstub/firefox \ RetroZilla/other-licenses/7zstub/firefox \
$(NULL) $(NULL)
LOCALES_browser := \ LOCALES_browser := \
@ -172,11 +172,11 @@ LOCALES_browser := \
other-licenses/branding/firefox \ other-licenses/branding/firefox \
$(NULL) $(NULL)
BOOTSTRAP_browser := mozilla/browser/config/mozconfig BOOTSTRAP_browser := RetroZilla/browser/config/mozconfig
MODULES_minimo := \ MODULES_minimo := \
$(MODULES_toolkit) \ $(MODULES_toolkit) \
mozilla/minimo \ RetroZilla/minimo \
$(NULL) $(NULL)
LOCALES_minimo := \ LOCALES_minimo := \
@ -186,9 +186,9 @@ LOCALES_minimo := \
MODULES_mail := \ MODULES_mail := \
$(MODULES_toolkit) \ $(MODULES_toolkit) \
mozilla/mail \ RetroZilla/mail \
mozilla/other-licenses/branding/thunderbird \ RetroZilla/other-licenses/branding/thunderbird \
mozilla/other-licenses/7zstub/thunderbird \ RetroZilla/other-licenses/7zstub/thunderbird \
$(NULL) $(NULL)
LOCALES_mail := \ LOCALES_mail := \
@ -199,20 +199,20 @@ LOCALES_mail := \
extensions/spellcheck \ extensions/spellcheck \
$(NULL) $(NULL)
BOOTSTRAP_mail := mozilla/mail/config/mozconfig BOOTSTRAP_mail := RetroZilla/mail/config/mozconfig
MODULES_composer := \ MODULES_composer := \
$(MODULES_toolkit) \ $(MODULES_toolkit) \
mozilla/composer \ RetroZilla/composer \
$(NULL) $(NULL)
MODULES_calendar := \ MODULES_calendar := \
$(MODULES_toolkit) \ $(MODULES_toolkit) \
mozilla/storage \ RetroZilla/storage \
mozilla/db/sqlite3 \ RetroZilla/db/sqlite3 \
mozilla/calendar \ RetroZilla/calendar \
mozilla/other-licenses/branding/sunbird \ RetroZilla/other-licenses/branding/sunbird \
mozilla/other-licenses/7zstub/sunbird \ RetroZilla/other-licenses/7zstub/sunbird \
$(NULL) $(NULL)
LOCALES_calendar := \ LOCALES_calendar := \
@ -221,35 +221,35 @@ LOCALES_calendar := \
other-licenses/branding/sunbird \ other-licenses/branding/sunbird \
$(NULL) $(NULL)
BOOTSTRAP_calendar := mozilla/calendar/sunbird/config/mozconfig BOOTSTRAP_calendar := RetroZilla/calendar/sunbird/config/mozconfig
MODULES_xulrunner := \ MODULES_xulrunner := \
$(MODULES_toolkit) \ $(MODULES_toolkit) \
mozilla/xulrunner \ RetroZilla/xulrunner \
$(NULL) $(NULL)
LOCALES_xulrunner := \ LOCALES_xulrunner := \
$(LOCALES_toolkit) \ $(LOCALES_toolkit) \
$(NULL) $(NULL)
BOOTSTRAP_xulrunner := mozilla/xulrunner/config/mozconfig BOOTSTRAP_xulrunner := RetroZilla/xulrunner/config/mozconfig
MODULES_macbrowser := \ MODULES_macbrowser := \
$(MODULES_core) \ $(MODULES_core) \
mozilla/camino \ RetroZilla/camino \
$(NULL) $(NULL)
BOOTSTRAP_macbrowser := mozilla/camino/config/mozconfig BOOTSTRAP_macbrowser := RetroZilla/camino/config/mozconfig
MODULES_all := \ MODULES_all := \
mozilla/other-licenses/bsdiff \ RetroZilla/other-licenses/bsdiff \
mozilla/other-licenses/libart_lgpl \ RetroZilla/other-licenses/libart_lgpl \
mozilla/tools/trace-malloc \ RetroZilla/tools/trace-malloc \
mozilla/tools/jprof \ RetroZilla/tools/jprof \
mozilla/tools/codesighs \ RetroZilla/tools/codesighs \
mozilla/tools/update-packaging \ RetroZilla/tools/update-packaging \
mozilla/other-licenses/branding \ RetroZilla/other-licenses/branding \
mozilla/other-licenses/7zstub \ RetroZilla/other-licenses/7zstub \
$(NULL) $(NULL)
####################################################################### #######################################################################
@ -282,7 +282,7 @@ ifneq (, $(wildcard client.mk))
ROOTDIR := $(shell dirname $(CWD)) ROOTDIR := $(shell dirname $(CWD))
TOPSRCDIR := $(CWD) TOPSRCDIR := $(CWD)
else else
# Ran from mozilla/.. directory (?) # Ran from RetroZilla/.. directory (?)
ROOTDIR := $(CWD) ROOTDIR := $(CWD)
TOPSRCDIR := $(CWD)/mozilla TOPSRCDIR := $(CWD)/mozilla
endif endif
@ -345,16 +345,16 @@ LOCALES_CVSROOT ?= :pserver:anonymous@cvs-mirror.mozilla.org:/l10n
# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig. # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk MOZCONFIG_LOADER := RetroZilla/build/autoconf/mozconfig2client-mk
MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find MOZCONFIG_FINDER := RetroZilla/build/autoconf/mozconfig-find
MOZCONFIG_MODULES := mozilla/build/unix/modules.mk mozilla/build/unix/uniq.pl MOZCONFIG_MODULES := RetroZilla/build/unix/modules.mk RetroZilla/build/unix/uniq.pl
run_for_side_effects := \ run_for_side_effects := \
$(shell cd $(ROOTDIR); \ $(shell cd $(ROOTDIR); \
if test "$(_IS_FIRST_CHECKOUT)"; then \ if test "$(_IS_FIRST_CHECKOUT)"; then \
$(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \ $(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \
else true; \ else true; \
fi; \ fi; \
$(MOZCONFIG_LOADER) $(TOPSRCDIR) mozilla/.mozconfig.mk > mozilla/.mozconfig.out) $(MOZCONFIG_LOADER) $(TOPSRCDIR) RetroZilla/.mozconfig.mk > RetroZilla/.mozconfig.out)
include $(TOPSRCDIR)/.mozconfig.mk include $(TOPSRCDIR)/.mozconfig.mk
include $(TOPSRCDIR)/build/unix/modules.mk include $(TOPSRCDIR)/build/unix/modules.mk
@ -423,8 +423,8 @@ endif # MOZ_BUILD_PROJECTS
# CVS defines for NSS # CVS defines for NSS
# #
NSS_CO_MODULE = \ NSS_CO_MODULE = \
mozilla/security/nss \ RetroZilla/security/nss \
mozilla/security/coreconf \ RetroZilla/security/coreconf \
$(NULL) $(NULL)
NSS_CO_FLAGS := -P NSS_CO_FLAGS := -P
@ -443,7 +443,7 @@ endif
#################################### ####################################
# CVS defines for NSPR # CVS defines for NSPR
# #
NSPR_CO_MODULE = mozilla/nsprpub NSPR_CO_MODULE = RetroZilla/nsprpub
NSPR_CO_FLAGS := -P NSPR_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS ifdef MOZ_CO_FLAGS
NSPR_CO_FLAGS := $(MOZ_CO_FLAGS) NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
@ -460,7 +460,7 @@ endif
#################################### ####################################
# CVS defines for the C LDAP SDK # CVS defines for the C LDAP SDK
# #
LDAPCSDK_CO_MODULE = mozilla/directory/c-sdk LDAPCSDK_CO_MODULE = RetroZilla/directory/c-sdk
LDAPCSDK_CO_FLAGS := -P LDAPCSDK_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS ifdef MOZ_CO_FLAGS
LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS) LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
@ -479,8 +479,8 @@ else
STANDALONE_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in STANDALONE_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
STANDALONE_CO_MODULE += Makefile.in STANDALONE_CO_MODULE += Makefile.in
MOZ_MODULE_LIST += $(addprefix mozilla/,$(STANDALONE_CO_MODULE)) MOZ_MODULE_LIST += $(addprefix RetroZilla/,$(STANDALONE_CO_MODULE))
NOSUBDIRS_MODULE := $(addprefix mozilla/,$(BUILD_MODULE_CVS_NS)) NOSUBDIRS_MODULE := $(addprefix RetroZilla/,$(BUILD_MODULE_CVS_NS))
ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT)) ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
CVSCO_NSPR := CVSCO_NSPR :=
@ -498,11 +498,11 @@ endif
# #
ifdef MOZ_MAPINFO ifdef MOZ_MAPINFO
$(warning MOZ_MAPINFO is obsolete, use MOZ_CO_MODULE=mozilla/tools/codesighs instead.) $(warning MOZ_MAPINFO is obsolete, use MOZ_CO_MODULE=RetroZilla/tools/codesighs instead.)
MOZ_MODULE_LIST += mozilla/tools/codesighs MOZ_MODULE_LIST += RetroZilla/tools/codesighs
endif endif
ifdef MOZ_INTERNAL_LIBART_LGPL ifdef MOZ_INTERNAL_LIBART_LGPL
$(error MOZ_INTERNAL_LIBART_LGPL is obsolete, use MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl instead.) $(error MOZ_INTERNAL_LIBART_LGPL is obsolete, use MOZ_CO_MODULE=RetroZilla/other-licenses/libart_lgpl instead.)
endif endif
ifdef MOZ_PHOENIX ifdef MOZ_PHOENIX
$(warning MOZ_PHOENIX is obsolete.) $(warning MOZ_PHOENIX is obsolete.)
@ -566,9 +566,9 @@ else
override MOZ_CO_LOCALES := $(subst $(comma), ,$(MOZ_CO_LOCALES)) override MOZ_CO_LOCALES := $(subst $(comma), ,$(MOZ_CO_LOCALES))
ifeq (all,$(MOZ_CO_LOCALES)) ifeq (all,$(MOZ_CO_LOCALES))
MOZCONFIG_MODULES += $(foreach project,$(MOZ_PROJECT_LIST),mozilla/$(project)/locales/all-locales) MOZCONFIG_MODULES += $(foreach project,$(MOZ_PROJECT_LIST),RetroZilla/$(project)/locales/all-locales)
LOCALE_CO_DIRS := $(sort $(foreach project,$(MOZ_PROJECT_LIST),$(foreach locale,$(shell cat mozilla/$(project)/locales/all-locales),$(foreach dir,$(LOCALES_$(project)),l10n/$(locale)/$(dir))))) LOCALE_CO_DIRS := $(sort $(foreach project,$(MOZ_PROJECT_LIST),$(foreach locale,$(shell cat RetroZilla/$(project)/locales/all-locales),$(foreach dir,$(LOCALES_$(project)),l10n/$(locale)/$(dir)))))
else # MOZ_CO_LOCALES != all else # MOZ_CO_LOCALES != all
LOCALE_CO_DIRS = $(sort $(foreach locale,$(MOZ_CO_LOCALES),$(foreach dir,$(LOCALE_DIRS),l10n/$(locale)/$(dir)))) LOCALE_CO_DIRS = $(sort $(foreach locale,$(MOZ_CO_LOCALES),$(foreach dir,$(LOCALE_DIRS),l10n/$(locale)/$(dir))))
endif endif
@ -620,14 +620,14 @@ checkout::
ifdef RUN_AUTOCONF_LOCALLY ifdef RUN_AUTOCONF_LOCALLY
@echo "Removing local configures" ; \ @echo "Removing local configures" ; \
cd $(ROOTDIR) && \ cd $(ROOTDIR) && \
$(RM) -f mozilla/configure mozilla/nsprpub/configure \ $(RM) -f RetroZilla/configure RetroZilla/nsprpub/configure \
mozilla/directory/c-sdk/configure RetroZilla/directory/c-sdk/configure
endif endif
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE) @echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
@echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)'; \ @echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) RetroZilla/client.mk $(MOZCONFIG_MODULES)'; \
cd $(ROOTDIR) && \ cd $(ROOTDIR) && \
$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES) $(CVSCO) $(CVS_CO_DATE_FLAGS) RetroZilla/client.mk $(MOZCONFIG_MODULES)
@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout @cd $(ROOTDIR) && $(MAKE) -f RetroZilla/client.mk real_checkout
# Start the checkout. Split the output to the tty and a log file. # Start the checkout. Split the output to the tty and a log file.
@ -643,7 +643,7 @@ real_checkout:
$(CHECKOUT_LOCALES); $(CHECKOUT_LOCALES);
@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE) @echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
# update the NSS checkout timestamp # update the NSS checkout timestamp
@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \ @if test `egrep -c '^(U|C) RetroZilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
touch $(TOPSRCDIR)/security/manager/.nss.checkout; \ touch $(TOPSRCDIR)/security/manager/.nss.checkout; \
fi fi
# @: Check the log for conflicts. ; # @: Check the log for conflicts. ;
@ -671,13 +671,13 @@ fast-update:
ifdef RUN_AUTOCONF_LOCALLY ifdef RUN_AUTOCONF_LOCALLY
@echo "Removing local configures" ; \ @echo "Removing local configures" ; \
cd $(ROOTDIR) && \ cd $(ROOTDIR) && \
$(RM) -f mozilla/configure mozilla/nsprpub/configure \ $(RM) -f RetroZilla/configure RetroZilla/nsprpub/configure \
mozilla/directory/c-sdk/configure RetroZilla/directory/c-sdk/configure
endif endif
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE) @echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
@echo '$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)'; \ @echo '$(CVSCO) RetroZilla/client.mk $(MOZCONFIG_MODULES)'; \
cd $(ROOTDIR) && \ cd $(ROOTDIR) && \
$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES) $(CVSCO) RetroZilla/client.mk $(MOZCONFIG_MODULES)
@cd $(TOPSRCDIR) && \ @cd $(TOPSRCDIR) && \
$(MAKE) -f client.mk real_fast-update $(MAKE) -f client.mk real_fast-update
@ -697,7 +697,7 @@ real_fast-update:
$(FASTUPDATE_LOCALES); $(FASTUPDATE_LOCALES);
@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE) @echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
# update the NSS checkout timestamp # update the NSS checkout timestamp
@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \ @if test `egrep -c '^(U|C) RetroZilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
touch $(TOPSRCDIR)/security/manager/.nss.checkout; \ touch $(TOPSRCDIR)/security/manager/.nss.checkout; \
fi fi
# @: Check the log for conflicts. ; # @: Check the log for conflicts. ;
@ -726,24 +726,24 @@ l10n-checkout:
else true; \ else true; \
fi fi
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE_L10N) @echo "checkout start: "`date` | tee $(CVSCO_LOGFILE_L10N)
@echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)'; \ @echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) RetroZilla/client.mk $(MOZCONFIG_MODULES)'; \
cd $(ROOTDIR) && \ cd $(ROOTDIR) && \
$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES) $(CVSCO) $(CVS_CO_DATE_FLAGS) RetroZilla/client.mk $(MOZCONFIG_MODULES)
@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_l10n-checkout @cd $(ROOTDIR) && $(MAKE) -f RetroZilla/client.mk real_l10n-checkout
EN_US_CO_DIRS := $(sort $(foreach dir,$(LOCALE_DIRS),mozilla/$(dir)/locales)) \ EN_US_CO_DIRS := $(sort $(foreach dir,$(LOCALE_DIRS),RetroZilla/$(dir)/locales)) \
$(foreach mod,$(MOZ_PROJECT_LIST),mozilla/$(mod)/config) \ $(foreach mod,$(MOZ_PROJECT_LIST),RetroZilla/$(mod)/config) \
mozilla/client.mk \ RetroZilla/client.mk \
$(MOZCONFIG_MODULES) \ $(MOZCONFIG_MODULES) \
mozilla/configure \ RetroZilla/configure \
mozilla/configure.in \ RetroZilla/configure.in \
mozilla/allmakefiles.sh \ RetroZilla/allmakefiles.sh \
mozilla/build \ RetroZilla/build \
mozilla/config \ RetroZilla/config \
$(NULL) $(NULL)
EN_US_CO_FILES_NS := \ EN_US_CO_FILES_NS := \
mozilla/toolkit/mozapps/installer \ RetroZilla/toolkit/mozapps/installer \
$(NULL) $(NULL)
# Start the checkout. Split the output to the tty and a log file. # Start the checkout. Split the output to the tty and a log file.