Port Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense) - to try and fix L10n build bustage. r=port-by-build-system-peer CLOSED TREE
This commit is contained in:
Mark Banner
Родитель
e34ead2ff2
Коммит
79656c5e49
12
Makefile.in
12
Makefile.in
|
|
@ -29,15 +29,15 @@ include $(topsrcdir)/config/config.mk
|
|||
default alldep all:: $(topsrcdir)/configure config.status
|
||||
|
||||
$(topsrcdir)/configure: $(topsrcdir)/configure.in
|
||||
@echo "STOP! configure.in has changed, and your configure is out of date."
|
||||
@echo "Please rerun autoconf and configure."
|
||||
@echo "To ignore this message, touch 'configure' in the source directory."
|
||||
@echo 'STOP! configure.in has changed, and your configure is out of date.'
|
||||
@echo 'Please rerun autoconf and configure.'
|
||||
@echo 'To ignore this message, touch 'configure' in the source directory.'
|
||||
@exit 1
|
||||
|
||||
config.status: $(topsrcdir)/configure
|
||||
@echo "STOP! configure has changed and needs to be run in this build directory."
|
||||
@echo "Please rerun configure."
|
||||
@echo "To ignore this message, touch 'config.status' in the build directory."
|
||||
@echo 'STOP! configure has changed and needs to be run in this build directory.'
|
||||
@echo 'Please rerun configure.'
|
||||
@echo 'To ignore this message, touch 'config.status' in the build directory.'
|
||||
@exit 1
|
||||
|
||||
default export libs clean realclean distclean alldep \
|
||||
|
|
|
|||
|
|
@ -34,12 +34,12 @@ GDATA_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/providers/gdata/makever
|
|||
# For Thunderbird, 10.0 becomes 10.*, 10.0.1 becomes 10.*
|
||||
THUNDERBIRD_MAXVERSION := $(THUNDERBIRD_VERSION)
|
||||
ifneq (a,$(findstring a,$(THUNDERBIRD_VERSION)))
|
||||
THUNDERBIRD_MAXVERSION := $(shell echo $(THUNDERBIRD_VERSION) | sed "s|\(^[0-9]*\)\.\([0-9]*\).*|\1|" ).*
|
||||
THUNDERBIRD_MAXVERSION := $(shell echo $(THUNDERBIRD_VERSION) | sed 's|\(^[0-9]*\)\.\([0-9]*\).*|\1|' ).*
|
||||
endif
|
||||
|
||||
SEAMONKEY_MAXVERSION := $(SEAMONKEY_VERSION)
|
||||
ifneq (a,$(findstring a,$(SEAMONKEY_VERSION)))
|
||||
SEAMONKEY_MAXVERSION := $(shell echo $(SEAMONKEY_VERSION) | sed "s|\(^[0-9]*.[0-9]*\).*|\1|" ).*
|
||||
SEAMONKEY_MAXVERSION := $(shell echo $(SEAMONKEY_VERSION) | sed 's|\(^[0-9]*.[0-9]*\).*|\1|' ).*
|
||||
endif
|
||||
|
||||
ifneq (,$(findstring a,$(LIGHTNING_VERSION)))
|
||||
|
|
@ -58,25 +58,25 @@ DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE)
|
|||
endif
|
||||
|
||||
# comm-central source repo and stamp
|
||||
SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
|
||||
SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null))
|
||||
ifdef SOURCE_STAMP
|
||||
DEFINES += -DSOURCE_STAMP="$(SOURCE_STAMP)"
|
||||
DEFINES += -DSOURCE_STAMP='$(SOURCE_STAMP)'
|
||||
endif
|
||||
|
||||
SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
|
||||
SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/')
|
||||
ifdef SOURCE_REPO
|
||||
DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
|
||||
DEFINES += -DSOURCE_REPO='$(SOURCE_REPO)'
|
||||
endif
|
||||
|
||||
# Mozilla source repo and stamps
|
||||
MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_SRCDIR) parent --template="{node|short}\n" 2>/dev/null))
|
||||
MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_SRCDIR) parent --template='{node|short}\n' 2>/dev/null))
|
||||
ifdef MOZ_SOURCE_STAMP
|
||||
DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
|
||||
DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
|
||||
endif
|
||||
|
||||
MOZ_SOURCE_REPO := $(shell hg -R $(MOZILLA_SRCDIR) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
|
||||
MOZ_SOURCE_REPO := $(shell hg -R $(MOZILLA_SRCDIR) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/')
|
||||
ifdef MOZ_SOURCE_REPO
|
||||
DEFINES += -DMOZ_SOURCE_REPO="$(MOZ_SOURCE_REPO)"
|
||||
DEFINES += -DMOZ_SOURCE_REPO='$(MOZ_SOURCE_REPO)'
|
||||
endif
|
||||
|
||||
# include config.mk here so myconfig or app-config can set DISABLE_LIGHTNING_INSTALL
|
||||
|
|
@ -136,12 +136,12 @@ libs::
|
|||
endif
|
||||
|
||||
ident:
|
||||
@printf "comm_revision "
|
||||
@printf 'comm_revision '
|
||||
@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
|
||||
$(FINAL_TARGET)/application.ini App SourceStamp
|
||||
@printf "moz_revision "
|
||||
@printf 'moz_revision '
|
||||
@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
|
||||
$(FINAL_TARGET)/application.ini Build SourceStamp
|
||||
@printf "buildid "
|
||||
@printf 'buildid '
|
||||
@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
|
||||
$(FINAL_TARGET)/application.ini App BuildID
|
||||
|
|
|
|||
14
client.mk
14
client.mk
|
|
@ -278,7 +278,7 @@ else
|
|||
# this point when building multiple projects. Only MOZ_OBJDIR is available.
|
||||
set -e; \
|
||||
for mkfile in $(MOZ_PREFLIGHT_ALL); do \
|
||||
$(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) MOZ_OBJDIR=$(MOZ_OBJDIR) MOZ_BUILD_PROJECTS="$(MOZ_BUILD_PROJECTS)"; \
|
||||
$(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) MOZ_OBJDIR=$(MOZ_OBJDIR) MOZ_BUILD_PROJECTS='$(MOZ_BUILD_PROJECTS)'; \
|
||||
done
|
||||
endif
|
||||
endif
|
||||
|
|
@ -325,11 +325,11 @@ CONFIG_STATUS_DEPS := \
|
|||
$(NULL)
|
||||
|
||||
CONFIGURE_ENV_ARGS += \
|
||||
MAKE="$(MAKE)" \
|
||||
MAKE='$(MAKE)' \
|
||||
$(NULL)
|
||||
|
||||
# configure uses the program name to determine @srcdir@. Calling it without
|
||||
# $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
|
||||
# $(TOPSRCDIR) will set @srcdir@ to '.'; otherwise, it is set to the full
|
||||
# path of $(TOPSRCDIR).
|
||||
ifeq ($(TOPSRCDIR),$(OBJDIR))
|
||||
CONFIGURE = ./configure
|
||||
|
|
@ -349,8 +349,8 @@ configure:: $(configure-preqs)
|
|||
@echo cd $(OBJDIR);
|
||||
@echo $(CONFIGURE) $(CONFIGURE_ARGS)
|
||||
@cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
|
||||
|| ( echo "*** Fix above errors and then restart with\
|
||||
\"$(MAKE) -f client.mk build\"" && exit 1 )
|
||||
|| ( echo '*** Fix above errors and then restart with\
|
||||
"$(MAKE) -f client.mk build"' && exit 1 )
|
||||
@touch $(OBJDIR)/Makefile
|
||||
|
||||
ifneq (,$(MAKEFILE))
|
||||
|
|
@ -430,7 +430,7 @@ else
|
|||
# this point when building multiple projects. Only MOZ_OBJDIR is available.
|
||||
set -e; \
|
||||
for mkfile in $(MOZ_POSTFLIGHT_ALL); do \
|
||||
$(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) MOZ_OBJDIR=$(MOZ_OBJDIR) MOZ_BUILD_PROJECTS="$(MOZ_BUILD_PROJECTS)"; \
|
||||
$(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) MOZ_OBJDIR=$(MOZ_OBJDIR) MOZ_BUILD_PROJECTS='$(MOZ_BUILD_PROJECTS)'; \
|
||||
done
|
||||
endif
|
||||
endif
|
||||
|
|
@ -440,7 +440,7 @@ cleansrcdir:
|
|||
if [ -f Makefile ]; then \
|
||||
$(MAKE) distclean ; \
|
||||
else \
|
||||
echo "Removing object files from srcdir..."; \
|
||||
echo 'Removing object files from srcdir...'; \
|
||||
rm -fr `find . -type d \( -name .deps -print -o -name CVS \
|
||||
-o -exec test ! -d {}/CVS \; \) -prune \
|
||||
-o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
|
||||
|
|
|
|||
106
config/rules.mk
106
config/rules.mk
|
|
@ -561,8 +561,8 @@ ifdef IS_COMPONENT
|
|||
$(call install_cmd,$(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components)
|
||||
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
|
||||
ifndef NO_COMPONENTS_MANIFEST
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest")
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)")
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest components/components.manifest')
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/components/components.manifest 'binary-component $(SHARED_LIBRARY)')
|
||||
endif
|
||||
else # ! IS_COMPONENT
|
||||
ifneq (,$(filter WINNT,$(OS_ARCH)))
|
||||
|
|
@ -660,22 +660,22 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
|||
$(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
ifdef MSMANIFEST_TOOL
|
||||
@if test -f $@.manifest; then \
|
||||
if test -f "$(srcdir)/$@.manifest"; then \
|
||||
echo "Embedding manifest from $(srcdir)/$@.manifest and $@.manifest"; \
|
||||
mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
||||
if test -f '$(srcdir)/$@.manifest'; then \
|
||||
echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \
|
||||
mt.exe -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
||||
else \
|
||||
echo "Embedding manifest from $@.manifest"; \
|
||||
echo 'Embedding manifest from $@.manifest'; \
|
||||
mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
||||
fi; \
|
||||
elif test -f "$(srcdir)/$@.manifest"; then \
|
||||
echo "Embedding manifest from $(srcdir)/$@.manifest"; \
|
||||
mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" -OUTPUTRESOURCE:$@\;1; \
|
||||
elif test -f '$(srcdir)/$@.manifest'; then \
|
||||
echo 'Embedding manifest from $(srcdir)/$@.manifest'; \
|
||||
mt.exe -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' -OUTPUTRESOURCE:$@\;1; \
|
||||
fi
|
||||
endif # MSVC with manifest tool
|
||||
ifdef MOZ_PROFILE_GENERATE
|
||||
# touch it a few seconds into the future to work around FAT's
|
||||
# 2-second granularity
|
||||
touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
|
||||
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
|
||||
endif
|
||||
else # !WINNT || GNU_CC
|
||||
$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS)
|
||||
|
|
@ -693,16 +693,16 @@ ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH))
|
|||
$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||||
ifdef MSMANIFEST_TOOL
|
||||
@if test -f $@.manifest; then \
|
||||
if test -f "$(srcdir)/$@.manifest"; then \
|
||||
echo "Embedding manifest from $(srcdir)/$@.manifest and $@.manifest"; \
|
||||
mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
||||
if test -f '$(srcdir)/$@.manifest'; then \
|
||||
echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \
|
||||
mt.exe -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
||||
else \
|
||||
echo "Embedding manifest from $@.manifest"; \
|
||||
echo 'Embedding manifest from $@.manifest'; \
|
||||
mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
||||
fi; \
|
||||
elif test -f "$(srcdir)/$@.manifest"; then \
|
||||
echo "Embedding manifest from $(srcdir)/$@.manifest"; \
|
||||
mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" -OUTPUTRESOURCE:$@\;1; \
|
||||
elif test -f '$(srcdir)/$@.manifest'; then \
|
||||
echo 'Embedding manifest from $(srcdir)/$@.manifest'; \
|
||||
mt.exe -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' -OUTPUTRESOURCE:$@\;1; \
|
||||
fi
|
||||
endif # MSVC with manifest tool
|
||||
else
|
||||
|
|
@ -815,7 +815,7 @@ ifdef EMBED_MANIFEST_AT
|
|||
endif # EMBED_MANIFEST_AT
|
||||
endif # MSVC with manifest tool
|
||||
ifdef MOZ_PROFILE_GENERATE
|
||||
touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
|
||||
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
|
||||
endif
|
||||
endif # WINNT && !GCC
|
||||
@$(RM) foodummyfilefoo $(DELETE_AFTER_LINK)
|
||||
|
|
@ -832,14 +832,14 @@ _MDDEPFILE = $(MDDEPDIR)/$(@F).pp
|
|||
|
||||
define MAKE_DEPS_AUTO_CC
|
||||
if test -d $(@D); then \
|
||||
echo "Building deps for $< using Sun Studio cc"; \
|
||||
echo 'Building deps for $< using Sun Studio cc'; \
|
||||
$(CC) $(COMPILE_CFLAGS) -xM $< >$(_MDDEPFILE) ; \
|
||||
$(PYTHON) $(MOZILLA_DIR)/build/unix/add_phony_targets.py $(_MDDEPFILE) ; \
|
||||
fi
|
||||
endef
|
||||
define MAKE_DEPS_AUTO_CXX
|
||||
if test -d $(@D); then \
|
||||
echo "Building deps for $< using Sun Studio CC"; \
|
||||
echo 'Building deps for $< using Sun Studio CC'; \
|
||||
$(CXX) $(COMPILE_CXXFLAGS) -xM $< >$(_MDDEPFILE) ; \
|
||||
$(PYTHON) $(MOZILLA_DIR)/build/unix/add_phony_targets.py $(_MDDEPFILE) ; \
|
||||
fi
|
||||
|
|
@ -979,8 +979,8 @@ ifeq ($(HOST_OS_ARCH),WINNT)
|
|||
# could be a file or a non-existent path, we cannot call 'pwd -W' directly
|
||||
# on the path. Instead, we extract the root path (i.e. "c:/"), call 'pwd -W'
|
||||
# on it, then merge with the rest of the path.
|
||||
root-path = $(shell echo $(1) | sed -e "s|\(/[^/]*\)/\?\(.*\)|\1|")
|
||||
non-root-path = $(shell echo $(1) | sed -e "s|\(/[^/]*\)/\?\(.*\)|\2|")
|
||||
root-path = $(shell echo $(1) | sed -e 's|\(/[^/]*\)/\?\(.*\)|\1|')
|
||||
non-root-path = $(shell echo $(1) | sed -e 's|\(/[^/]*\)/\?\(.*\)|\2|')
|
||||
normalizepath = $(foreach p,$(1),$(if $(filter /%,$(1)),$(patsubst %/,%,$(shell cd $(call root-path,$(1)) && pwd -W))/$(call non-root-path,$(1)),$(1)))
|
||||
else
|
||||
normalizepath = $(1)
|
||||
|
|
@ -1114,8 +1114,8 @@ INSTALL_TARGETS += _XPT_NAME
|
|||
|
||||
ifndef NO_INTERFACES_MANIFEST
|
||||
libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPT_NAME)")
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest")
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/components/interfaces.manifest 'interfaces $(XPT_NAME)')
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest components/interfaces.manifest')
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -1149,7 +1149,7 @@ endif
|
|||
EXTRA_MANIFESTS = $(filter %.manifest,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))
|
||||
ifneq (,$(EXTRA_MANIFESTS))
|
||||
libs:: $(call mkdir_deps,$(FINAL_TARGET))
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest $(patsubst %,"manifest components/%",$(notdir $(EXTRA_MANIFESTS))))
|
||||
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest $(patsubst %,'manifest components/%',$(notdir $(EXTRA_MANIFESTS))))
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
|
|
@ -1244,34 +1244,34 @@ ifneq ($(XPI_PKGNAME),)
|
|||
tools realchrome::
|
||||
ifdef STRIP_XPI
|
||||
ifndef MOZ_DEBUG
|
||||
@echo "Stripping $(XPI_PKGNAME) package directory..."
|
||||
@echo 'Stripping $(XPI_PKGNAME) package directory...'
|
||||
@echo $(FINAL_TARGET)
|
||||
@cd $(FINAL_TARGET) && find . ! -type d \
|
||||
! -name "*.js" \
|
||||
! -name "*.xpt" \
|
||||
! -name "*.gif" \
|
||||
! -name "*.jpg" \
|
||||
! -name "*.png" \
|
||||
! -name "*.xpm" \
|
||||
! -name "*.txt" \
|
||||
! -name "*.rdf" \
|
||||
! -name "*.sh" \
|
||||
! -name "*.properties" \
|
||||
! -name "*.dtd" \
|
||||
! -name "*.html" \
|
||||
! -name "*.xul" \
|
||||
! -name "*.css" \
|
||||
! -name "*.xml" \
|
||||
! -name "*.jar" \
|
||||
! -name "*.dat" \
|
||||
! -name "*.tbl" \
|
||||
! -name "*.src" \
|
||||
! -name "*.reg" \
|
||||
! -name '*.js' \
|
||||
! -name '*.xpt' \
|
||||
! -name '*.gif' \
|
||||
! -name '*.jpg' \
|
||||
! -name '*.png' \
|
||||
! -name '*.xpm' \
|
||||
! -name '*.txt' \
|
||||
! -name '*.rdf' \
|
||||
! -name '*.sh' \
|
||||
! -name '*.properties' \
|
||||
! -name '*.dtd' \
|
||||
! -name '*.html' \
|
||||
! -name '*.xul' \
|
||||
! -name '*.css' \
|
||||
! -name '*.xml' \
|
||||
! -name '*.jar' \
|
||||
! -name '*.dat' \
|
||||
! -name '*.tbl' \
|
||||
! -name '*.src' \
|
||||
! -name '*.reg' \
|
||||
$(PLATFORM_EXCLUDE_LIST) \
|
||||
-exec $(STRIP) $(STRIP_FLAGS) {} >/dev/null 2>&1 \;
|
||||
endif
|
||||
endif
|
||||
@echo "Packaging $(XPI_PKGNAME).xpi..."
|
||||
@echo 'Packaging $(XPI_PKGNAME).xpi...'
|
||||
cd $(FINAL_TARGET) && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
|
||||
endif
|
||||
|
||||
|
|
@ -1281,9 +1281,9 @@ $(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
|
|||
endif
|
||||
|
||||
tools::
|
||||
$(RM) -r "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(NSINSTALL) -D "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - . | (cd "../../bin/extensions/$(INSTALL_EXTENSION_ID)" && tar -xf -)
|
||||
$(RM) -r '$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)'
|
||||
$(NSINSTALL) -D '$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)'
|
||||
$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -1380,7 +1380,7 @@ define install_file_template
|
|||
$(or $(3),libs):: $(2)/$(notdir $(1))
|
||||
$(call install_cmd_override,$(2)/$(notdir $(1)))
|
||||
$(2)/$(notdir $(1)): $(1)
|
||||
$$(call install_cmd,$(4) "$$<" "$${@D}")
|
||||
$$(call install_cmd,$(4) '$$<' '$${@D}')
|
||||
endef
|
||||
$(foreach category,$(INSTALL_TARGETS),\
|
||||
$(if $($(category)_DEST),,$(error Missing $(category)_DEST))\
|
||||
|
|
@ -1427,8 +1427,8 @@ $(foreach category,$(INSTALL_TARGETS),\
|
|||
# makefile_target, extra_flags)
|
||||
define preprocess_file_template
|
||||
$(2): $(1) $$(GLOBAL_DEPS)
|
||||
$$(RM) "$$@"
|
||||
$$(call py_action,preprocessor,$(4) $$(DEFINES) $$(ACDEFINES) $$(XULPPFLAGS) "$$<" -o "$$@")
|
||||
$$(RM) '$$@'
|
||||
$$(call py_action,preprocessor,$(4) $$(DEFINES) $$(ACDEFINES) $$(XULPPFLAGS) '$$<' -o '$$@')
|
||||
$(3):: $(2)
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ PREF_JS_EXPORTS = \
|
|||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
-DAPP_VERSION="$(MOZ_APP_VERSION)" \
|
||||
-DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
|
||||
-DTHUNDERBIRD_ICO='$(DIST)/branding/thunderbird.ico' \
|
||||
-DGRE_MILESTONE=$(GRE_MILESTONE) \
|
||||
-DGRE_BUILDID=$(GRE_BUILDID) \
|
||||
$(NULL)
|
||||
|
|
@ -124,7 +124,7 @@ $(RESFILE): embedded-icons
|
|||
ifndef GNU_CC
|
||||
LDFLAGS += /HEAP:0x40000
|
||||
ifeq ($(OS_TEST),x86_64)
|
||||
# set stack to 2MB on x64 build. See bug 582910
|
||||
# set stack to 2MB on x64 build. See bug 582910
|
||||
LDFLAGS += -STACK:2097152
|
||||
endif
|
||||
endif
|
||||
|
|
@ -208,11 +208,11 @@ endif
|
|||
|
||||
tools repackage:: $(PROGRAM)
|
||||
$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
|
||||
rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(MOZ_MACBUNDLE_NAME) --exclude English.lproj
|
||||
rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/$(MOZ_MACBUNDLE_NAME) --exclude English.lproj
|
||||
$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
|
||||
rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
|
||||
sed -e "s/%APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
|
||||
sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj/InfoPlist.strings
|
||||
rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
|
||||
sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
|
||||
sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj/InfoPlist.strings
|
||||
rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
|
||||
ifdef LIBXUL_SDK
|
||||
cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/thunderbird
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|||
MOZ_PKG_MAC_DSSTORE=branding/dsstore
|
||||
MOZ_PKG_MAC_BACKGROUND=branding/background.png
|
||||
MOZ_PKG_MAC_ICON=branding/disk.icns
|
||||
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
|
||||
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
|
||||
endif
|
||||
|
||||
NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
|
||||
|
|
@ -138,7 +138,7 @@ endif
|
|||
package-compare:: $(MOZ_PKG_MANIFEST)
|
||||
ifdef MOZ_PKG_MANIFEST_P
|
||||
cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
|
||||
grep "^$(BINPATH)" $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
|
||||
grep '^$(BINPATH)' $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
|
||||
-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
|
||||
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ BRANDING_FILES = \
|
|||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
|
||||
-DMOZ_APP_DISPLAYNAME='${MOZ_APP_DISPLAYNAME}' \
|
||||
-DMOZILLA_VERSION=${MOZILLA_VERSION} \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|||
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
|
||||
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
|
||||
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
|
||||
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
|
||||
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
|
||||
endif
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
|
|
@ -87,25 +87,25 @@ libs-%:
|
|||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
|
||||
|
||||
# Note the funny extra "../" in SFX_HEADER is because the repackage-zip command
|
||||
# Note the funny extra '../' in SFX_HEADER is because the repackage-zip command
|
||||
# is actually run effectively from within the mozilla/ part of the objdir, so
|
||||
# topsrcdir points to the wrong place and we have to go one directory higher.
|
||||
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
|
||||
repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
|
||||
@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
|
||||
@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
|
||||
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
|
||||
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
|
||||
$(MAKE) repackage-zip \
|
||||
AB_CD=$(AB_CD) \
|
||||
MOZ_PKG_FORMAT=SFX7Z \
|
||||
ZIP_IN="$(WIN32_INSTALLER_IN)" \
|
||||
ZIP_OUT="$(WIN32_INSTALLER_OUT)" \
|
||||
SFX_HEADER="$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
|
||||
$(_ABS_SRCDIR)/mail/installer/windows/app.tag"
|
||||
ZIP_IN='$(WIN32_INSTALLER_IN)' \
|
||||
ZIP_OUT='$(WIN32_INSTALLER_OUT)' \
|
||||
SFX_HEADER='$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
|
||||
$(_ABS_SRCDIR)/mail/installer/windows/app.tag'
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
repackage-win32-installer-%: $(STAGEDIST)
|
||||
@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN="$(WIN32_INSTALLER_IN)"
|
||||
@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)'
|
||||
|
||||
repackage-zip-%: repackage-win32-installer-%
|
||||
else
|
||||
|
|
@ -128,25 +128,25 @@ ifdef MOZ_UPDATER
|
|||
libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
|
||||
sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \
|
||||
sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
|
||||
sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
|
||||
sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
|
||||
$(FINAL_TARGET)/updater.ini
|
||||
else
|
||||
cat $< | \
|
||||
sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \
|
||||
sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
|
||||
sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
|
||||
sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
|
||||
$(FINAL_TARGET)/updater.ini
|
||||
endif
|
||||
endif
|
||||
|
||||
ident:
|
||||
@printf "comm_revision "
|
||||
@printf 'comm_revision '
|
||||
@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
|
||||
$(STAGEDIST)/application.ini App SourceStamp
|
||||
@printf "moz_revision "
|
||||
@printf 'moz_revision '
|
||||
@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
|
||||
$(STAGEDIST)/platform.ini Build SourceStamp
|
||||
@printf "buildid "
|
||||
@printf 'buildid '
|
||||
@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
|
||||
$(STAGEDIST)/application.ini App BuildID
|
||||
|
||||
|
|
@ -196,8 +196,8 @@ endif
|
|||
l10n-check::
|
||||
$(RM) -rf x-test
|
||||
$(NSINSTALL) -D x-test/toolkit
|
||||
echo "#define MOZ_LANG_TITLE Just testing" > x-test/toolkit/defines.inc
|
||||
$(MAKE) installers-x-test L10NBASEDIR="$(PWD)" LOCALE_MERGEDIR="$(PWD)/mergedir"
|
||||
echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc
|
||||
$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir'
|
||||
|
||||
ifdef MOZ_CALENDAR
|
||||
LIGHTNING_PATH=$(DEPTH)/calendar/lightning
|
||||
|
|
@ -232,4 +232,4 @@ endif
|
|||
# tinderbox scripts. Alter it with caution.
|
||||
INSTALLERS_TARGETS += clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
|
||||
installers-%: $(INSTALLERS_TARGETS)
|
||||
@echo "repackaging done"
|
||||
@echo 'repackaging done'
|
||||
|
|
|
|||
|
|
@ -64,12 +64,12 @@ PKG_STAGE = $(DIST)/universal/test-stage
|
|||
endif
|
||||
|
||||
package-tests::
|
||||
@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
|
||||
@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
|
||||
ifndef UNIVERSAL_BINARY
|
||||
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
|
||||
endif
|
||||
cd $(PKG_STAGE) && \
|
||||
zip -r9D "$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)" \
|
||||
zip -r9D '$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)' \
|
||||
* -x \*/.mkdir.done
|
||||
|
||||
make-stage-dir:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче