author | Mike Hommey <mh+mozilla@glandium.org> |
Tue, 03 Dec 2013 06:34:21 +0900 | |
changeset 158403 | 942d149a7c0c6c4f85f8c212a2414f58b90585f7 |
parent 158402 | cfe7047da1a044da54c5d8ea4794beba2da91a13 |
child 158404 | 6787bcb8ea7e5cae7a157cfd6b6d4df14740d5f9 |
push id | 25744 |
push user | cbook@mozilla.com |
push date | Tue, 03 Dec 2013 09:14:36 +0000 |
treeherder | mozilla-central@71088609c1f3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mshal |
bugs | 943728 |
milestone | 28.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/Makefile.in +++ b/Makefile.in @@ -39,44 +39,44 @@ ifndef MOZ_PROFILE_USE # otherwise the rule in rules.mk doesn't run early enough. libs binaries export tools:: CLOBBER $(topsrcdir)/configure config.status backend.RecursiveMakeBackend ifdef BUILD_JS libs binaries export tools:: js-config-status endif endif CLOBBER: $(topsrcdir)/CLOBBER - @echo "STOP! The CLOBBER file has changed." - @echo "Please run the build through a sanctioned build wrapper, such as" - @echo "'mach build' or client.mk." + @echo 'STOP! The CLOBBER file has changed.' + @echo 'Please run the build through a sanctioned build wrapper, such as' + @echo '"mach build" or client.mk.' @exit 1 $(topsrcdir)/configure: $(topsrcdir)/configure.in - @echo "STOP! configure.in has changed, and your configure is out of date." - @echo "Please rerun autoconf and re-configure your build directory." - @echo "To ignore this message, touch 'configure' in the source directory," - @echo "but your build might not succeed." + @echo 'STOP! configure.in has changed, and your configure is out of date.' + @echo 'Please rerun autoconf and re-configure your build directory.' + @echo 'To ignore this message, touch "configure" in the source directory,' + @echo 'but your build might not succeed.' @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 "but your build might not succeed." + @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 'but your build might not succeed.' @exit 1 # Regenerate the build backend if it is out of date. We only have this rule in # this main make file because having it in rules.mk and applied to partial tree # builds resulted in a world of hurt. Gory details are in bug 877308. # # The mach build driver will ensure the backend is up to date for partial tree # builds. This cleanly avoids most of the pain. backend.RecursiveMakeBackend: - @echo "Build configuration changed. Regenerating backend." + @echo 'Build configuration changed. Regenerating backend.' $(PYTHON) config.status Makefile: backend.RecursiveMakeBackend @$(TOUCH) $@ include backend.RecursiveMakeBackend.pp default:: backend.RecursiveMakeBackend @@ -160,17 +160,17 @@ MAKE_SYM_STORE_ARGS += -i endif DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe # PDB files don't get moved to dist, so we need to scan the whole objdir MAKE_SYM_STORE_PATH := . endif ifeq ($(OS_ARCH),Darwin) # need to pass arch flags for universal builds ifdef UNIVERSAL_BINARY -MAKE_SYM_STORE_ARGS := -c -a "i386 x86_64" --vcs-info +MAKE_SYM_STORE_ARGS := -c -a 'i386 x86_64' --vcs-info MAKE_SYM_STORE_PATH := $(DIST)/universal else MAKE_SYM_STORE_ARGS := -c -a $(OS_TEST) --vcs-info MAKE_SYM_STORE_PATH := $(DIST)/bin endif DUMP_SYMS_BIN ?= $(DIST)/host/bin/dump_syms endif ifeq (,$(filter-out Linux SunOS,$(OS_ARCH))) @@ -189,40 +189,40 @@ endif SYMBOL_INDEX_NAME = \ $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)$(EXTRA_BUILDID)-symbols.txt buildsymbols: ifdef MOZ_CRASHREPORTER echo building symbol store $(RM) -r $(DIST)/crashreporter-symbols - $(RM) "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" + $(RM) '$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip' $(NSINSTALL) -D $(DIST)/crashreporter-symbols - OBJCOPY="$(OBJCOPY)" \ + OBJCOPY='$(OBJCOPY)' \ $(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/symbolstore.py \ $(MAKE_SYM_STORE_ARGS) \ $(foreach dir,$(SYM_STORE_SOURCE_DIRS),-s $(dir)) \ $(DUMP_SYMS_BIN) \ $(DIST)/crashreporter-symbols \ $(MAKE_SYM_STORE_PATH) | grep -iv test > \ $(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME) echo packing symbols $(NSINSTALL) -D $(DIST)/$(PKG_PATH) cd $(DIST)/crashreporter-symbols && \ - zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" . -x "*test*" -x "*Test*" + zip -r9D '../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' . -x '*test*' -x '*Test*' cd $(DIST)/crashreporter-symbols && \ - grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \ + grep 'sym' $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \ mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME) cd $(DIST)/crashreporter-symbols && \ - zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt" -x "*test*" -x "*Test*" + zip -r9D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt' -x '*test*' -x '*Test*' endif # MOZ_CRASHREPORTER uploadsymbols: ifdef MOZ_CRASHREPORTER - $(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) "$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" + $(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' endif # MOZ_SOURCE_STAMP is defined in package-name.mk with a deferred assignment. # exporting it makes make run its $(shell) command for each invoked submake, # so transform it to an immediate assignment. MOZ_SOURCE_STAMP := $(MOZ_SOURCE_STAMP) export MOZ_SOURCE_STAMP @@ -233,26 +233,26 @@ ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_) ifndef NO_PROFILE_GUIDED_OPTIMIZE maybe_clobber_profiledbuild: clean else maybe_clobber_profiledbuild: endif else maybe_clobber_profiledbuild: $(RM) $(DIST)/bin/*.pgc - find $(DIST)/$(MOZ_APP_NAME) -name "*.pgc" -exec mv {} $(DIST)/bin \; + find $(DIST)/$(MOZ_APP_NAME) -name '*.pgc' -exec mv {} $(DIST)/bin \; endif .PHONY: maybe_clobber_profiledbuild # Look for R_386_PC32 relocations in shared libs, these # break x86_64 builds and SELinux users. ifeq ($(OS_TARGET)_$(TARGET_XPCOM_ABI),Linux_x86-gcc3) scheck:: - @relcount=`find $(DIST)/bin -name "*.so" | xargs objdump -R | grep R_386_PC32 | wc -l` && if test $$relcount -gt 0; then echo "FAILED: R_386_PC32 relocations detected in a shared library. Did you use a system header without adding it to config/system-headers?"; exit 1; else echo "PASSED"; fi + @relcount=`find $(DIST)/bin -name '*.so' | xargs objdump -R | grep R_386_PC32 | wc -l` && if test $$relcount -gt 0; then echo 'FAILED: R_386_PC32 relocations detected in a shared library. Did you use a system header without adding it to config/system-headers?'; exit 1; else echo 'PASSED'; fi endif ifdef BUILD_JS js/src/Makefile: subsrcdir := js/src ifdef MOZ_PSEUDO_DERECURSE # Interdependencies for parallel export. js/xpconnect/src/export: dom/bindings/export xpcom/xpidl/export
--- a/b2g/app/Makefile.in +++ b/b2g/app/Makefile.in @@ -60,32 +60,32 @@ ifdef _MSC_VER WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif endif #LIBXUL_SDK UA_UPDATE_FILE = ua-update.json $(UA_UPDATE_FILE): % : %.in # strip out comment lines, which are not valid in JSON - sed -e "/^ *\\/\\//d" -e "/^ *$$/d" $^ > $@ + sed -e '/^ *\/\//d' -e '/^ *$$/d' $^ > $@ UA_UPDATE_FILES = $(UA_UPDATE_FILE) UA_UPDATE_DEST = $(FINAL_TARGET) INSTALL_TARGETS += UA_UPDATE # Make sure the standalone glue doesn't try to get libxpcom.so from b2g/app. NSDISTMODE = copy include $(topsrcdir)/config/rules.mk APP_ICON = b2g source_repo ?= $(call getSourceRepo,$(srcdir)/..) ifneq (,$(filter http%,$(source_repo))) - DEFINES += -DMOZ_SOURCE_REPO="$(source_repo)" + DEFINES += -DMOZ_SOURCE_REPO='$(source_repo)' endif ifeq ($(OS_ARCH),WINNT) REDIT_PATH = $(LIBXUL_DIST)/bin endif APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX) @@ -113,31 +113,31 @@ endif libs-preqs = \ $(call mkdir_deps,$(DIST)/$(APP_NAME).app/Contents/MacOS) \ $(call mkdir_deps,$(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj) \ $(NULL) .PHONY: repackage tools repackage:: $(libs-preqs) - rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj - rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj - sed -e "s/%MOZ_APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MOZ_APP_NAME%/$(MOZ_APP_NAME)/" -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%APP_BINARY%/$(APP_BINARY)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist - sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj + sed -e 's/%MOZ_APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MOZ_APP_NAME%/$(MOZ_APP_NAME)/' -e 's/%APP_VERSION%/$(APP_VERSION)/' -e 's/%APP_NAME%/$(APP_NAME)/' -e 's/%APP_BINARY%/$(APP_BINARY)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist + sed -e 's/%APP_VERSION%/$(APP_VERSION)/' -e 's/%APP_NAME%/$(APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES) $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign ifdef LIBXUL_SDK cp $(LIBXUL_DIST)/bin/xulrunner$(BIN_SUFFIX) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(APP_BINARY) rsync -a --exclude nsinstall --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks else $(RM) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS endif cp -RL $(srcdir)/b2g.icns $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME).icns - printf "APPLMOZB" > $(DIST)/$(APP_NAME).app/Contents/PkgInfo + printf APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo else # MOZ_WIDGET_TOOLKIT != cocoa libs:: ifdef LIBXUL_SDK cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) endif ifndef SKIP_COPY_XULRUNNER
--- a/b2g/build.mk +++ b/b2g/build.mk @@ -4,17 +4,17 @@ installer: @$(MAKE) -C b2g/installer installer package: @$(MAKE) -C b2g/installer install:: - @echo "B2G can't be installed directly." + @echo 'B2G can't be installed directly.' @exit 1 upload:: @$(MAKE) -C b2g/installer upload ifdef ENABLE_TESTS # Implemented in testing/testsuite-targets.mk
--- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -57,18 +57,18 @@ endif ifdef GKMEDIAS_SHARED_LIBRARY DEFINES += -DGKMEDIAS_SHARED_LIBRARY endif ifdef MOZ_PKG_MANIFEST_P $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) FORCE $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@) ifdef MOZ_CHROME_MULTILOCALE - printf "\n[multilocale]\n" >> $@ + printf '\n[multilocale]\n' >> $@ for LOCALE in $(MOZ_CHROME_MULTILOCALE) ;\ do \ - printf "$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n" >> $@; \ - printf "$(BINPATH)/chrome/$$LOCALE.manifest\n" >> $@; \ + printf '$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n' >> $@; \ + printf '$(BINPATH)/chrome/$$LOCALE.manifest\n' >> $@; \ done endif GARBAGE += $(MOZ_PKG_MANIFEST) endif
--- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -26,17 +26,17 @@ RETRIEVE_WINDOWS_INSTALLER = 1 MOZ_LANGPACK_EID=langpack-$(AB_CD)@b2g.mozilla.org PREF_JS_EXPORTS = $(call MERGE_FILE,b2g-l10n.js) ifneq (,$(filter 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)) UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \ $(NSINSTALL) -D $(STAGEDIST)/uninstall; \ cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \ $(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \ cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \ @@ -48,17 +48,17 @@ include $(topsrcdir)/config/rules.mk include $(topsrcdir)/toolkit/locales/l10n.mk $(STAGEDIST): $(DIST)/branding $(DIST)/branding: $(NSINSTALL) -D $@ libs:: - @if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \ + @if test -f '$(LOCALE_SRCDIR)/existing-profile-defaults.js'; then \ $(PYTHON) -m mozbuild.action.preprocessor $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ $(LOCALE_SRCDIR)/existing-profile-defaults.js -o $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \ fi NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD)) libs-%: $(NSINSTALL) -D $(DIST)/install @@ -69,30 +69,30 @@ libs-%: # Tailored target to just add the chrome processing for multi-locale builds chrome-%: @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe repackage-win32-installer: $(call ESCAPE_SPACE,$(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 \ - $(topsrcdir)/b2g/installer/windows/app.tag" + ZIP_IN='$(WIN32_INSTALLER_IN)' \ + ZIP_OUT='$(WIN32_INSTALLER_OUT)' \ + SFX_HEADER='$(PWD)/../installer/windows/l10ngen/7zSD.sfx \ + $(topsrcdir)/b2g/installer/windows/app.tag' ifeq (WINNT,$(OS_ARCH)) repackage-win32-installer-%: - @$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN="$(WIN32_INSTALLER_IN)" + @$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)' else repackage-win32-installer-%: ; endif clobber-zip: $(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \ $(STAGEDIST)/chrome/$(AB_CD).manifest \ @@ -104,51 +104,51 @@ clobber-zip: 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-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-% - @echo "repackaging done" + @echo 'repackaging done' # When we unpack b2g on MacOS X the platform.ini and application.ini are in slightly # different locations that on all other platforms ifeq (Darwin, $(OS_ARCH)) ifdef LIBXUL_SDK -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/../Frameworks/XUL.framework/Versions/$(MOZILLA_VERSION)/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/../Frameworks/XUL.framework/Versions/$(MOZILLA_VERSION)/platform.ini' else -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini' endif -B2G_APPLICATION_INI_PATH="$(STAGEDIST)/application.ini" +B2G_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' else ifdef LIBXUL_SDK -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/xulrunner/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/xulrunner/platform.ini' else -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini' endif -B2G_APPLICATION_INI_PATH="$(STAGEDIST)/application.ini" +B2G_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' endif ident: - @printf "gecko_revision " + @printf 'gecko_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp - @printf "b2g_revision " + @printf 'b2g_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App SourceStamp - @printf "buildid " + @printf 'buildid ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App BuildID merge-%: ifdef LOCALE_MERGEDIR $(RM) -rf $(LOCALE_MERGEDIR) MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $* endif @echo # test target, depends on make package # try to repack x-test, with just toolkit/defines.inc being there 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'
--- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -8,21 +8,21 @@ PREF_JS_EXPORTS = $(srcdir)/profile/fire $(NULL) # hardcode en-US for the moment AB_CD = en-US DEFINES += \ -DAB_CD=$(AB_CD) \ - -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" \ - -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" \ - -DNEWWINDOW_ICO=\"$(DIST)/branding/newwindow.ico\" \ - -DNEWTAB_ICO=\"$(DIST)/branding/newtab.ico\" \ - -DPBMODE_ICO=\"$(DIST)/branding/pbmode.ico\" \ + -DFIREFOX_ICO='"$(DIST)/branding/firefox.ico"' \ + -DDOCUMENT_ICO='"$(DIST)/branding/document.ico"' \ + -DNEWWINDOW_ICO='"$(DIST)/branding/newwindow.ico"' \ + -DNEWTAB_ICO='"$(DIST)/branding/newtab.ico"' \ + -DPBMODE_ICO='"$(DIST)/branding/pbmode.ico"' \ $(NULL) ifdef LIBXUL_SDK #{ PREF_JS_EXPORTS += $(srcdir)/profile/channel-prefs.js endif #} LIBXUL_SDK # Build a binary bootstrapping with XRE_main @@ -79,17 +79,17 @@ RCFLAGS += -DMOZ_PHOENIX -I$(srcdir) else RCFLAGS += -DMOZ_PHOENIX --include-dir $(srcdir) endif endif ifeq ($(OS_ARCH),OS2) RESFILE=splashos2.res RCFLAGS += -DMOZ_PHOENIX -RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\" +RCFLAGS += -DFIREFOX_ICO='"$(DIST)/branding/firefox-os2.ico"' -DDOCUMENT_ICO='"$(DIST)/branding/document-os2.ico"' endif PROGRAMS_DEST = $(DIST)/bin include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) #{ # @@ -161,20 +161,20 @@ APPFILES = MacOS endif MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/config/buildid) .PHONY: repackage tools repackage:: $(PROGRAM) $(MKDIR) -p $(dist_dest)/Contents/MacOS $(MKDIR) -p $(dist_dest)/Contents/Resources/$(AB).lproj - rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(dist_dest) --exclude English.lproj - rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(dist_dest)/Contents/Resources/$(AB).lproj - sed -e "s/%APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/" -e "s/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(dist_dest)/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_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents $(dist_dest) --exclude English.lproj + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(dist_dest)/Contents/Resources/$(AB).lproj + sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(dist_dest)/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_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings rsync -a $(DIST)/bin/ $(dist_dest)/Contents/$(APPFILES) $(RM) $(dist_dest)/Contents/MacOS/$(PROGRAM) rsync -aL $(PROGRAM) $(dist_dest)/Contents/MacOS cp -RL $(DIST)/branding/firefox.icns $(dist_dest)/Contents/Resources/firefox.icns cp -RL $(DIST)/branding/document.icns $(dist_dest)/Contents/Resources/document.icns printf APPLMOZB > $(dist_dest)/Contents/PkgInfo endif
--- a/browser/extensions/Makefile.in +++ b/browser/extensions/Makefile.in @@ -12,40 +12,40 @@ exclude_files = \ test \ install.rdf \ bootstrap.js \ icon.png \ icon64.png \ $(NULL) $(FINAL_TARGET)/chrome/pdfjs.manifest: $(GLOBAL_DEPS) - printf "manifest pdfjs/chrome.manifest" > $@ + printf 'manifest pdfjs/chrome.manifest' > $@ libs:: $(FINAL_TARGET)/chrome/pdfjs.manifest $(PYTHON) $(topsrcdir)/config/nsinstall.py \ $(srcdir)/pdfjs \ $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \ $(FINAL_TARGET)/chrome - $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest chrome/pdfjs.manifest") + $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest chrome/pdfjs.manifest') ifdef NIGHTLY_BUILD $(FINAL_TARGET)/chrome/shumway.manifest: $(GLOBAL_DEPS) - printf "manifest shumway/chrome.manifest" > $@ + printf 'manifest shumway/chrome.manifest' > $@ libs:: $(FINAL_TARGET)/chrome/shumway.manifest $(PYTHON) $(topsrcdir)/config/nsinstall.py \ $(srcdir)/shumway \ $(foreach exclude,$(exclude_files), -X $(srcdir)/shumway/$(exclude)) \ $(FINAL_TARGET)/chrome - $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest chrome/shumway.manifest") + $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest chrome/shumway.manifest') endif ifdef MOZ_METRO $(DIST)/bin/metro/chrome/pdfjs.manifest: $(GLOBAL_DEPS) - printf "manifest pdfjs/chrome.manifest" > $@ + printf 'manifest pdfjs/chrome.manifest' > $@ libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest $(PYTHON) $(topsrcdir)/config/nsinstall.py \ $(srcdir)/pdfjs \ $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \ $(DIST)/bin/metro/chrome - $(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest "manifest chrome/pdfjs.manifest") + $(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/pdfjs.manifest') endif
--- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -87,17 +87,17 @@ MOZ_PKG_MANIFEST = package-manifest GARBAGE += $(MOZ_PKG_MANIFEST) endif 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 ifndef LIBXUL_SDK INSTALL_SDK = 1 endif include $(topsrcdir)/toolkit/mozapps/installer/signing.mk include $(topsrcdir)/toolkit/mozapps/installer/packager.mk @@ -123,17 +123,17 @@ ifeq (Darwin, $(OS_ARCH)) FINDPATH = $(_APPNAME)/Contents/MacOS else FINDPATH=bin 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 installer:: ifdef INSTALLER_DIR $(MAKE) -C $(INSTALLER_DIR) endif
--- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -36,17 +36,17 @@ BRANDING_FILES = \ wizHeader.bmp \ wizHeaderRTL.bmp \ wizWatermark.bmp \ $(NULL) 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) include $(topsrcdir)/config/config.mk ifdef LOCALE_MERGEDIR PPL_LOCALE_ARGS = \ --l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \
--- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -45,31 +45,31 @@ RETRIEVE_WINDOWS_INSTALLER = 1 MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org PREF_JS_EXPORTS = $(call MERGE_FILE,firefox-l10n.js) ifneq (,$(filter 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)) UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \ $(NSINSTALL) -D $(STAGEDIST)/uninstall; \ cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \ $(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \ cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \ $(NULL) -STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ - $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ - cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ - chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ +STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \ + $(RM) '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ + cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ + chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ $(NULL) endif ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) else SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) endif @@ -135,30 +135,30 @@ endif @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) ifdef MOZ_METRO @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* 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 \ - $(topsrcdir)/browser/installer/windows/app.tag" + ZIP_IN='$(WIN32_INSTALLER_IN)' \ + ZIP_OUT='$(WIN32_INSTALLER_OUT)' \ + SFX_HEADER='$(PWD)/../installer/windows/l10ngen/7zSD.sfx \ + $(topsrcdir)/browser/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 repackage-win32-installer-%: ; endif clobber-zip: @@ -177,57 +177,57 @@ clobber-zip: 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-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-% - @echo "repackaging done" + @echo 'repackaging done' ifdef MOZ_UPDATER # Note that we want updater.ini to be in the top directory, not the browser/ # subdirectory, because that's where the updater is installed and runs. 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 ifdef MOZ_CRASHREPORTER libs:: crashreporter-override.ini $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET) endif ident: - @printf "fx_revision " + @printf 'fx_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ $(STAGEDIST)/application.ini App SourceStamp - @printf "buildid " + @printf 'buildid ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ $(STAGEDIST)/application.ini App BuildID merge-%: ifdef LOCALE_MERGEDIR $(RM) -rf $(LOCALE_MERGEDIR) MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $* endif @echo # test target, depends on make package # try to repack x-test, with just toolkit/defines.inc being there l10n-check:: INNER_UNMAKE_PACKAGE=true 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' $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) cd $(DIST)/l10n-stage && test $$(cat $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/update.locale) = x-test
--- a/browser/metro/Makefile.in +++ b/browser/metro/Makefile.in @@ -7,17 +7,17 @@ include $(topsrcdir)/config/rules.mk ######################################### # application.ini GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid) DEFINES += -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME) # 'application.ini' breaks firefox build config. So we use something different. metroapp.ini: metroapp.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt - $(RM) "metroapp.ini" + $(RM) metroapp.ini $(call py_action,preprocessor,$(DEFINES) $< -o $@) libs:: metroapp.ini $(INSTALL) metroapp.ini $(FINAL_TARGET) ######################################### GARBAGE += metroapp.ini
--- a/browser/metro/locales/Makefile.in +++ b/browser/metro/locales/Makefile.in @@ -14,11 +14,11 @@ include $(topsrcdir)/config/rules.mk ######################################### # Branding # 'browser/branding/nightly' -> 'nightly' BRANDFOLDER = $(notdir $(MOZ_BRANDING_DIRECTORY)) branding-$(BRANDFOLDER): $(MAKE) -C $(DEPTH)/browser/branding/$(BRANDFOLDER) \ - DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID="$(XPI_ROOT_APPID)" + DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID='$(XPI_ROOT_APPID)' libs:: branding-$(BRANDFOLDER)
--- a/browser/metro/locales/import/Makefile.in +++ b/browser/metro/locales/import/Makefile.in @@ -19,17 +19,17 @@ PREF_JS_EXPORTS = $(firstword $(wildcard include $(topsrcdir)/config/rules.mk ######################################### # Search plugins # Metro reuses desktop search plugins libs:: $(MAKE) -C $(DEPTH)/browser/locales searchplugins \ - DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID="$(XPI_ROOT_APPID)" + DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID='$(XPI_ROOT_APPID)' ######################################### # Bookmarks # Pick up desktop's bookmarks.inc file ifdef LOCALE_MERGEDIR vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile endif @@ -38,15 +38,15 @@ ifdef LOCALE_MERGEDIR vpath book%.inc @top_srcdir@/$(relativesrcdir)/en-US/profile endif bookmarks-src = $(srcdir)/../generic/profile/bookmarks.json.in # The resulting bookmarks.json will get picked up and packaged by the # processing of the jar file in the parent directory. bookmarks: bookmarks.inc - @echo "Generating: $@" + @echo 'Generating: $@' $(call py_action,preprocessor, \ -I $^ \ -DAB_CD=$(AB_CD) \ $(bookmarks-src) -o ../bookmarks.json) export:: bookmarks
--- a/browser/themes/linux/Makefile.in +++ b/browser/themes/linux/Makefile.in @@ -9,19 +9,19 @@ INSTALL_TARGETS += ICON # By default, the pre-processor used for jar.mn will use "%" as a marker for ".css" files and "#" # otherwise. This falls apart when a file using one marker needs to include a file with the other # marker since the pre-processor instructions in the included file will not be processed. The # following SVG files need to include a file which uses "%" as the marker so we invoke the pre- # processor ourselves here with the marker specified. The resulting SVG files will get packaged by # the processing of the jar file in this directory. tab-selected-svg: $(srcdir)/../shared/tab-selected.svg $(call py_action,preprocessor, \ - --marker "%" -D TAB_SIDE=start \ + --marker % -D TAB_SIDE=start \ $(ACDEFINES) \ $(srcdir)/../shared/tab-selected.svg -o tab-selected-start.svg) $(call py_action,preprocessor, \ - --marker "%" -D TAB_SIDE=end \ + --marker % -D TAB_SIDE=end \ $(ACDEFINES) \ $(srcdir)/../shared/tab-selected.svg -o tab-selected-end.svg) .PHONY: tab-selected-svg export:: tab-selected-svg
--- a/browser/themes/osx/Makefile.in +++ b/browser/themes/osx/Makefile.in @@ -9,19 +9,19 @@ INSTALL_TARGETS += ICON # By default, the pre-processor used for jar.mn will use "%" as a marker for ".css" files and "#" # otherwise. This falls apart when a file using one marker needs to include a file with the other # marker since the pre-processor instructions in the included file will not be processed. The # following SVG files need to include a file which uses "%" as the marker so we invoke the pre- # processor ourselves here with the marker specified. The resulting SVG files will get packaged by # the processing of the jar file in this directory. tab-selected-svg: $(srcdir)/../shared/tab-selected.svg $(call py_action,preprocessor, \ - --marker "%" -D TAB_SIDE=start \ + --marker % -D TAB_SIDE=start \ $(ACDEFINES) \ $(srcdir)/../shared/tab-selected.svg -o tab-selected-start.svg) $(call py_action,preprocessor, \ - --marker "%" -D TAB_SIDE=end \ + --marker % -D TAB_SIDE=end \ $(ACDEFINES) \ $(srcdir)/../shared/tab-selected.svg -o tab-selected-end.svg) .PHONY: tab-selected-svg export:: tab-selected-svg
--- a/build/Makefile.in +++ b/build/Makefile.in @@ -23,24 +23,24 @@ endif APP_BUILDID := $(shell cat $(DEPTH)/config/buildid) APP_INI_DEPS += $(DEPTH)/config/buildid DEFINES += -DAPP_BUILDID=$(APP_BUILDID) APP_INI_DEPS += $(DEPTH)/config/autoconf.mk -MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) +MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg 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 source_repo ?= $(call getSourceRepo,$(topsrcdir)/$(MOZ_BUILD_APP)/..) ifneq (,$(source_repo)) - DEFINES += -DMOZ_SOURCE_REPO="$(source_repo)" + DEFINES += -DMOZ_SOURCE_REPO='$(source_repo)' endif endif # Put a useful .gdbinit in the bin directory, to be picked up automatically # by GDB when we debug executables there. # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir. GDBINIT_FILES := $(topsrcdir)/.gdbinit
--- a/build/automation-build.mk +++ b/build/automation-build.mk @@ -1,28 +1,28 @@ # 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 $(MOZILLA_DIR)/build/binary-location.mk -browser_path := \"$(browser_path)\" +browser_path := '"$(browser_path)"' _PROFILE_DIR = $(TARGET_DEPTH)/_profile/pgo ABSOLUTE_TOPSRCDIR = $(abspath $(MOZILLA_DIR)) _CERTS_SRC_DIR = $(ABSOLUTE_TOPSRCDIR)/build/pgo/certs AUTOMATION_PPARGS = \ -DBROWSER_PATH=$(browser_path) \ - -DXPC_BIN_PATH=\"$(LIBXUL_DIST)/bin\" \ - -DBIN_SUFFIX=\"$(BIN_SUFFIX)\" \ - -DPROFILE_DIR=\"$(_PROFILE_DIR)\" \ - -DCERTS_SRC_DIR=\"$(_CERTS_SRC_DIR)\" \ - -DPERL="\"$(PERL)\"" \ + -DXPC_BIN_PATH='"$(LIBXUL_DIST)/bin"' \ + -DBIN_SUFFIX='"$(BIN_SUFFIX)"' \ + -DPROFILE_DIR='"$(_PROFILE_DIR)"' \ + -DCERTS_SRC_DIR='"$(_CERTS_SRC_DIR)"' \ + -DPERL='"$(PERL)"' \ $(NULL) ifeq ($(OS_ARCH),Darwin) AUTOMATION_PPARGS += -DIS_MAC=1 else AUTOMATION_PPARGS += -DIS_MAC=0 endif
--- a/build/package/Makefile.in +++ b/build/package/Makefile.in @@ -53,17 +53,17 @@ maketgz-%: makebz2-%: $(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package bz2=$(BZ2_FILE) -d $(PACKAGE_FLAGS) $* makedmg-%: $(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MACAPP_MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package dmg=$(DMG_FILE) -d $(PACKAGE_FLAGS) $* ifndef PACKAGES stage-packages makexpi-packages: - @echo "Please set PACKAGES on the makefile command line or environment." + @echo 'Please set PACKAGES on the makefile command line or environment.' else #PACKAGES stage-packages: $(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(apprefix -c ,$(HANDLERS)) $(PACKAGE_FLAGS) $(PACKAGES) makexpi-packages: $(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(apprefix -c ,$(HANDLERS)) --make-package xpi=$(XPI_FILE) -d $(PACKAGE_FLAGS) $(PACKAGES)
--- a/build/unix/elfhack/Makefile.in +++ b/build/unix/elfhack/Makefile.in @@ -22,17 +22,17 @@ test-array$(DLL_SUFFIX) test-ctors$(DLL_ @echo === and your environment \(compiler and linker versions\), and use @echo === --disable-elf-hack until this is fixed. @echo === # Fail if the library doesn't have $(DT_TYPE) .dynamic info $(TOOLCHAIN_PREFIX)readelf -d $@ | grep '($(DT_TYPE))' @rm -f $@.bak $(CURDIR)/elfhack -b -f $@ # Fail if the backup file doesn't exist - [ -f "$@.bak" ] + [ -f '$@.bak' ] # Fail if the new library doesn't contain less relocations [ $$($(TOOLCHAIN_PREFIX)objdump -R $@.bak | wc -l) -gt $$(objdump -R $@ | wc -l) ] test-array$(DLL_SUFFIX): DT_TYPE=INIT_ARRAY test-ctors$(DLL_SUFFIX): DT_TYPE=INIT .PRECIOUS: test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX)
--- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -39,17 +39,17 @@ REDIST_FILES = \ endif ifdef REDIST_FILES libs-preqs = \ $(call mkdir_deps,$(FINAL_TARGET)) \ $(NULL) libs:: $(libs-preqs) - install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET) + install --preserve-timestamps $(foreach f,$(REDIST_FILES),'$(WIN32_REDIST_DIR)'/$(f)) $(FINAL_TARGET) endif endif # ! MOZ_DEBUG endif # WIN32_REDIST_DIR # run the binscope tool to make sure the binary and all libraries # are using all available Windows OS-level security mechanisms check::
--- a/client.mk +++ b/client.mk @@ -199,17 +199,17 @@ endif else WANT_MOZCONFIG_MK = 1 endif ifdef WANT_MOZCONFIG_MK # For now, only output "export" lines from mozconfig2client-mk output. MOZCONFIG_MK_LINES := $(filter export||%,$(MOZCONFIG_OUT_LINES)) $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) - $(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo "$(subst ||, ,$(line))";) )) > $@ + $(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo '$(subst ||, ,$(line))';) )) > $@ # Include that makefile so that it is created. This should not actually change # the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives # from, has already been eval'ed. -include $(OBJDIR)/.mozconfig.mk endif # Print out any options loaded from mozconfig. @@ -273,17 +273,17 @@ ifndef MOZ_BUILD_PROJECTS for mkfile in $(MOZ_PREFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ done else # OBJDIR refers to the project-specific OBJDIR, which is not available at # 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 # If we're building multiple projects, but haven't specified which project, # loop through them. ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_BUILD_PROJECTS),,1)) @@ -325,17 +325,17 @@ CONFIG_STATUS_DEPS := \ $(TOPSRCDIR)/js/src/config/milestone.txt \ $(TOPSRCDIR)/browser/config/version.txt \ $(TOPSRCDIR)/build/virtualenv_packages.txt \ $(TOPSRCDIR)/python/mozbuild/mozbuild/virtualenv.py \ $(TOPSRCDIR)/testing/mozbase/packages.txt \ $(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 # path of $(TOPSRCDIR). ifeq ($(TOPSRCDIR),$(OBJDIR)) CONFIGURE = ./configure else @@ -358,18 +358,18 @@ configure-preqs = \ save-mozconfig: $(FOUND_MOZCONFIG) -cp $(FOUND_MOZCONFIG) $(OBJDIR)/.mozconfig 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)) $(OBJDIR)/Makefile: $(OBJDIR)/config.status $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS) else $(OBJDIR)/Makefile: $(CONFIG_STATUS_DEPS) @@ -432,27 +432,27 @@ ifndef MOZ_BUILD_PROJECTS for mkfile in $(MOZ_POSTFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ done else # OBJDIR refers to the project-specific OBJDIR, which is not available at # 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 cleansrcdir: @cd $(TOPSRCDIR); \ 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`; \ build/autoconf/clean-config.sh; \ fi; # Because SpiderMonkey can be distributed and built independently # of the Mozilla source tree, it contains its own copies of many of
--- a/config/Makefile.in +++ b/config/Makefile.in @@ -54,17 +54,17 @@ PYTHON_UNIT_TESTS := $(wildcard $(srcdir include $(topsrcdir)/config/rules.mk HOST_CFLAGS += -DUNICODE -D_UNICODE # Generate a new buildid every time we "export" in config... that's only # supposed to be once per-build! export:: ifdef MOZ_BUILD_DATE - printf "%s" $(MOZ_BUILD_DATE) > buildid + printf '%s' $(MOZ_BUILD_DATE) > buildid else $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid > buildid endif ifdef WRAP_SYSTEM_INCLUDES export-preqs = \ $(call mkdir_deps,system_wrappers) \ $(NULL)
--- a/config/config.mk +++ b/config/config.mk @@ -806,17 +806,17 @@ MERGE_FILE = $(firstword \ $(wildcard $(LOCALE_SRCDIR)/$(1)) \ $(srcdir)/en-US/$(1) ) else MERGE_FILE = $(LOCALE_SRCDIR)/$(1) endif MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f))) ifeq (OS2,$(OS_ARCH)) -RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(LIBXUL_DIST)" +RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd '$(LIBXUL_DIST)' else ifneq (WINNT,$(OS_ARCH)) RUN_TEST_PROGRAM = $(LIBXUL_DIST)/bin/run-mozilla.sh endif # ! WINNT endif # ! OS2 # # Java macros @@ -843,17 +843,17 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis EXPAND_MKSHLIB_ARGS = --uselist ifdef SYMBOL_ORDER EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) endif EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION)) ifneq ($(OS_ARCH),Darwin) -CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo "TEST-UNEXPECTED-FAIL | | We don't want these libstdc++ symbols to be used:" && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0 +CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | | We do not want these libstdc++ symbols to be used:' && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0 endif ifdef MOZ_LIBSTDCXX_TARGET_VERSION EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/build/unix/stdc++compat) endif ifdef MOZ_LIBSTDCXX_HOST_VERSION HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,host_stdc++compat,$(DEPTH)/build/unix/stdc++compat) endif
--- a/config/makefiles/autotargets.mk +++ b/config/makefiles/autotargets.mk @@ -51,28 +51,28 @@ mkdir_stem =$(foreach val,$(getargv),$(s ## Generate timestamp file for threadsafe directory creation mkdir_deps =$(foreach dir,$(getargv),$(call slash_strip,$(dir)/.mkdir.done)) ####################### ##---] TARGETS [---## ####################### %/.mkdir.done: # mkdir -p -p => mkdir -p - $(subst $(space)-p,$(null),$(MKDIR)) -p "$(dir $@)" + $(subst $(space)-p,$(null),$(MKDIR)) -p '$(dir $@)' # Make the timestamp old enough for not being a problem with symbolic links # targets depending on it. Use Jan 3, 1980 to accomodate any timezone where # 198001010000 would translate to something older than FAT epoch. - @$(TOUCH) -t 198001030000 "$@" + @$(TOUCH) -t 198001030000 '$@' # A handful of makefiles are attempting "mkdir dot". # tbpl/valgrind builds are using this target # https://bugzilla.mozilla.org/show_bug.cgi?id=837754 .mkdir.done: - @echo "WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)" - @$(TOUCH) -t 198001030000 "$@" + @echo 'WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)' + @$(TOUCH) -t 198001030000 '$@' INCLUDED_AUTOTARGETS_MK = 1 endif #} ## Accumulate deps and cleanup ifneq (,$(GENERATED_DIRS)) GENERATED_DIRS := $(strip $(sort $(GENERATED_DIRS)))
--- a/config/makefiles/target_binaries.mk +++ b/config/makefiles/target_binaries.mk @@ -20,18 +20,18 @@ endif # EXPORT_LIBRARY binaries libs:: $(SUBMAKEFILES) $(TARGETS) ifndef NO_DIST_INSTALL ifdef SHARED_LIBRARY ifdef IS_COMPONENT $(INSTALL) $(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 endif # IS_COMPONENT endif # SHARED_LIBRARY endif # !NO_DIST_INSTALL ifndef NO_DIST_INSTALL ifneq (,$(strip $(PROGRAM)$(SIMPLE_PROGRAMS))) @@ -104,20 +104,20 @@ endif # !NO_DIST_INSTALL ifdef MOZ_PSEUDO_DERECURSE BINARIES_INSTALL_TARGETS := $(foreach category,$(INSTALL_TARGETS),$(if $(filter binaries,$($(category)_TARGET)),$(category))) # Fill a dependency file with all the binaries installed somewhere in $(DIST) # and with dependencies on the relevant backend files. BINARIES_PP := $(MDDEPDIR)/binaries.pp $(BINARIES_PP): Makefile $(wildcard backend.mk) $(call mkdir_deps,$(MDDEPDIR)) - @echo "$(strip $(foreach category,$(BINARIES_INSTALL_TARGETS),\ + @echo '$(strip $(foreach category,$(BINARIES_INSTALL_TARGETS),\ $(foreach file,$($(category)_FILES) $($(category)_EXECUTABLES),\ $($(category)_DEST)/$(notdir $(file)): $(file)%\ )\ - ))binaries: Makefile $(wildcard backend.mk)" | tr % '\n' > $@ + ))binaries: Makefile $(wildcard backend.mk)' | tr % '\n' > $@ else binaries:: $(error The binaries target is not supported without MOZ_PSEUDO_DERECURSE) endif # EOF
--- a/config/recurse.mk +++ b/config/recurse.mk @@ -124,17 +124,17 @@ ifneq (,$(filter libs binaries,$(CURRENT # A few things that are not traversed by a "binaries" build, but should, in an ideal # world, are nspr, nss, icu and ffi. recurse_$(CURRENT_TIER): @$(MAKE) binaries-deps # Creating binaries-deps.mk directly would make us build it twice: once when beginning # the build because of the include, and once at the end because of the stamps. binaries-deps: $(addsuffix /binaries,$(CURRENT_DIRS)) - @$(call py_action,link_deps,-o $@.mk --group-by-depfile --topsrcdir $(topsrcdir) --topobjdir $(DEPTH) --dist $(DIST) --guard $(addprefix ",$(addsuffix ",$^))) + @$(call py_action,link_deps,-o $@.mk --group-by-depfile --topsrcdir $(topsrcdir) --topobjdir $(DEPTH) --dist $(DIST) --guard $(addprefix ',$(addsuffix ',$^))) @$(TOUCH) $@ ifeq (recurse_binaries,$(MAKECMDGOALS)) $(call include_deps,binaries-deps.mk) endif endif
--- a/config/rules.mk +++ b/config/rules.mk @@ -124,25 +124,25 @@ libs:: $(CPP_UNIT_TEST_BINS) $(call mkdi $(NSINSTALL) $(CPP_UNIT_TEST_BINS) $(DIST)/cppunittests endif check:: @$(PYTHON) $(topsrcdir)/testing/runcppunittests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) cppunittests-remote: DM_TRANS?=adb cppunittests-remote: - @if [ "${TEST_DEVICE}" != "" -o "$(DM_TRANS)" = "adb" ]; then \ + @if [ '${TEST_DEVICE}' != '' -o '$(DM_TRANS)' = 'adb' ]; then \ $(PYTHON) -u $(topsrcdir)/testing/remotecppunittests.py \ --xre-path=$(DEPTH)/dist/bin \ --localLib=$(DEPTH)/dist/$(MOZ_APP_NAME) \ --dm_trans=$(DM_TRANS) \ --deviceIP=${TEST_DEVICE} \ $(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) $(EXTRA_TEST_ARGS); \ else \ - echo "please prepare your host with environment variables for TEST_DEVICE"; \ + echo 'please prepare your host with environment variables for TEST_DEVICE'; \ fi endif # COMPILE_ENVIRONMENT endif # CPP_UNIT_TESTS .PHONY: check ifdef PYTHON_UNIT_TESTS @@ -359,23 +359,23 @@ endif ifeq ($(SOLARIS_SUNPRO_CXX),1) GARBAGE_DIRS += SunWS_cache endif ifdef MOZ_UPDATE_XTERM # Its good not to have a newline at the end of the titlebar string because it # makes the make -s output easier to read. Echo -n does not work on all # platforms, but we can trick printf into doing it. -UPDATE_TITLE = printf "\033]0;%s in %s\007" $(1) $(relativesrcdir)/$(2) ; +UPDATE_TITLE = printf '\033]0;%s in %s\007' $(1) $(relativesrcdir)/$(2) ; endif ifdef MACH ifndef NO_BUILDSTATUS_MESSAGES define BUILDSTATUS -@echo "BUILDSTATUS $1" +@echo 'BUILDSTATUS $1' endef endif endif define SUBMAKE # $(call SUBMAKE,target,directory,static) +@$(UPDATE_TITLE) +$(MAKE) $(if $(2),-C $(2)) $(1) @@ -738,32 +738,32 @@ alltags: # $(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) $(REPORT_BUILD) @$(RM) $@.manifest 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_DIR) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS) @$(call CHECK_STDCXX,$@) endif # WINNT && !GNU_CC ifdef ENABLE_STRIP $(STRIP) $(STRIP_FLAGS) $@ @@ -773,26 +773,26 @@ ifdef MOZ_POST_PROGRAM_COMMAND endif $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS) $(REPORT_BUILD) ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH)) $(EXPAND_LIBS_EXEC) -- $(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 ifeq ($(HOST_CPP_PROG_LINK),1) $(EXPAND_LIBS_EXEC) -- $(HOST_CXX) -o $@ $(HOST_CXXFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) else $(EXPAND_LIBS_EXEC) -- $(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) endif # HOST_CPP_PROG_LINK @@ -927,41 +927,41 @@ ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ rm -f $@.manifest; \ fi 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) chmod +x $@ ifdef ENABLE_STRIP $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ endif ifeq ($(SOLARIS_SUNPRO_CC),1) _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) $(topsrcdir)/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) $(topsrcdir)/build/unix/add_phony_targets.py $(_MDDEPFILE) ; \ fi endef endif # Sun Studio on Solaris # The object file is in the current directory, and the source file can be any # relative path. This macro adds the dependency obj: src for each source file. @@ -1098,18 +1098,18 @@ SPACE := $(EMPTY) $(EMPTY) # MSYS has its own special path form, but javac expects the source and class # paths to be in the DOS form (i.e. e:/builds/...). This function does the # appropriate conversion on Windows, but is a noop on other systems. ifeq ($(HOST_OS_ARCH),WINNT) # We use 'pwd -W' to get DOS form of the path. However, since the given path # 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) endif ############################################################################### # Java rules ############################################################################### @@ -1173,18 +1173,18 @@ ifdef XPT_NAME #{ ifndef NO_DIST_INSTALL _XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME) _XPT_NAME_DEST := $(FINAL_TARGET)/components 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 endif #} XPT_NAME ################################################################################ # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components ifneq (,$(filter %.js,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))) @@ -1210,17 +1210,17 @@ ifndef NO_DIST_INSTALL EXTRA_PP_COMPONENTS_PATH := $(FINAL_TARGET)/components PP_TARGETS += EXTRA_PP_COMPONENTS endif 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 ################################################################################ # Copy each element of EXTRA_JS_MODULES to # $(FINAL_TARGET)/$(JS_MODULES_PATH). JS_MODULES_PATH defaults to "modules" # if it is undefined. JS_MODULES_PATH ?= modules FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/$(JS_MODULES_PATH) @@ -1297,17 +1297,17 @@ chrome:: ifneq (,$(wildcard $(JAR_MANIFEST))) ifndef NO_DIST_INSTALL ifdef XPI_NAME ifdef XPI_ROOT_APPID # For add-on packaging we may specify that an application # sub-dir should be added to the root chrome manifest with # a specific application id. -MAKE_JARS_FLAGS += --root-manifest-entry-appid="$(XPI_ROOT_APPID)" +MAKE_JARS_FLAGS += --root-manifest-entry-appid='$(XPI_ROOT_APPID)' endif # if DIST_SUBDIR is defined but XPI_ROOT_APPID is not there's # no way langpacks will get packaged right, so error out. ifneq (,$(DIST_SUBDIR)) ifndef XPI_ROOT_APPID $(error XPI_ROOT_APPID is not defined - langpacks will break.) endif @@ -1334,55 +1334,55 @@ DIST_CHROME_FILES_PATH := $(FINAL_TARGET DIST_CHROME_FILES_FLAGS := $(XULAPP_DEFINES) PP_TARGETS += DIST_CHROME_FILES endif 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 ifdef INSTALL_EXTENSION_ID ifndef XPI_NAME $(error XPI_NAME must be set for INSTALL_EXTENSION_ID) endif tools:: - $(RM) -r "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)" - $(NSINSTALL) -D "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)" + $(RM) -r '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)' + $(NSINSTALL) -D '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)' $(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)) endif ############################################################################# # MDDEPDIR is the subdirectory where all the dependency files are placed. # This uses a make rule (instead of a macro) to support parallel # builds (-jN). If this were done in the LOOP_OVER_DIRS macro, two @@ -1494,21 +1494,21 @@ endef $(foreach tier,$(INSTALL_TARGETS_TIERS), \ $(eval $(tier):: $(INSTALL_TARGETS_FILES_$(tier)) $(INSTALL_TARGETS_EXECUTABLES_$(tier))) \ ) install_targets_sanity = $(if $(filter-out $(notdir $@),$(notdir $(<))),$(error Looks like $@ has an unexpected dependency on $< which breaks INSTALL_TARGETS)) $(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_FILES_$(tier)))): $(install_targets_sanity) - $(call install_cmd,$(IFLAGS1) "$<" "$(@D)") + $(call install_cmd,$(IFLAGS1) '$<' '$(@D)') $(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_EXECUTABLES_$(tier)))): $(install_targets_sanity) - $(call install_cmd,$(IFLAGS2) "$<" "$(@D)") + $(call install_cmd,$(IFLAGS2) '$<' '$(@D)') ################################################################################ # Preprocessing rules # # The PP_TARGETS variable contains a list of all preprocessing target # categories. Each category has associated variables listing input files, the # output directory, extra preprocessor flags, and so on. For example: # @@ -1559,18 +1559,18 @@ pp_target_results = $(foreach file,$($(1 $(foreach tier,$(PP_TARGETS_TIERS), \ $(eval $(tier):: $(PP_TARGETS_RESULTS_$(tier))) \ ) PP_TARGETS_ALL_RESULTS := $(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS_RESULTS_$(tier)))) $(PP_TARGETS_ALL_RESULTS): $(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS)) - $(RM) "$@" - $(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) "$<" -o "$@") + $(RM) '$@' + $(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) '$<' -o '$@') # The depfile is based on the filename, and we don't want conflicts. So check # there's only one occurrence of any given filename in PP_TARGETS_ALL_RESULTS. PP_TARGETS_ALL_RESULT_NAMES := $(notdir $(PP_TARGETS_ALL_RESULTS)) $(foreach file,$(sort $(PP_TARGETS_ALL_RESULT_NAMES)), \ $(if $(filter-out 1,$(words $(filter $(file),$(PP_TARGETS_ALL_RESULT_NAMES)))), \ $(error Multiple preprocessing rules are creating a $(file) file) \ ) \
--- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -16,21 +16,21 @@ DEFINES += \ $(NULL) MY_MANIFEST = $(if $(USE_EXTENSION_MANIFEST), $(FINAL_TARGET)/chrome.manifest, $(FINAL_TARGET)/chrome/test.manifest) REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest) check-%:: if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; $(MAKE) realchrome MOZ_CHROME_FILE_FORMAT=$* - @echo "Comparing manifests..." + @echo 'Comparing manifests...' @if ! sort $(MY_MANIFEST) | diff --text -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \ - echo "TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!" ; \ + echo 'TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!' ; \ false; \ fi - @if [ $* = "jar" ]; then \ + @if [ $* = 'jar' ]; then \ $(UNZIP) -d $(FINAL_TARGET)/chrome/test $(FINAL_TARGET)/chrome/test.jar; \ fi - @echo "Comparing packages..." + @echo 'Comparing packages...' @if ! diff -ur $(srcdir)/../ref-simple $(FINAL_TARGET)/chrome/test ; then\ - echo "TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar" ; \ + echo 'TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar' ; \ false; \ fi
--- a/configure.in +++ b/configure.in @@ -1701,17 +1701,17 @@ fi dnl ======================================================== dnl System overrides of the defaults for host dnl ======================================================== case "$host" in *mingw*) if test -n "$_WIN32_MSVC"; then HOST_AR=lib - HOST_AR_FLAGS='-NOLOGO -OUT:"$@"' + HOST_AR_FLAGS='-NOLOGO -OUT:$@' HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -Fd\$(HOST_PDBFILE)" HOST_RANLIB='echo ranlib' else HOST_CFLAGS="$HOST_CFLAGS -mwindows" fi HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11 -D_CRT_SECURE_NO_WARNINGS" HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" @@ -2057,17 +2057,17 @@ ia64*-hpux*) TARGET_COMPILER_ABI=msvc HOST_CC='$(CC)' HOST_CXX='$(CXX)' HOST_LD='$(LD)' if test "$AS_BIN"; then AS="$(basename "$AS_BIN")" fi AR='lib' - AR_FLAGS='-NOLOGO -OUT:"$@"' + AR_FLAGS='-NOLOGO -OUT:$@' AR_EXTRACT= RANLIB='echo not_ranlib' STRIP='echo not_strip' PKG_SKIP_STRIP=1 XARGS=xargs ZIP=zip UNZIP=unzip DOXYGEN=:
--- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -17,17 +17,17 @@ VPATH += $(srcdir)/src/third_party/murmu # Target: 'translator_glsl' # Requires: 'translator_common' # src/compiler: ifdef MOZ_ANGLE_RENDERER libs:: ifdef MOZ_D3DCOMPILER_CAB - expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin" + expand '$(MOZ_D3DCOMPILER_CAB)' -F:$(MOZ_D3DCOMPILER_DLL) '$(DIST)/bin' endif endif include $(topsrcdir)/config/rules.mk # We have to filter out -pedantic, because of # comma-at-end-of-enumerator list failures. We can try to get this fixed
--- a/gfx/angle/src/libEGL/Makefile.in +++ b/gfx/angle/src/libEGL/Makefile.in @@ -23,24 +23,24 @@ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) VPATH += $(srcdir)/../common # src/libEGL: VPATH += $(srcdir)/../libEGL DEFFILE = $(srcdir)/libEGL.def RCFILE = $(srcdir)/libEGL.rc include $(topsrcdir)/config/rules.mk -CXXFLAGS += -I"$(MOZ_DIRECTX_SDK_PATH)/include" +CXXFLAGS += -I'$(MOZ_DIRECTX_SDK_PATH)/include' #OS_LIBS += $(call EXPAND_LIBNAME,dwmapi) ifdef GNU_CC OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions OS_LIBS += -ld3d9 -llibGLESv2 else -EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \ - "$(DIST)/lib/libGLESv2.lib" \ +EXTRA_DSO_LDOPTS = '$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib' \ + '$(DIST)/lib/libGLESv2.lib' \ delayimp.lib endif
--- a/gfx/angle/src/libGLESv2/Makefile.in +++ b/gfx/angle/src/libGLESv2/Makefile.in @@ -39,24 +39,24 @@ VPATH += $(srcdir)/../common # src/common: DEFFILE = $(srcdir)/libGLESv2.def RCFILE = $(srcdir)/libGLESv2.rc # End build_angle.gypi transcription. include $(topsrcdir)/config/rules.mk -CXXFLAGS += -I"$(MOZ_DIRECTX_SDK_PATH)/include" +CXXFLAGS += -I'$(MOZ_DIRECTX_SDK_PATH)/include' ifdef GNU_CC TextureSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions OS_LIBS += -ld3d9 -ldxguid else -EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \ - "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/dxguid.lib" \ +EXTRA_DSO_LDOPTS = '$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib' \ + '$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/dxguid.lib' \ delayimp.lib endif
--- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -77,16 +77,16 @@ ifndef GNU_CC #{ LDFLAGS += /HEAP:0x40000 endif #} endif #} ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{ libs:: $(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app - rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/$(PROGRAM).app - sed -e "s/%PROGRAM%/$(PROGRAM)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/bin/$(PROGRAM).app/Contents/Info.plist - sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ + rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/$(PROGRAM).app + sed -e 's/%PROGRAM%/$(PROGRAM)/' $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/bin/$(PROGRAM).app/Contents/Info.plist + sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/$(PROGRAM).app/Contents/Resources/English.lproj/InfoPlist.strings $(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app/Contents/MacOS $(NSINSTALL) $(PROGRAM) $(DIST)/bin/$(PROGRAM).app/Contents/MacOS $(RM) $(DIST)/bin/$(PROGRAM) endif #}
--- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -65,11 +65,11 @@ include $(topsrcdir)/config/rules.mk ifdef MOZ_NATIVE_LIBEVENT # { export-preqs = \ $(call mkdir_deps,$(DIST)/third_party/libevent) \ $(NULL) export:: $(export-preqs) - echo "#include <event.h>" > $(DIST)/third_party/libevent/event.h + echo '#include <event.h>' > $(DIST)/third_party/libevent/event.h endif # }
--- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -11,17 +11,17 @@ endif make_min_ver := 3.81 ifneq ($(make_min_ver),$(firstword $(sort $(make_min_ver) $(MAKE_VERSION)))) $(error GNU Make $(make_min_ver) or higher is required) endif endif TOPLEVEL_BUILD := 1 -run_for_side_effects := $(shell echo "MAKE: $(MAKE)") +run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') STATIC_LIBRARY_NAME = js_static LIBS = $(NSPR_LIBS) DIST_INSTALL = 1 VPATH += \ $(srcdir) \ $(srcdir)/builtin \ @@ -136,17 +136,17 @@ USE_HOST_CXX = 1 ifdef HAVE_DTRACE ifneq ($(OS_ARCH),Darwin) DTRACE_PROBE_OBJ = $(LIBRARY_NAME)-dtrace.$(OBJ_SUFFIX) endif MOZILLA_DTRACE_SRC = $(srcdir)/devtools/javascript-trace.d endif backend.RecursiveMakeBackend: - @echo "Build configuration changed. Regenerating backend." + @echo 'Build configuration changed. Regenerating backend.' $(PYTHON) config.status Makefile: backend.RecursiveMakeBackend @$(TOUCH) $@ include backend.RecursiveMakeBackend.pp default:: backend.RecursiveMakeBackend @@ -167,17 +167,17 @@ endif # Ensure symbol versions of shared library on Linux do not conflict # with those in libxul. ifeq (Linux,$(OS_TARGET)) EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript symverscript: symverscript.in $(call py_action,preprocessor, \ - -DVERSION="$(subst -,_,$(LIBRARY_NAME))" $< -o $@) + -DVERSION='$(subst -,_,$(LIBRARY_NAME))' $< -o $@) EXTRA_DEPS += symverscript endif export_files = js-config.h ifdef HAVE_DTRACE export_files += $(CURDIR)/javascript-trace.h endif @@ -314,17 +314,17 @@ check-jit-test:: check:: check-style check-jit-test # jstests doesn't have a --jitflags option, so we need to loop, updating the # exit code (RC) after each invocation. # FIXME: MethodJIT doesn't work for 1 test case (bug 644393), so # --no-extensions is set to skip that test. Remove as soon as possible. check-jstests: RC=0; \ - for f in `echo "$(JITFLAGS)" | tr ',' '\n'`; \ + for f in `echo '$(JITFLAGS)' | tr ',' '\n'`; \ do \ $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/tests/jstests.py \ --tinderbox --no-progress \ --no-extensions \ --timeout 300 \ --args="`echo $$f | sed 's/\(.\)/ -\1/g'`" \ $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX); \ RC=$$(( $$RC || $$?)); \ @@ -473,30 +473,30 @@ endif # All this information needs to go into the js-config script. To # avoid trying to re-compute all that in the configure script, we just # have the configure script generate this Makefile, and then invoke # this rule. # Set the various definitions that will be substituted for js-config # and for the pck-config .pc file. JS_CONFIG_SUBSTITUTIONS=\ - -Dprefix="$(prefix)" \ - -Dexec_prefix="$(exec_prefix)" \ - -Dincludedir="$(includedir)" \ - -Dlibdir="$(libdir)" \ - -DMOZILLA_VERSION="$(MOZILLA_VERSION)" \ - -DLIBRARY_NAME="$(LIBRARY_NAME)" \ - -DJS_CONFIG_LIBS="$(JS_CONFIG_LIBS)" \ - -DJS_CONFIG_MOZ_JS_LIBS="$(JS_CONFIG_MOZ_JS_LIBS)" \ - -DMOZJS_MAJOR_VERSION="$(MOZJS_MAJOR_VERSION)" \ - -DMOZJS_MINOR_VERSION="$(MOZJS_MINOR_VERSION)" \ - -DMOZJS_PATCH_VERSION="$(MOZJS_PATCH_VERSION)" \ - -DMOZJS_ALPHA="$(MOZJS_ALPHA)" \ - -DNSPR_CFLAGS="$(NSPR_CFLAGS)" \ - -DNSPR_PKGCONF_CHECK="$(NSPR_PKGCONF_CHECK)" \ + -Dprefix='$(prefix)' \ + -Dexec_prefix='$(exec_prefix)' \ + -Dincludedir='$(includedir)' \ + -Dlibdir='$(libdir)' \ + -DMOZILLA_VERSION='$(MOZILLA_VERSION)' \ + -DLIBRARY_NAME='$(LIBRARY_NAME)' \ + -DJS_CONFIG_LIBS='$(JS_CONFIG_LIBS)' \ + -DJS_CONFIG_MOZ_JS_LIBS='$(JS_CONFIG_MOZ_JS_LIBS)' \ + -DMOZJS_MAJOR_VERSION='$(MOZJS_MAJOR_VERSION)' \ + -DMOZJS_MINOR_VERSION='$(MOZJS_MINOR_VERSION)' \ + -DMOZJS_PATCH_VERSION='$(MOZJS_PATCH_VERSION)' \ + -DMOZJS_ALPHA='$(MOZJS_ALPHA)' \ + -DNSPR_CFLAGS='$(NSPR_CFLAGS)' \ + -DNSPR_PKGCONF_CHECK='$(NSPR_PKGCONF_CHECK)' \ $(NULL) $(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk $(RM) $@.tmp $(call py_action,preprocessor,--marker % $(JS_CONFIG_SUBSTITUTIONS) $< -o $@.tmp) mv $@.tmp $@ && chmod +x $@ SCRIPTS = $(JS_CONFIG_NAME) @@ -568,17 +568,17 @@ endif # Force auto-header generation before compiling any source that may use them $(OBJS): $(CURDIR)/jsautokw.h $(CURDIR)/jsautooplen.h ifdef MOZ_ETW ETWProvider.h ETWProvider.rc ETWProvider.mof: ETWProvider.man $(MC) -um -mof $^ ETWProvider.res: ETWProvider.rc - $(RC) -r -i "$(SDKDIR)Include" $^ + $(RC) -r -i '$(SDKDIR)Include' $^ export:: ETWProvider.res install:: ETWProvider.mof ETWProvider.man $(SYSINSTALL) $^ $(DESTDIR)$(bindir) endif
--- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -806,17 +806,17 @@ MERGE_FILE = $(firstword \ $(wildcard $(LOCALE_SRCDIR)/$(1)) \ $(srcdir)/en-US/$(1) ) else MERGE_FILE = $(LOCALE_SRCDIR)/$(1) endif MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f))) ifeq (OS2,$(OS_ARCH)) -RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(LIBXUL_DIST)" +RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd '$(LIBXUL_DIST)' else ifneq (WINNT,$(OS_ARCH)) RUN_TEST_PROGRAM = $(LIBXUL_DIST)/bin/run-mozilla.sh endif # ! WINNT endif # ! OS2 # # Java macros @@ -843,17 +843,17 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis EXPAND_MKSHLIB_ARGS = --uselist ifdef SYMBOL_ORDER EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) endif EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION)) ifneq ($(OS_ARCH),Darwin) -CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo "TEST-UNEXPECTED-FAIL | | We don't want these libstdc++ symbols to be used:" && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0 +CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | | We do not want these libstdc++ symbols to be used:' && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0 endif ifdef MOZ_LIBSTDCXX_TARGET_VERSION EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/build/unix/stdc++compat) endif ifdef MOZ_LIBSTDCXX_HOST_VERSION HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,host_stdc++compat,$(DEPTH)/build/unix/stdc++compat) endif
--- a/js/src/config/makefiles/autotargets.mk +++ b/js/src/config/makefiles/autotargets.mk @@ -51,28 +51,28 @@ mkdir_stem =$(foreach val,$(getargv),$(s ## Generate timestamp file for threadsafe directory creation mkdir_deps =$(foreach dir,$(getargv),$(call slash_strip,$(dir)/.mkdir.done)) ####################### ##---] TARGETS [---## ####################### %/.mkdir.done: # mkdir -p -p => mkdir -p - $(subst $(space)-p,$(null),$(MKDIR)) -p "$(dir $@)" + $(subst $(space)-p,$(null),$(MKDIR)) -p '$(dir $@)' # Make the timestamp old enough for not being a problem with symbolic links # targets depending on it. Use Jan 3, 1980 to accomodate any timezone where # 198001010000 would translate to something older than FAT epoch. - @$(TOUCH) -t 198001030000 "$@" + @$(TOUCH) -t 198001030000 '$@' # A handful of makefiles are attempting "mkdir dot". # tbpl/valgrind builds are using this target # https://bugzilla.mozilla.org/show_bug.cgi?id=837754 .mkdir.done: - @echo "WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)" - @$(TOUCH) -t 198001030000 "$@" + @echo 'WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)' + @$(TOUCH) -t 198001030000 '$@' INCLUDED_AUTOTARGETS_MK = 1 endif #} ## Accumulate deps and cleanup ifneq (,$(GENERATED_DIRS)) GENERATED_DIRS := $(strip $(sort $(GENERATED_DIRS)))
--- a/js/src/config/makefiles/target_binaries.mk +++ b/js/src/config/makefiles/target_binaries.mk @@ -20,18 +20,18 @@ endif # EXPORT_LIBRARY binaries libs:: $(SUBMAKEFILES) $(TARGETS) ifndef NO_DIST_INSTALL ifdef SHARED_LIBRARY ifdef IS_COMPONENT $(INSTALL) $(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 endif # IS_COMPONENT endif # SHARED_LIBRARY endif # !NO_DIST_INSTALL ifndef NO_DIST_INSTALL ifneq (,$(strip $(PROGRAM)$(SIMPLE_PROGRAMS))) @@ -104,20 +104,20 @@ endif # !NO_DIST_INSTALL ifdef MOZ_PSEUDO_DERECURSE BINARIES_INSTALL_TARGETS := $(foreach category,$(INSTALL_TARGETS),$(if $(filter binaries,$($(category)_TARGET)),$(category))) # Fill a dependency file with all the binaries installed somewhere in $(DIST) # and with dependencies on the relevant backend files. BINARIES_PP := $(MDDEPDIR)/binaries.pp $(BINARIES_PP): Makefile $(wildcard backend.mk) $(call mkdir_deps,$(MDDEPDIR)) - @echo "$(strip $(foreach category,$(BINARIES_INSTALL_TARGETS),\ + @echo '$(strip $(foreach category,$(BINARIES_INSTALL_TARGETS),\ $(foreach file,$($(category)_FILES) $($(category)_EXECUTABLES),\ $($(category)_DEST)/$(notdir $(file)): $(file)%\ )\ - ))binaries: Makefile $(wildcard backend.mk)" | tr % '\n' > $@ + ))binaries: Makefile $(wildcard backend.mk)' | tr % '\n' > $@ else binaries:: $(error The binaries target is not supported without MOZ_PSEUDO_DERECURSE) endif # EOF
--- a/js/src/config/recurse.mk +++ b/js/src/config/recurse.mk @@ -124,17 +124,17 @@ ifneq (,$(filter libs binaries,$(CURRENT # A few things that are not traversed by a "binaries" build, but should, in an ideal # world, are nspr, nss, icu and ffi. recurse_$(CURRENT_TIER): @$(MAKE) binaries-deps # Creating binaries-deps.mk directly would make us build it twice: once when beginning # the build because of the include, and once at the end because of the stamps. binaries-deps: $(addsuffix /binaries,$(CURRENT_DIRS)) - @$(call py_action,link_deps,-o $@.mk --group-by-depfile --topsrcdir $(topsrcdir) --topobjdir $(DEPTH) --dist $(DIST) --guard $(addprefix ",$(addsuffix ",$^))) + @$(call py_action,link_deps,-o $@.mk --group-by-depfile --topsrcdir $(topsrcdir) --topobjdir $(DEPTH) --dist $(DIST) --guard $(addprefix ',$(addsuffix ',$^))) @$(TOUCH) $@ ifeq (recurse_binaries,$(MAKECMDGOALS)) $(call include_deps,binaries-deps.mk) endif endif
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -124,25 +124,25 @@ libs:: $(CPP_UNIT_TEST_BINS) $(call mkdi $(NSINSTALL) $(CPP_UNIT_TEST_BINS) $(DIST)/cppunittests endif check:: @$(PYTHON) $(topsrcdir)/testing/runcppunittests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) cppunittests-remote: DM_TRANS?=adb cppunittests-remote: - @if [ "${TEST_DEVICE}" != "" -o "$(DM_TRANS)" = "adb" ]; then \ + @if [ '${TEST_DEVICE}' != '' -o '$(DM_TRANS)' = 'adb' ]; then \ $(PYTHON) -u $(topsrcdir)/testing/remotecppunittests.py \ --xre-path=$(DEPTH)/dist/bin \ --localLib=$(DEPTH)/dist/$(MOZ_APP_NAME) \ --dm_trans=$(DM_TRANS) \ --deviceIP=${TEST_DEVICE} \ $(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) $(EXTRA_TEST_ARGS); \ else \ - echo "please prepare your host with environment variables for TEST_DEVICE"; \ + echo 'please prepare your host with environment variables for TEST_DEVICE'; \ fi endif # COMPILE_ENVIRONMENT endif # CPP_UNIT_TESTS .PHONY: check ifdef PYTHON_UNIT_TESTS @@ -359,23 +359,23 @@ endif ifeq ($(SOLARIS_SUNPRO_CXX),1) GARBAGE_DIRS += SunWS_cache endif ifdef MOZ_UPDATE_XTERM # Its good not to have a newline at the end of the titlebar string because it # makes the make -s output easier to read. Echo -n does not work on all # platforms, but we can trick printf into doing it. -UPDATE_TITLE = printf "\033]0;%s in %s\007" $(1) $(relativesrcdir)/$(2) ; +UPDATE_TITLE = printf '\033]0;%s in %s\007' $(1) $(relativesrcdir)/$(2) ; endif ifdef MACH ifndef NO_BUILDSTATUS_MESSAGES define BUILDSTATUS -@echo "BUILDSTATUS $1" +@echo 'BUILDSTATUS $1' endef endif endif define SUBMAKE # $(call SUBMAKE,target,directory,static) +@$(UPDATE_TITLE) +$(MAKE) $(if $(2),-C $(2)) $(1) @@ -738,32 +738,32 @@ alltags: # $(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) $(REPORT_BUILD) @$(RM) $@.manifest 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_DIR) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS) @$(call CHECK_STDCXX,$@) endif # WINNT && !GNU_CC ifdef ENABLE_STRIP $(STRIP) $(STRIP_FLAGS) $@ @@ -773,26 +773,26 @@ ifdef MOZ_POST_PROGRAM_COMMAND endif $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS) $(REPORT_BUILD) ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH)) $(EXPAND_LIBS_EXEC) -- $(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 ifeq ($(HOST_CPP_PROG_LINK),1) $(EXPAND_LIBS_EXEC) -- $(HOST_CXX) -o $@ $(HOST_CXXFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) else $(EXPAND_LIBS_EXEC) -- $(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) endif # HOST_CPP_PROG_LINK @@ -927,41 +927,41 @@ ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ rm -f $@.manifest; \ fi 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) chmod +x $@ ifdef ENABLE_STRIP $(STRIP) $(STRIP_FLAGS) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ endif ifeq ($(SOLARIS_SUNPRO_CC),1) _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) $(topsrcdir)/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) $(topsrcdir)/build/unix/add_phony_targets.py $(_MDDEPFILE) ; \ fi endef endif # Sun Studio on Solaris # The object file is in the current directory, and the source file can be any # relative path. This macro adds the dependency obj: src for each source file. @@ -1098,18 +1098,18 @@ SPACE := $(EMPTY) $(EMPTY) # MSYS has its own special path form, but javac expects the source and class # paths to be in the DOS form (i.e. e:/builds/...). This function does the # appropriate conversion on Windows, but is a noop on other systems. ifeq ($(HOST_OS_ARCH),WINNT) # We use 'pwd -W' to get DOS form of the path. However, since the given path # 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) endif ############################################################################### # Java rules ############################################################################### @@ -1173,18 +1173,18 @@ ifdef XPT_NAME #{ ifndef NO_DIST_INSTALL _XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME) _XPT_NAME_DEST := $(FINAL_TARGET)/components 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 endif #} XPT_NAME ################################################################################ # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components ifneq (,$(filter %.js,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))) @@ -1210,17 +1210,17 @@ ifndef NO_DIST_INSTALL EXTRA_PP_COMPONENTS_PATH := $(FINAL_TARGET)/components PP_TARGETS += EXTRA_PP_COMPONENTS endif 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 ################################################################################ # Copy each element of EXTRA_JS_MODULES to # $(FINAL_TARGET)/$(JS_MODULES_PATH). JS_MODULES_PATH defaults to "modules" # if it is undefined. JS_MODULES_PATH ?= modules FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/$(JS_MODULES_PATH) @@ -1297,17 +1297,17 @@ chrome:: ifneq (,$(wildcard $(JAR_MANIFEST))) ifndef NO_DIST_INSTALL ifdef XPI_NAME ifdef XPI_ROOT_APPID # For add-on packaging we may specify that an application # sub-dir should be added to the root chrome manifest with # a specific application id. -MAKE_JARS_FLAGS += --root-manifest-entry-appid="$(XPI_ROOT_APPID)" +MAKE_JARS_FLAGS += --root-manifest-entry-appid='$(XPI_ROOT_APPID)' endif # if DIST_SUBDIR is defined but XPI_ROOT_APPID is not there's # no way langpacks will get packaged right, so error out. ifneq (,$(DIST_SUBDIR)) ifndef XPI_ROOT_APPID $(error XPI_ROOT_APPID is not defined - langpacks will break.) endif @@ -1334,55 +1334,55 @@ DIST_CHROME_FILES_PATH := $(FINAL_TARGET DIST_CHROME_FILES_FLAGS := $(XULAPP_DEFINES) PP_TARGETS += DIST_CHROME_FILES endif 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 ifdef INSTALL_EXTENSION_ID ifndef XPI_NAME $(error XPI_NAME must be set for INSTALL_EXTENSION_ID) endif tools:: - $(RM) -r "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)" - $(NSINSTALL) -D "$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)" + $(RM) -r '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)' + $(NSINSTALL) -D '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)' $(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)) endif ############################################################################# # MDDEPDIR is the subdirectory where all the dependency files are placed. # This uses a make rule (instead of a macro) to support parallel # builds (-jN). If this were done in the LOOP_OVER_DIRS macro, two @@ -1494,21 +1494,21 @@ endef $(foreach tier,$(INSTALL_TARGETS_TIERS), \ $(eval $(tier):: $(INSTALL_TARGETS_FILES_$(tier)) $(INSTALL_TARGETS_EXECUTABLES_$(tier))) \ ) install_targets_sanity = $(if $(filter-out $(notdir $@),$(notdir $(<))),$(error Looks like $@ has an unexpected dependency on $< which breaks INSTALL_TARGETS)) $(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_FILES_$(tier)))): $(install_targets_sanity) - $(call install_cmd,$(IFLAGS1) "$<" "$(@D)") + $(call install_cmd,$(IFLAGS1) '$<' '$(@D)') $(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_EXECUTABLES_$(tier)))): $(install_targets_sanity) - $(call install_cmd,$(IFLAGS2) "$<" "$(@D)") + $(call install_cmd,$(IFLAGS2) '$<' '$(@D)') ################################################################################ # Preprocessing rules # # The PP_TARGETS variable contains a list of all preprocessing target # categories. Each category has associated variables listing input files, the # output directory, extra preprocessor flags, and so on. For example: # @@ -1559,18 +1559,18 @@ pp_target_results = $(foreach file,$($(1 $(foreach tier,$(PP_TARGETS_TIERS), \ $(eval $(tier):: $(PP_TARGETS_RESULTS_$(tier))) \ ) PP_TARGETS_ALL_RESULTS := $(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS_RESULTS_$(tier)))) $(PP_TARGETS_ALL_RESULTS): $(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS)) - $(RM) "$@" - $(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) "$<" -o "$@") + $(RM) '$@' + $(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) '$<' -o '$@') # The depfile is based on the filename, and we don't want conflicts. So check # there's only one occurrence of any given filename in PP_TARGETS_ALL_RESULTS. PP_TARGETS_ALL_RESULT_NAMES := $(notdir $(PP_TARGETS_ALL_RESULTS)) $(foreach file,$(sort $(PP_TARGETS_ALL_RESULT_NAMES)), \ $(if $(filter-out 1,$(words $(filter $(file),$(PP_TARGETS_ALL_RESULT_NAMES)))), \ $(error Multiple preprocessing rules are creating a $(file) file) \ ) \
--- a/js/src/configure.in +++ b/js/src/configure.in @@ -1315,17 +1315,17 @@ MOZ_ARG_ENABLE_BOOL(profiling, dnl ======================================================== dnl System overrides of the defaults for host dnl ======================================================== case "$host" in *mingw*) if test -n "$_WIN32_MSVC"; then HOST_AR=lib - HOST_AR_FLAGS='-NOLOGO -OUT:"$@"' + HOST_AR_FLAGS='-NOLOGO -OUT:$@' HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -Fd\$(HOST_PDBFILE)" HOST_RANLIB='echo ranlib' else HOST_CFLAGS="$HOST_CFLAGS -mwindows" fi HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11 -D_CRT_SECURE_NO_WARNINGS" HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" @@ -1614,17 +1614,17 @@ ia64*-hpux*) TARGET_COMPILER_ABI=msvc HOST_CC='$(CC)' HOST_CXX='$(CXX)' HOST_LD='$(LD)' if test "$AS_BIN"; then AS="$(basename "$AS_BIN")" fi AR='lib' - AR_FLAGS='-NOLOGO -OUT:"$@"' + AR_FLAGS='-NOLOGO -OUT:$@' AR_EXTRACT= RANLIB='echo not_ranlib' STRIP='echo not_strip' PKG_SKIP_STRIP=1 XARGS=xargs DOXYGEN=: ASM_SUFFIX=asm OBJ_SUFFIX=obj
--- a/js/src/ctypes/libffi/Makefile.in +++ b/js/src/ctypes/libffi/Makefile.in @@ -428,49 +428,49 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 info_TEXINFOS = doc/libffi.texi # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. AM_MAKEFLAGS = \ - "AR_FLAGS=$(AR_FLAGS)" \ - "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ - "CFLAGS=$(CFLAGS)" \ - "CXXFLAGS=$(CXXFLAGS)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ - "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ - "JC1FLAGS=$(JC1FLAGS)" \ - "LDFLAGS=$(LDFLAGS)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ - "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ - "MAKE=$(MAKE)" \ - "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ - "PICFLAG=$(PICFLAG)" \ - "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ - "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "SHELL=$(SHELL)" \ - "exec_prefix=$(exec_prefix)" \ - "infodir=$(infodir)" \ - "libdir=$(libdir)" \ - "mandir=$(mandir)" \ - "prefix=$(prefix)" \ - "AR=$(AR)" \ - "AS=$(AS)" \ - "CC=$(CC)" \ - "CXX=$(CXX)" \ - "LD=$(LD)" \ - "NM=$(NM)" \ - "RANLIB=$(RANLIB)" \ - "DESTDIR=$(DESTDIR)" + 'AR_FLAGS=$(AR_FLAGS)' \ + 'CC_FOR_BUILD=$(CC_FOR_BUILD)' \ + 'CFLAGS=$(CFLAGS)' \ + 'CXXFLAGS=$(CXXFLAGS)' \ + 'CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)' \ + 'CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)' \ + 'INSTALL=$(INSTALL)' \ + 'INSTALL_DATA=$(INSTALL_DATA)' \ + 'INSTALL_PROGRAM=$(INSTALL_PROGRAM)' \ + 'INSTALL_SCRIPT=$(INSTALL_SCRIPT)' \ + 'JC1FLAGS=$(JC1FLAGS)' \ + 'LDFLAGS=$(LDFLAGS)' \ + 'LIBCFLAGS=$(LIBCFLAGS)' \ + 'LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)' \ + 'MAKE=$(MAKE)' \ + 'MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)' \ + 'PICFLAG=$(PICFLAG)' \ + 'PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)' \ + 'RUNTESTFLAGS=$(RUNTESTFLAGS)' \ + 'SHELL=$(SHELL)' \ + 'exec_prefix=$(exec_prefix)' \ + 'infodir=$(infodir)' \ + 'libdir=$(libdir)' \ + 'mandir=$(mandir)' \ + 'prefix=$(prefix)' \ + 'AR=$(AR)' \ + 'AS=$(AS)' \ + 'CC=$(CC)' \ + 'CXX=$(CXX)' \ + 'LD=$(LD)' \ + 'NM=$(NM)' \ + 'RANLIB=$(RANLIB)' \ + 'DESTDIR=$(DESTDIR)' MAKEOVERRIDES = ACLOCAL_AMFLAGS = $(ACLOCAL_AMFLAGS) -I m4 lib_LTLIBRARIES = libffi.la noinst_LTLIBRARIES = libffi_convenience.la libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c \ src/raw_api.c src/java_raw_api.c src/closures.c
--- a/js/src/devtools/rootAnalysis/Makefile.in +++ b/js/src/devtools/rootAnalysis/Makefile.in @@ -71,11 +71,11 @@ gcTypes.txt: src_comp.xdb computeGCTypes allFunctions.txt: src_body.xdb @echo Started computation of $@ at $$(date) time $(SIXGILL)/bin/xdbkeys $^ > $@.tmp mv $@.tmp $@ @echo Finished computation of $@ at $$(date) rootingHazards.txt: gcFunctions.lst suppressedFunctions.lst gcTypes.txt analyzeRoots.js annotations.js gen-hazards.sh @echo Started computation of $@ at $$(date) - time env JS=$(JS) ANALYZE="$(ANALYSIS_SCRIPT_DIR)/analyzeRoots.js" SIXGILL="$(SIXGILL)" "$(ANALYSIS_SCRIPT_DIR)/gen-hazards.sh" $(JOBS) > $@.tmp + time env JS=$(JS) ANALYZE='$(ANALYSIS_SCRIPT_DIR)/analyzeRoots.js' SIXGILL='$(SIXGILL)' '$(ANALYSIS_SCRIPT_DIR)/gen-hazards.sh' $(JOBS) > $@.tmp mv $@.tmp $@ @echo Finished computation of $@ at $$(date)
--- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py +++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py @@ -70,17 +70,17 @@ CXXFLAGS += $(CPPFLAGS_Release) $(CXXFLA DEFINES += $(DEFINES_Release) LOCAL_INCLUDES += $(INCLUDES_Release) ASFLAGS += $(ASFLAGS_Release) endif ifeq (WINNT,$(OS_TARGET)) # These get set via VC project file settings for normal GYP builds. DEFINES += -DUNICODE -D_UNICODE -LOCAL_INCLUDES += -I"$(MOZ_DIRECTX_SDK_PATH)/include" +LOCAL_INCLUDES += -I'$(MOZ_DIRECTX_SDK_PATH)/include' endif # Don't use STL wrappers when compiling Google code. STL_FLAGS = # Skip most Mozilla-specific include locations. INCLUDES = -I. $(LOCAL_INCLUDES) -I$(DEPTH)/dist/include @@ -92,17 +92,17 @@ SUB_SRCDIRS := $(addsuffix .dirstamp,$(a $(MKDIR) -p $(dir $@) touch $@ endif # COPY_SRCS get copied to the current directory to be compiled define COPY_SRC $(notdir $(1)): $(1) - $$(INSTALL) $$(IFLAGS1) "$$<" . + $$(INSTALL) $$(IFLAGS1) '$$<' . endef # COPY_SRC ifdef COPY_SRCS GARBAGE += $(notdir $(COPY_SRCS)) $(foreach s,$(COPY_SRCS), $(eval $(call COPY_SRC,$(s)))) endif # Rules for regenerating Makefiles from GYP files.
--- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -82,17 +82,17 @@ endif include $(topsrcdir)/config/config.mk # Note that we're going to set up a dependency directly between embed_android.dex and the java files # Instead of on the .class files, since more than one .class file might be produced per .java file # Sync dependencies are provided in a single jar. Sync classes themselves are delivered as source, # because Android resource classes must be compiled together in order to avoid overlapping resource # indices. classes.dex: $(ALL_JARS) - @echo "DX classes.dex" + @echo 'DX classes.dex' $(DX) --dex --output=classes.dex $(ALL_JARS) $(ANDROID_COMPAT_LIB) CLASSES_WITH_JNI= \ org.mozilla.gecko.GeckoAppShell \ org.mozilla.gecko.GeckoJavaSampler \ org.mozilla.gecko.gfx.NativePanZoomController \ org.mozilla.gecko.ANRReporter \ $(NULL) @@ -174,17 +174,17 @@ res/drawable-xxhdpi/icon.png: $(ICON_PAT ANDROID_RESDIRS := $(subst resources/,res/,$(sort $(dir $(ANDROID_RESFILES)))) $(call mkdir_deps,$(ANDROID_RESDIRS)): $(ANDROID_RESFILES) Makefile $(RM) -r $(@D) $(NSINSTALL) -D $(@D) $(TOUCH) $@ $(subst resources/,res/,$(ANDROID_RESFILES)): $(call mkdir_deps,$(ANDROID_RESDIRS)) $(ANDROID_RESFILES) - @echo "creating $@" + @echo 'creating $@' $(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@) res/values/strings.xml: $(call mkdir_deps,res/values) $(MAKE) -C locales # With multilocale builds, there will be multiple strings.xml files. We need to # rebuild gecko.ap_ if any of them change. MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml) @@ -217,9 +217,9 @@ IGNORE_ANDROID_RESFILES=1 include $(topsrcdir)/config/rules.mk # Override the Java settings with some specific android settings include $(topsrcdir)/config/android-common.mk libs:: classes.dex jni-stubs.inc GeneratedJNIWrappers.cpp fennec_ids.txt $(INSTALL) classes.dex $(FINAL_TARGET) @(diff jni-stubs.inc $(topsrcdir)/mozglue/android/jni-stubs.inc >/dev/null && diff GeneratedJNIWrappers.cpp $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp >/dev/null) || \ - (echo "*** Error: The generated JNI code has changed. Please run cp $(CURDIR)/jni-stubs.inc $(topsrcdir)/mozglue/android && cp $(CURDIR)/GeneratedJNIWrappers.* $(topsrcdir)/widget/android and repeat the build." && exit 1) + (echo '*** Error: The generated JNI code has changed. Please run cp $(CURDIR)/jni-stubs.inc $(topsrcdir)/mozglue/android && cp $(CURDIR)/GeneratedJNIWrappers.* $(topsrcdir)/widget/android and repeat the build.' && exit 1)
--- a/mobile/android/base/locales/Makefile.in +++ b/mobile/android/base/locales/Makefile.in @@ -60,16 +60,16 @@ strings-xml-preqs =\ $(NULL) $(if $(MOZ_ANDROID_SHARED_ACCOUNT_TYPE),,$(error Missing MOZ_ANDROID_SHARED_ACCOUNT_TYPE)) $(dir-strings-xml)/strings.xml: $(strings-xml-preqs) $(call py_action,preprocessor, \ $(DEFINES) \ -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \ - -DBOOKMARKSPATH="$(BOOKMARKSPATH)" \ - -DBRANDPATH="$(BRANDPATH)" \ + -DBOOKMARKSPATH='$(BOOKMARKSPATH)' \ + -DBRANDPATH='$(BRANDPATH)' \ -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE) \ - -DMOZ_APP_DISPLAYNAME="@MOZ_APP_DISPLAYNAME@" \ - -DSTRINGSPATH="$(STRINGSPATH)" \ - -DSYNCSTRINGSPATH="$(SYNCSTRINGSPATH)" \ + -DMOZ_APP_DISPLAYNAME='@MOZ_APP_DISPLAYNAME@' \ + -DSTRINGSPATH='$(STRINGSPATH)' \ + -DSYNCSTRINGSPATH='$(SYNCSTRINGSPATH)' \ $< \ -o $@)
--- a/mobile/android/build.mk +++ b/mobile/android/build.mk @@ -19,32 +19,32 @@ ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_T endif ifneq ($(ANDROID_SERIAL),) export ANDROID_SERIAL else # Determine if there's more than one device connected android_devices=$(filter device,$(shell $(ADB) devices)) ifeq ($(android_devices),) install:: - @echo "No devices are connected. Connect a device or start an emulator." + @echo 'No devices are connected. Connect a device or start an emulator.' @exit 1 else ifneq ($(android_devices),device) install:: - @echo "Multiple devices are connected. Define ANDROID_SERIAL to specify the install target." + @echo 'Multiple devices are connected. Define ANDROID_SERIAL to specify the install target.' $(ADB) devices @exit 1 endif endif endif install:: $(ADB) install -r $(DIST)/$(PKG_PATH)$(PKG_BASENAME).apk else - @echo "Mobile can't be installed directly." + @echo 'Mobile can't be installed directly.' @exit 1 endif deb: package @$(MAKE) -C mobile/android/installer deb upload:: @$(MAKE) -C mobile/android/installer upload
--- a/mobile/android/defs.mk +++ b/mobile/android/defs.mk @@ -1,18 +1,18 @@ -MOZ_ANDROID_SHARED_ID = "$(ANDROID_PACKAGE_NAME).sharedID" -MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "$(ANDROID_PACKAGE_NAME)_sync" +MOZ_ANDROID_SHARED_ID = $(ANDROID_PACKAGE_NAME).sharedID +MOZ_ANDROID_SHARED_ACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_sync # We released these builds to the public with shared IDs and need to # keep them consistent. ifeq (org.mozilla.firefox,$(ANDROID_PACKAGE_NAME)) -MOZ_ANDROID_SHARED_ID = "org.mozilla.firefox.sharedID" -MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "org.mozilla.firefox_sync" +MOZ_ANDROID_SHARED_ID = org.mozilla.firefox.sharedID +MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.firefox_sync else ifeq (org.mozilla.firefox_beta,$(ANDROID_PACKAGE_NAME)) -MOZ_ANDROID_SHARED_ID = "org.mozilla.firefox.sharedID" -MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "org.mozilla.firefox_sync" +MOZ_ANDROID_SHARED_ID = org.mozilla.firefox.sharedID +MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.firefox_sync else ifeq (org.mozilla.fennec_aurora,$(ANDROID_PACKAGE_NAME)) -MOZ_ANDROID_SHARED_ID = "org.mozilla.fennec.sharedID" -MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "org.mozilla.fennec_sync" +MOZ_ANDROID_SHARED_ID = org.mozilla.fennec.sharedID +MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.fennec_sync else ifeq (org.mozilla.fennec,$(ANDROID_PACKAGE_NAME)) -MOZ_ANDROID_SHARED_ID = "org.mozilla.fennec.sharedID" -MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "org.mozilla.fennec_sync" +MOZ_ANDROID_SHARED_ID = org.mozilla.fennec.sharedID +MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.fennec_sync endif
--- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -44,18 +44,18 @@ DEFINES += -DBINPATH=$(BINPATH) ifdef ENABLE_MARIONETTE DEFINES += -DENABLE_MARIONETTE=1 endif ifdef MOZ_PKG_MANIFEST_P $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS) $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@) ifdef MOZ_CHROME_MULTILOCALE - printf "\n[multilocale]\n" >> $@ + printf '\n[multilocale]\n' >> $@ for LOCALE in en-US $(MOZ_CHROME_MULTILOCALE) ;\ do \ - printf "$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n" >> $@; \ - printf "$(BINPATH)/chrome/$$LOCALE.manifest\n" >> $@; \ + printf '$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n' >> $@; \ + printf '$(BINPATH)/chrome/$$LOCALE.manifest\n' >> $@; \ done endif GARBAGE += $(MOZ_PKG_MANIFEST) endif
--- a/mobile/android/locales/Makefile.in +++ b/mobile/android/locales/Makefile.in @@ -49,42 +49,42 @@ chrome-%: ifeq ($(OS_TARGET),Android) @$(MAKE) -C $(DEPTH)/mobile/android/base/locales chrome-$* endif # This is a generic target that will make a langpack and repack tarball # builds. It is called from the tinderbox scripts. Alter it with caution. installers-%: clobber-stage repackage-zip-% - @echo "repackaging done" + @echo 'repackaging done' # When we unpack fennec on MacOS X the platform.ini and application.ini are in slightly # different locations that on all other platforms ifeq (Darwin, $(OS_ARCH)) ifdef LIBXUL_SDK -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/../Frameworks/XUL.framework/Versions/$(MOZILLA_VERSION)/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/../Frameworks/XUL.framework/Versions/$(MOZILLA_VERSION)/platform.ini' else -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini' endif -FENNEC_APPLICATION_INI_PATH="$(STAGEDIST)/application.ini" +FENNEC_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' else ifdef LIBXUL_SDK -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/xulrunner/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/xulrunner/platform.ini' else -GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/platform.ini" +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini' endif -FENNEC_APPLICATION_INI_PATH="$(STAGEDIST)/application.ini" +FENNEC_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' endif ident: - @printf "gecko_revision " + @printf 'gecko_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp - @printf "fennec_revision " + @printf 'fennec_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App SourceStamp - @printf "buildid " + @printf 'buildid ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App BuildID merge-%: ifdef LOCALE_MERGEDIR $(RM) -rf $(LOCALE_MERGEDIR) MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $* endif @echo
--- a/mobile/android/tests/background/junit3/Makefile.in +++ b/mobile/android/tests/background/junit3/Makefile.in @@ -3,21 +3,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. ANDROID_APK_NAME := background-debug PP_TARGETS += manifest manifest := $(srcdir)/AndroidManifest.xml.in manifest_TARGET := AndroidManifest.xml manifest_FLAGS += \ - -DANDROID_BACKGROUND_TARGET_PACKAGE_NAME="$(ANDROID_PACKAGE_NAME)" \ - -DANDROID_BACKGROUND_TEST_PACKAGE_NAME="org.mozilla.background.test" \ - -DANDROID_BACKGROUND_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME) Background Tests" \ - -DMOZ_ANDROID_SHARED_ID="$(ANDROID_PACKAGE_NAME).sharedID" \ - -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE="$(ANDROID_PACKAGE_NAME)_sync" \ + -DANDROID_BACKGROUND_TARGET_PACKAGE_NAME='$(ANDROID_PACKAGE_NAME)' \ + -DANDROID_BACKGROUND_TEST_PACKAGE_NAME='org.mozilla.background.test' \ + -DANDROID_BACKGROUND_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME) Background Tests' \ + -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \ + -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE='$(ANDROID_PACKAGE_NAME)_sync' \ $(NULL) GARBAGE += AndroidManifest.xml include $(srcdir)/android-services-files.mk # BACKGROUND_TESTS_{JAVA,RES}_FILES are defined in android-services-files.mk. JAVAFILES := $(BACKGROUND_TESTS_JAVA_FILES)
--- a/mobile/locales/Makefile.in +++ b/mobile/locales/Makefile.in @@ -102,20 +102,20 @@ SEARCH_PLUGINS = $(shell cat $(plugin_fi search-jar-preqs = \ $(plugin-file-ts) \ $(if $(IS_LANGUAGE_REPACK),FORCE) \ $(NULL) .PHONY: search-jar search-jar: $(search-jar) $(search-jar): $(search-jar-preqs) - @echo "\nGenerating: search-jar" - printf "$(AB_CD).jar:" > $@ + @echo '\nGenerating: search-jar' + printf '$(AB_CD).jar:' > $@ ln -fn $@ . - printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/$(AB_CD)/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ + printf '$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/$(AB_CD)/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))' >> $@ @echo >> $@ ################### search-dir-deps = \ $(plugin-file) \ $(dir-chrome) \ $(NULL) @@ -189,13 +189,13 @@ bookmarks-preqs = \ -I $< \ -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \ $(src-bookmarks) \ -o $@) .PHONY: bookmarks $(bookmarks) bookmarks: $(bookmarks) $(bookmarks): $(bookmarks-ts) - @echo "\nGenerating: $@" + @echo '\nGenerating: $@' ln -fn $< . export:: searchplugins bookmarks
--- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -111,27 +111,27 @@ endif ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY)) export DLLFLAGS endif # To get debug symbols from NSS export MOZ_DEBUG_SYMBOLS DEFAULT_GMAKE_FLAGS = -DEFAULT_GMAKE_FLAGS += CC="$(CC)" +DEFAULT_GMAKE_FLAGS += CC='$(CC)' DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) DEFAULT_GMAKE_FLAGS += SOURCE_MDHEADERS_DIR=$(NSPR_INCLUDE_DIR) DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR) DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1) -DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS="-static-libgcc" +DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS='-static-libgcc' endif ifndef MOZ_NATIVE_SQLITE ifdef MOZ_FOLD_LIBS DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3 else DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 endif # MOZ_FOLD_LIBS DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include @@ -200,59 +200,59 @@ DEFAULT_GMAKE_FLAGS += PROGRAMS= # Disable creating .chk files. They will be generated from packager.mk # When bug 681624 lands, we can replace CHECKLOC= with SKIP_SHLIBSIGN=1 DEFAULT_GMAKE_FLAGS += CHECKLOC= ifdef CROSS_COMPILE DEFAULT_GMAKE_FLAGS += \ - NATIVE_CC="$(HOST_CC)" \ - CC="$(CC)" \ - CCC="$(CXX)" \ - LINK="$(LD)" \ - AS="$(AS)" \ + NATIVE_CC='$(HOST_CC)' \ + CC='$(CC)' \ + CCC='$(CXX)' \ + LINK='$(LD)' \ + AS='$(AS)' \ AR='$(AR) $(AR_FLAGS:$@=$$@)' \ - RANLIB="$(RANLIB)" \ - RC="$(RC) $(RCFLAGS)" \ - OS_ARCH="$(OS_ARCH)" \ - OS_TEST="$(OS_TEST)" \ - CPU_ARCH="$(TARGET_CPU)" \ + RANLIB='$(RANLIB)' \ + RC='$(RC) $(RCFLAGS)' \ + OS_ARCH='$(OS_ARCH)' \ + OS_TEST='$(OS_TEST)' \ + CPU_ARCH='$(TARGET_CPU)' \ $(NULL) # Android has pthreads integrated into -lc, so OS_PTHREAD is set to nothing ifeq ($(OS_TARGET), Android) DEFAULT_GMAKE_FLAGS += \ - OS_RELEASE="2.6" \ + OS_RELEASE='2.6' \ OS_PTHREAD= \ - STANDARDS_CFLAGS="-std=gnu89" \ + STANDARDS_CFLAGS='-std=gnu89' \ $(NULL) -DEFAULT_GMAKE_FLAGS += ARCHFLAG="$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -include $(ABS_topsrcdir)/security/manager/android_stub.h" +DEFAULT_GMAKE_FLAGS += ARCHFLAG='$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -include $(ABS_topsrcdir)/security/manager/android_stub.h' endif endif ifdef WRAP_LDFLAGS DEFAULT_GMAKE_FLAGS += \ - LDFLAGS="$(LDFLAGS) $(WRAP_LDFLAGS)" \ - DSO_LDOPTS="$(DSO_LDOPTS) $(LDFLAGS) $(WRAP_LDFLAGS)" \ + LDFLAGS='$(LDFLAGS) $(WRAP_LDFLAGS)' \ + DSO_LDOPTS='$(DSO_LDOPTS) $(LDFLAGS) $(WRAP_LDFLAGS)' \ $(NULL) endif DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=0 ifeq ($(OS_TARGET),Linux) DEFAULT_GMAKE_FLAGS += FREEBL_LOWHASH=1 endif ifdef MOZ_NO_WLZDEFS DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG= endif ifdef MOZ_CFLAGS_NSS -DEFAULT_GMAKE_FLAGS += XCFLAGS="$(CFLAGS)" -DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS="-compatibility_version 1 -current_version 1 $(LDFLAGS)" +DEFAULT_GMAKE_FLAGS += XCFLAGS='$(CFLAGS)' +DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS='-compatibility_version 1 -current_version 1 $(LDFLAGS)' endif DEFAULT_GMAKE_FLAGS += NSS_NO_PKCS11_BYPASS=1 # Put NSS headers directly under $(DIST)/include DEFAULT_GMAKE_FLAGS += PUBLIC_EXPORT_DIR='$(ABS_DIST)/include/$$(MODULE)' DEFAULT_GMAKE_FLAGS += SOURCE_XPHEADERS_DIR='$$(SOURCE_XP_DIR)/include/$$(MODULE)' DEFAULT_GMAKE_FLAGS += MODULE_INCLUDES='$$(addprefix -I$$(SOURCE_XP_DIR)/include/,$$(REQUIRES))' @@ -313,17 +313,17 @@ endif ifneq (,$(filter %--build-id,$(LDFLAGS))) DEFAULT_GMAKE_ENV = LDFLAGS=-Wl,--build-id endif ifdef MOZ_FOLD_LIBS # TODO: The following can be replaced by something simpler when bug 844880 # is fixed. # All static libraries required for nss, smime, ssl and nssutil. -NSS_STATIC_LIBS := $(shell $(MAKE) --no-print-directory -f $(srcdir)/nss.mk DEPTH="$(DEPTH)" topsrcdir="$(topsrcdir)" srcdir="$(srcdir)" echo-variable-libs) +NSS_STATIC_LIBS := $(shell $(MAKE) --no-print-directory -f $(srcdir)/nss.mk DEPTH='$(DEPTH)' topsrcdir='$(topsrcdir)' srcdir='$(srcdir)' echo-variable-libs) # Corresponding build directories NSS_STATIC_DIRS := $(foreach lib,$(NSS_STATIC_LIBS),$(patsubst %/,%,$(dir $(lib)))) NSS_DIRS += $(NSS_STATIC_DIRS) # TODO: The following can be replaced by something simpler when bug 844884 # is fixed. # Remaining nss/lib directories NSS_DIRS += nss/lib/freebl nss/lib/softoken nss/lib/jar nss/lib/crmf nss/lib/ckfw nss/lib/libpkix
--- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -5,17 +5,17 @@ # Definitions used by constants.js. weave_version := 1.30.0 weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef} # Preprocess files. SYNC_PP := modules/constants.js SYNC_PP_FLAGS := \ -Dweave_version=$(weave_version) \ - -Dweave_id="$(weave_id)" + -Dweave_id='$(weave_id)' SYNC_PP_PATH = $(FINAL_TARGET)/modules/services-sync PP_TARGETS += SYNC_PP # The set of core JavaScript modules for Sync. These are copied as-is. sync_modules := \ addonsreconciler.js \ addonutils.js \ engines.js \
--- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -1,19 +1,19 @@ # 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/. # Shortcut for mochitest* and xpcshell-tests targets, # replaces 'EXTRA_TEST_ARGS=--test-path=...'. ifdef TEST_PATH -TEST_PATH_ARG := --test-path="$(TEST_PATH)" -PEPTEST_PATH_ARG := --test-path="$(TEST_PATH)" -IPCPLUGINS_PATH_ARG := --test-path="$(TEST_PATH)" +TEST_PATH_ARG := --test-path='$(TEST_PATH)' +PEPTEST_PATH_ARG := --test-path='$(TEST_PATH)' +IPCPLUGINS_PATH_ARG := --test-path='$(TEST_PATH)' else TEST_PATH_ARG := PEPTEST_PATH_ARG := --test-path=_tests/peptest/tests/firefox/firefox_all.ini IPCPLUGINS_PATH_ARG := --test-path=dom/plugins/test endif # include automation-build.mk to get the path to the binary TARGET_DEPTH = $(DEPTH) @@ -71,80 +71,80 @@ RUN_MOCHITEST_ROBOCOP = \ --robocop-ini=$(DEPTH)/build/mobile/robocop/robocop.ini \ --console-level=INFO --log-file=./$@.log --file-level=INFO $(DM_FLAGS) --dm_trans=$(DM_TRANS) \ --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \ --httpd-path=. \ $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) ifndef NO_FAIL_ON_TEST_ERRORS define check_test_error_internal - @errors=`grep "TEST-UNEXPECTED-" $@.log` ;\ - if test "$$errors" ; then \ - echo "$@ failed:"; \ - echo "$$errors"; \ + @errors=`grep 'TEST-UNEXPECTED-' $@.log` ;\ + if test '$$errors' ; then \ + echo '$@ failed:'; \ + echo '$$errors'; \ $(if $(1),echo $(1)) \ exit 1; \ fi endef CHECK_TEST_ERROR = $(call check_test_error_internal) -CHECK_TEST_ERROR_RERUN = $(call check_test_error_internal,"To rerun your failures please run 'make $@-rerun-failures'") +CHECK_TEST_ERROR_RERUN = $(call check_test_error_internal,'To rerun your failures please run 'make $@-rerun-failures'') endif mochitest-remote: DM_TRANS?=adb mochitest-remote: - @if [ "${MOZ_HOST_BIN}" = "" ]; then \ - echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \ + @if [ '${MOZ_HOST_BIN}' = '' ]; then \ + echo 'environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell'; \ elif [ ! -d ${MOZ_HOST_BIN} ]; then \ - echo "MOZ_HOST_BIN does not specify a directory"; \ + echo 'MOZ_HOST_BIN does not specify a directory'; \ elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \ - echo "xpcshell not found in MOZ_HOST_BIN"; \ - elif [ "${TEST_DEVICE}" = "" -a "$(DM_TRANS)" != "adb" ]; then \ - echo "please prepare your host with the environment variable TEST_DEVICE"; \ + echo 'xpcshell not found in MOZ_HOST_BIN'; \ + elif [ '${TEST_DEVICE}' = '' -a '$(DM_TRANS)' != 'adb' ]; then \ + echo 'please prepare your host with the environment variable TEST_DEVICE'; \ else \ $(RUN_MOCHITEST_REMOTE); \ fi mochitest-robotium: mochitest-robocop - @echo "mochitest-robotium is deprecated -- please use mochitest-robocop" + @echo 'mochitest-robotium is deprecated -- please use mochitest-robocop' mochitest-robocop: DM_TRANS?=adb mochitest-robocop: - @if [ "${MOZ_HOST_BIN}" = "" ]; then \ - echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \ + @if [ '${MOZ_HOST_BIN}' = '' ]; then \ + echo 'environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell'; \ elif [ ! -d ${MOZ_HOST_BIN} ]; then \ - echo "MOZ_HOST_BIN does not specify a directory"; \ + echo 'MOZ_HOST_BIN does not specify a directory'; \ elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \ - echo "xpcshell not found in MOZ_HOST_BIN"; \ - elif [ "${TEST_DEVICE}" = "" -a "$(DM_TRANS)" != "adb" ]; then \ - echo "please prepare your host with the environment variable TEST_DEVICE"; \ + echo 'xpcshell not found in MOZ_HOST_BIN'; \ + elif [ '${TEST_DEVICE}' = '' -a '$(DM_TRANS)' != 'adb' ]; then \ + echo 'please prepare your host with the environment variable TEST_DEVICE'; \ else \ $(RUN_MOCHITEST_ROBOCOP); \ fi ifdef MOZ_B2G mochitest-plain: - @if [ "${GAIA_PROFILE_DIR}" = "" ]; then \ - echo "please specify the GAIA_PROFILE_DIR env variable"; \ + @if [ '${GAIA_PROFILE_DIR}' = '' ]; then \ + echo 'please specify the GAIA_PROFILE_DIR env variable'; \ else \ $(RUN_MOCHITEST_B2G_DESKTOP); \ $(CHECK_TEST_ERROR_RERUN); \ fi else mochitest-plain: $(RUN_MOCHITEST) $(CHECK_TEST_ERROR_RERUN) endif mochitest-plain-rerun-failures: $(RERUN_MOCHITEST) $(CHECK_TEST_ERROR_RERUN) # Allow mochitest-1 ... mochitest-5 for developer ease mochitest-1 mochitest-2 mochitest-3 mochitest-4 mochitest-5: mochitest-%: - echo "mochitest: $* / 5" + echo 'mochitest: $* / 5' $(RUN_MOCHITEST) --chunk-by-dir=4 --total-chunks=5 --this-chunk=$* $(CHECK_TEST_ERROR) mochitest-chrome: $(RUN_MOCHITEST) --chrome $(CHECK_TEST_ERROR) mochitest-a11y: @@ -190,106 +190,106 @@ endif RUN_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftest.py \ --extra-profile-file=$(DIST)/plugins \ $(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log REMOTE_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/remotereftest.py \ --dm_trans=$(DM_TRANS) --ignore-window-size \ --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \ --httpd-path=_tests/reftest/reftest/components \ - $(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) "$(1)" | tee ./$@.log + $(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) '$(1)' | tee ./$@.log RUN_REFTEST_B2G = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftestb2g.py \ --remote-webserver=10.0.2.2 --b2gpath=${B2G_PATH} --adbpath=${ADB_PATH} \ --xre-path=${MOZ_HOST_BIN} $(SYMBOLS_PATH) --ignore-window-size \ --httpd-path=_tests/reftest/reftest/components \ - $(EXTRA_TEST_ARGS) "$(1)" | tee ./$@.log + $(EXTRA_TEST_ARGS) '$(1)' | tee ./$@.log ifeq ($(OS_ARCH),WINNT) #{ # GPU-rendered shadow layers are unsupported here OOP_CONTENT = --setpref=browser.tabs.remote=true --setpref=layers.acceleration.disabled=true GPU_RENDERING = else OOP_CONTENT = --setpref=browser.tabs.remote=true GPU_RENDERING = --setpref=layers.acceleration.force-enabled=true endif #} reftest: TEST_PATH?=layout/reftests/reftest.list reftest: - $(call RUN_REFTEST,"$(topsrcdir)/$(TEST_PATH)") + $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)') $(CHECK_TEST_ERROR) reftest-remote: TEST_PATH?=layout/reftests/reftest.list reftest-remote: DM_TRANS?=adb reftest-remote: - @if [ "${MOZ_HOST_BIN}" = "" ]; then \ - echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \ + @if [ '${MOZ_HOST_BIN}' = '' ]; then \ + echo 'environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell'; \ elif [ ! -d ${MOZ_HOST_BIN} ]; then \ - echo "MOZ_HOST_BIN does not specify a directory"; \ + echo 'MOZ_HOST_BIN does not specify a directory'; \ elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \ - echo "xpcshell not found in MOZ_HOST_BIN"; \ - elif [ "${TEST_DEVICE}" = "" -a "$(DM_TRANS)" != "adb" ]; then \ - echo "please prepare your host with the environment variable TEST_DEVICE"; \ + echo 'xpcshell not found in MOZ_HOST_BIN'; \ + elif [ '${TEST_DEVICE}' = '' -a '$(DM_TRANS)' != 'adb' ]; then \ + echo 'please prepare your host with the environment variable TEST_DEVICE'; \ else \ ln -s $(abspath $(topsrcdir)) _tests/reftest/tests; \ $(call REMOTE_REFTEST,tests/$(TEST_PATH)); \ $(CHECK_TEST_ERROR); \ fi reftest-b2g: TEST_PATH?=layout/reftests/reftest.list reftest-b2g: - @if [ "${MOZ_HOST_BIN}" = "" ]; then \ - echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \ + @if [ '${MOZ_HOST_BIN}' = '' ]; then \ + echo 'environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell'; \ elif [ ! -d ${MOZ_HOST_BIN} ]; then \ - echo "MOZ_HOST_BIN does not specify a directory"; \ + echo 'MOZ_HOST_BIN does not specify a directory'; \ elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \ - echo "xpcshell not found in MOZ_HOST_BIN"; \ - elif [ "${B2G_PATH}" = "" -o "${ADB_PATH}" = "" ]; then \ - echo "please set the B2G_PATH and ADB_PATH environment variables"; \ + echo 'xpcshell not found in MOZ_HOST_BIN'; \ + elif [ '${B2G_PATH}' = '' -o '${ADB_PATH}' = '' ]; then \ + echo 'please set the B2G_PATH and ADB_PATH environment variables'; \ else \ ln -s $(abspath $(topsrcdir)) _tests/reftest/tests; \ - if [ "${REFTEST_PATH}" != "" ]; then \ + if [ '${REFTEST_PATH}' != '' ]; then \ $(call RUN_REFTEST_B2G,tests/${REFTEST_PATH}); \ else \ $(call RUN_REFTEST_B2G,tests/$(TEST_PATH)); \ fi; \ $(CHECK_TEST_ERROR); \ fi reftest-ipc: TEST_PATH?=layout/reftests/reftest.list reftest-ipc: - $(call RUN_REFTEST,"$(topsrcdir)/$(TEST_PATH)" $(OOP_CONTENT)) + $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT)) $(CHECK_TEST_ERROR) reftest-ipc-gpu: TEST_PATH?=layout/reftests/reftest.list reftest-ipc-gpu: - $(call RUN_REFTEST,"$(topsrcdir)/$(TEST_PATH)" $(OOP_CONTENT) $(GPU_RENDERING)) + $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT) $(GPU_RENDERING)) $(CHECK_TEST_ERROR) crashtest: TEST_PATH?=testing/crashtest/crashtests.list crashtest: - $(call RUN_REFTEST,"$(topsrcdir)/$(TEST_PATH)") + $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)') $(CHECK_TEST_ERROR) crashtest-ipc: TEST_PATH?=testing/crashtest/crashtests.list crashtest-ipc: - $(call RUN_REFTEST,"$(topsrcdir)/$(TEST_PATH)" $(OOP_CONTENT)) + $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT)) $(CHECK_TEST_ERROR) crashtest-ipc-gpu: TEST_PATH?=testing/crashtest/crashtests.list crashtest-ipc-gpu: - $(call RUN_REFTEST,"$(topsrcdir)/$(TEST_PATH)" $(OOP_CONTENT) $(GPU_RENDERING)) + $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT) $(GPU_RENDERING)) $(CHECK_TEST_ERROR) jstestbrowser: TESTS_PATH?=test-package-stage/jsreftest/tests/ jstestbrowser: $(MAKE) -C $(DEPTH)/config $(MAKE) -C $(DEPTH)/js/src/config $(MAKE) stage-jstests - $(call RUN_REFTEST,"$(DIST)/$(TESTS_PATH)/jstests.list" --extra-profile-file=$(DIST)/test-package-stage/jsreftest/tests/user.js) + $(call RUN_REFTEST,'$(DIST)/$(TESTS_PATH)/jstests.list' --extra-profile-file=$(DIST)/test-package-stage/jsreftest/tests/user.js) $(CHECK_TEST_ERROR) GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser) # Execute all xpcshell tests in the directories listed in the manifest. # See also config/rules.mk 'xpcshell-tests' target for local execution. # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|. xpcshell-tests: @@ -297,17 +297,17 @@ xpcshell-tests: $(PYTHON) -u $(topsrcdir)/config/pythonpath.py \ -I$(DEPTH)/build \ -I$(topsrcdir)/build \ -I$(DEPTH)/_tests/mozbase/mozinfo \ $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \ --manifest=$(DEPTH)/_tests/xpcshell/xpcshell.ini \ --build-info-json=$(DEPTH)/mozinfo.json \ --no-logfiles \ - --test-plugin-path="$(DIST)/plugins" \ + --test-plugin-path='$(DIST)/plugins' \ --tests-root-dir=$(abspath _tests/xpcshell) \ --testing-modules-dir=$(abspath _tests/modules) \ --xunit-file=$(abspath _tests/xpcshell/results.xml) \ --xunit-suite-name=xpcshell \ $(SYMBOLS_PATH) \ $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) \ $(LIBXUL_DIST)/bin/xpcshell @@ -324,46 +324,46 @@ B2G_XPCSHELL = \ --no-clean \ --objdir=$(DEPTH) \ $$EXTRA_XPCSHELL_ARGS \ --b2gpath=${B2G_HOME} \ $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) xpcshell-tests-b2g: ADB_PATH?=$(shell which adb) xpcshell-tests-b2g: - @if [ "${B2G_HOME}" = "" ]; then \ - echo "Please set the B2G_HOME variable"; exit 1; \ - elif [ ! -f "${ADB_PATH}" ]; then \ - echo "Please set the ADB_PATH variable"; exit 1; \ - elif [ "${EMULATOR}" != "" ]; then \ + @if [ '${B2G_HOME}' = '' ]; then \ + echo 'Please set the B2G_HOME variable'; exit 1; \ + elif [ ! -f '${ADB_PATH}' ]; then \ + echo 'Please set the ADB_PATH variable'; exit 1; \ + elif [ '${EMULATOR}' != '' ]; then \ EXTRA_XPCSHELL_ARGS=--emulator=${EMULATOR}; \ $(call B2G_XPCSHELL); \ exit 0; \ else \ EXTRA_XPCSHELL_ARGS=--address=localhost:2828; \ $(call B2G_XPCSHELL); \ exit 0; \ fi xpcshell-tests-remote: DM_TRANS?=adb xpcshell-tests-remote: - @if [ "${TEST_DEVICE}" != "" -o "$(DM_TRANS)" = "adb" ]; \ + @if [ '${TEST_DEVICE}' != '' -o '$(DM_TRANS)' = 'adb' ]; \ then $(PYTHON) -u $(topsrcdir)/testing/xpcshell/remotexpcshelltests.py \ --manifest=$(DEPTH)/_tests/xpcshell/xpcshell_android.ini \ --build-info-json=$(DEPTH)/mozinfo.json \ --no-logfiles \ --testing-modules-dir=$(abspath _tests/modules) \ --dm_trans=$(DM_TRANS) \ --deviceIP=${TEST_DEVICE} \ --objdir=$(DEPTH) \ $(SYMBOLS_PATH) \ $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS); \ $(CHECK_TEST_ERROR); \ else \ - echo "please prepare your host with environment variables for TEST_DEVICE"; \ + echo 'please prepare your host with environment variables for TEST_DEVICE'; \ fi # Runs peptest, for usage see: https://developer.mozilla.org/en/Peptest#Running_Tests RUN_PEPTEST = \ rm -f ./$@.log && \ $(PYTHON) _tests/peptest/runtests.py --binary=$(browser_path) \ $(PEPTEST_PATH_ARG) \ --proxy=_tests/peptest/tests/firefox/server-locations.txt \ @@ -381,20 +381,20 @@ REMOTE_CPPUNITTESTS = \ --localLib=$(DEPTH)/dist/fennec \ --dm_trans=$(DM_TRANS) \ --deviceIP=${TEST_DEVICE} \ $(TEST_PATH) $(EXTRA_TEST_ARGS) # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] cppunittests-remote|. cppunittests-remote: DM_TRANS?=adb cppunittests-remote: - @if [ "${TEST_DEVICE}" != "" -o "$(DM_TRANS)" = "adb" ]; \ + @if [ '${TEST_DEVICE}' != '' -o '$(DM_TRANS)' = 'adb' ]; \ then $(call REMOTE_CPPUNITTESTS); \ else \ - echo "please prepare your host with environment variables for TEST_DEVICE"; \ + echo 'please prepare your host with environment variables for TEST_DEVICE'; \ fi jetpack-tests: $(PYTHON) $(topsrcdir)/addon-sdk/source/bin/cfx -b $(browser_path) --parseable testpkgs # -- -register # -- --trace-malloc malloc.log --shutdown-leaks=sdleak.log leaktest: @@ -425,23 +425,23 @@ package-tests: \ stage-steeplechase \ $(NULL) else # This staging area has been built for us by universal/flight.mk PKG_STAGE = $(DIST)/universal/test-package-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 - find $(PKG_STAGE) -name "*.pyc" -exec rm {} \; + find $(PKG_STAGE) -name '*.pyc' -exec rm {} \; cd $(PKG_STAGE) && \ - zip -rq9D "$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)" \ + zip -rq9D '$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)' \ * -x \*/.mkdir.done ifeq ($(MOZ_WIDGET_TOOLKIT),android) package-tests: stage-android endif ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) package-tests: stage-b2g
--- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -4,19 +4,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/rcs.mk LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads -MOZ_HISTOGRAMS_VERSION ?= $(call getSourceRepo)/rev/$(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) +MOZ_HISTOGRAMS_VERSION ?= $(call getSourceRepo)/rev/$(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)) ifdef MOZ_HISTOGRAMS_VERSION -DEFINES += -DHISTOGRAMS_FILE_VERSION="$(MOZ_HISTOGRAMS_VERSION)" +DEFINES += -DHISTOGRAMS_FILE_VERSION='$(MOZ_HISTOGRAMS_VERSION)' endif INSTALL_TARGETS += histoenums histoenums_FILES := TelemetryHistogramEnums.h histoenums_DEST = $(DIST)/include/mozilla histoenums_TARGET := export include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/urlformatter/Makefile.in +++ b/toolkit/components/urlformatter/Makefile.in @@ -5,11 +5,11 @@ export:: google_api_key EXTRA_PP_COMPONENTS_FLAGS = -I google_api_key include $(topsrcdir)/config/rules.mk google_api_key: - @echo "#define MOZ_GOOGLE_API_KEY $(MOZ_GOOGLE_API_KEY)" > $@ + @echo '#define MOZ_GOOGLE_API_KEY $(MOZ_GOOGLE_API_KEY)' > $@ GARBAGE += google_api_key
--- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -2,26 +2,26 @@ # 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/. USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/makeutils.mk DEFINES += \ - -DCXXFLAGS="$(CXXFLAGS)" \ - -DCPPFLAGS="$(CPPFLAGS)" \ + -DCXXFLAGS='$(CXXFLAGS)' \ + -DCPPFLAGS='$(CPPFLAGS)' \ $(NULL) -MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null) +MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null) ifdef MOZ_SOURCE_STAMP -DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)" +DEFINES += -DSOURCE_CHANGESET='$(MOZ_SOURCE_STAMP)' endif source_repo ?= $(call getSourceRepo) ifneq (,$(filter http%,$(source_repo))) - DEFINES += -DSOURCE_REPO="$(source_repo)" + DEFINES += -DSOURCE_REPO='$(source_repo)' else ifneq (,$(strip $(source_repo))) - DEFINES += -DSOURCE_GIT_COMMIT="$(source_repo)" + DEFINES += -DSOURCE_GIT_COMMIT='$(source_repo)' endif BUILD_HOSTNAME = $(shell hostname -s || hostname) -DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" +DEFINES += -DBUILD_HOSTNAME='$(BUILD_HOSTNAME)'
--- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -58,18 +58,18 @@ OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_ OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) endif include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),Darwin) libs:: $(NSINSTALL) -D $(DIST)/bin/crashreporter.app - rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app - sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ + rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app + sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings $(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS $(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS rm -f $(DIST)/bin/crashreporter endif ifeq (,$(filter-out Linux SunOS,$(OS_ARCH))) libs:: $(topsrcdir)/toolkit/themes/windows/global/throbber/Throbber-small.gif
--- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -57,17 +57,17 @@ endif #} ifeq (Linux,$(OS_ARCH)) ifneq (Android,$(OS_TARGET)) OS_LIBS += -lrt EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript symverscript: symverscript.in $(call py_action,preprocessor, \ - -DVERSION="$(LIBRARY_NAME)$(MOZILLA_SYMBOLVERSION)" $< -o $@) + -DVERSION='$(LIBRARY_NAME)$(MOZILLA_SYMBOLVERSION)' $< -o $@) EXTRA_DEPS += symverscript endif endif # component libraries ifdef MOZ_JSDEBUGGER DEFINES += -DMOZ_JSDEBUGGER @@ -168,17 +168,17 @@ ifdef MOZ_WEBRTC_SIGNALING SHARED_LIBRARY_LIBS += \ $(DEPTH)/media/webrtc/signaling/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signaling/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ $(NULL) endif ifeq (WINNT,$(OS_TARGET)) EXTRA_DSO_LDOPTS += \ - -LIBPATH:"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)" \ + -LIBPATH:'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)' \ $(NULL) OS_LIBS += $(call EXPAND_LIBNAME,secur32 crypt32 iphlpapi strmiids dmoguids wmcodecdspuuid amstrmid msdmo wininet) endif endif ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) @@ -332,18 +332,18 @@ endif ifdef MOZ_WEBRTC EXTRA_DSO_LDOPTS += -DELAYLOAD:msdmo.dll endif endif ifdef MOZ_GAMEPAD ifndef GNU_CC DXSDK := $(subst \,/,$(MOZ_DIRECTX_SDK_PATH))/Lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX) OS_LIBS += \ - "$(DXSDK)/dxguid.lib" \ - "$(DXSDK)/dinput8.lib" \ + '$(DXSDK)/dxguid.lib' \ + '$(DXSDK)/dinput8.lib' \ $(NULL) else OS_LIBS += $(call EXPAND_LIBNAME,dxguid dinput8) endif endif endif # WINNT ifdef MOZ_JPROF @@ -411,17 +411,17 @@ ifndef LINK_GTEST ifdef COMPILE_ENVIRONMENT libs:: $(FINAL_TARGET)/dependentlibs.list endif endif .PHONY: gtestxul $(FINAL_TARGET)/dependentlibs.list.gtest: $(FINAL_TARGET)/dependentlibs.list - sed -e "s|$(SHARED_LIBRARY)|gtest/$(SHARED_LIBRARY)|" $< > $@ + sed -e 's|$(SHARED_LIBRARY)|gtest/$(SHARED_LIBRARY)|' $< > $@ # Remove this target when actually linking gtest to prevent redefining # the implicit rules.mk target ifndef LINK_GTEST gtestxul: $(GTEST_LIB) $(GTEST_LIB): $(FINAL_TARGET)/dependentlibs.list.gtest
--- a/toolkit/locales/Makefile.in +++ b/toolkit/locales/Makefile.in @@ -27,17 +27,17 @@ libs-%: chrome-%: @$(MAKE) -C $(DEPTH)/netwerk/locales/ chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/dom/locales/ chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* ifdef MOZ_UPDATER libs:: update.locale - cat $< | sed -e "s/%AB_CD%/$(AB_CD)/" > $(FINAL_TARGET)/update.locale + sed -e 's/%AB_CD%/$(AB_CD)/' $< > $(FINAL_TARGET)/update.locale endif ifdef MOZ_CRASHREPORTER libs:: crashreporter.ini ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/crashreporter.app/Contents/MacOS else $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
--- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -45,18 +45,18 @@ WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG ZIP_OUT ?= $(_ABS_DIST)/$(PACKAGE) DEFINES += \ -DAB_CD=$(AB_CD) \ -DMOZ_LANGPACK_EID=$(MOZ_LANGPACK_EID) \ -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION) \ -DLOCALE_SRCDIR=$(abspath $(LOCALE_SRCDIR)) \ - -DPKG_BASENAME="$(PKG_BASENAME)" \ - -DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \ + -DPKG_BASENAME='$(PKG_BASENAME)' \ + -DPKG_INST_BASENAME='$(PKG_INST_BASENAME)' \ $(NULL) clobber-%: $(RM) -rf $(DIST)/xpi-stage/locale-$* PACKAGER_NO_LIBS = 1 @@ -97,17 +97,17 @@ MOZDEPTH ?= $(DEPTH) ifdef MOZ_MAKE_COMPLETE_MAR MAKE_COMPLETE_MAR = 1 ifeq ($(OS_ARCH), WINNT) ifneq ($(MOZ_PKG_FORMAT), SFX7Z) MAKE_COMPLETE_MAR = endif endif endif -repackage-zip: UNPACKAGE="$(ZIP_IN)" +repackage-zip: UNPACKAGE='$(ZIP_IN)' repackage-zip: ALREADY_SZIPPED=1 repackage-zip: libs-$(AB_CD) # call a hook for apps to put their uninstall helper.exe into the package $(UNINSTALLER_PACKAGE_HOOK) # call a hook for apps to build the stub installer ifdef MOZ_STUB_INSTALLER $(STUB_HOOK) endif @@ -119,31 +119,31 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) endif endif $(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH) cd $(DIST)/l10n-stage; \ $(MAKE_PACKAGE) ifdef MAKE_COMPLETE_MAR $(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \ MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \ - PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \ - DIST="$(_ABS_DIST)" + PACKAGE_BASE_DIR='$(_ABS_DIST)/l10n-stage' \ + DIST='$(_ABS_DIST)' endif # packaging done, undo l10n stuff ifneq (en,$(AB)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/en.lproj endif endif $(NSINSTALL) -D $(DIST)/$(PKG_PATH) - mv -f "$(DIST)/l10n-stage/$(PACKAGE)" "$(ZIP_OUT)" - if test -f "$(DIST)/l10n-stage/$(PACKAGE).asc"; then mv -f "$(DIST)/l10n-stage/$(PACKAGE).asc" "$(ZIP_OUT).asc"; fi + mv -f '$(DIST)/l10n-stage/$(PACKAGE)' '$(ZIP_OUT)' + if test -f '$(DIST)/l10n-stage/$(PACKAGE).asc'; then mv -f '$(DIST)/l10n-stage/$(PACKAGE).asc' '$(ZIP_OUT).asc'; fi repackage-zip-%: $(STAGEDIST) - @$(MAKE) repackage-zip AB_CD=$* ZIP_IN="$(ZIP_IN)" + @$(MAKE) repackage-zip AB_CD=$* ZIP_IN='$(ZIP_IN)' APP_DEFINES = $(firstword $(wildcard $(LOCALE_SRCDIR)/defines.inc) \ $(srcdir)/en-US/defines.inc) TK_DEFINES = $(firstword \ $(wildcard $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc) \ $(MOZILLA_DIR)/toolkit/locales/en-US/defines.inc) # Dealing with app sub dirs: If DIST_SUBDIRS is defined it contains a @@ -151,17 +151,17 @@ TK_DEFINES = $(firstword \ # check DIST_SUBDIR, and if that isn't present, just package the default # chrome directory. PKG_ZIP_DIRS = chrome $(or $(DIST_SUBDIRS),$(DIST_SUBDIR)) langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi langpack-%: AB_CD=$* langpack-%: XPI_NAME=locale-$* langpack-%: libs-% - @echo "Making langpack $(LANGPACK_FILE)" + @echo 'Making langpack $(LANGPACK_FILE)' $(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH) $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \ -I$(TK_DEFINES) -I$(APP_DEFINES) $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf) cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ $(ZIP) -r9D $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest # This variable is to allow the wget-en-US target to know which ftp server to download from ifndef EN_US_BINARY_URL @@ -171,23 +171,23 @@ endif # This make target allows us to wget the latest en-US binary from a specified website # The make installers-% target needs the en-US binary in dist/ # and for the windows repackages we need the .installer.exe in dist/sea wget-en-US: ifndef WGET $(error Wget not installed) endif $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_PATH) - (cd $(_ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N "$(EN_US_BINARY_URL)/$(PACKAGE)") - @echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PKG_PATH)/$(PACKAGE)" + (cd $(_ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PACKAGE)') + @echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PKG_PATH)/$(PACKAGE)' ifdef RETRIEVE_WINDOWS_INSTALLER ifeq ($(OS_ARCH), WINNT) $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH) - (cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N "$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe") - @echo "Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" + (cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe') + @echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe' endif endif generate-snippet-%: $(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \ --mar-path=$(_ABS_DIST)/update \ --application-ini-file=$(STAGEDIST)/application.ini \ --locale=$* \
--- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -106,17 +106,17 @@ MAKE_JSSHELL = $(ZIP) -9j $(PKG_JSSHELL endif # LIBXUL_SDK _ABS_DIST = $(abspath $(DIST)) JARLOG_DIR = $(abspath $(DEPTH)/jarlog/) JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log TAR_CREATE_FLAGS := --exclude=.mkdir.done $(TAR_CREATE_FLAGS) CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ - --mode="go-w" --exclude=.mkdir.done -f + --mode=go-w --exclude=.mkdir.done -f UNPACK_TAR = tar -xf- ifeq ($(MOZ_PKG_FORMAT),TAR) PKG_SUFFIX = .tar INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) > $(PACKAGE) INNER_UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE) MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > $(SDK) endif @@ -158,74 +158,74 @@ INNER_MAKE_PACKAGE = rm -f app.7z && \ chmod 0755 $(PACKAGE) INNER_UNMAKE_PACKAGE = $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) core && \ mv core $(MOZ_PKG_DIR) endif #Create an RPM file ifeq ($(MOZ_PKG_FORMAT),RPM) PKG_SUFFIX = .rpm -MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed "s/[^0-9.].*//" ) -MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed "s/[0-9.]*//" ) +MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[^0-9.].*//' ) +MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[0-9.]*//' ) RPMBUILD_TOPDIR=$(_ABS_DIST)/rpmbuild RPMBUILD_RPMDIR=$(_ABS_DIST) RPMBUILD_SRPMDIR=$(_ABS_DIST) RPMBUILD_SOURCEDIR=$(RPMBUILD_TOPDIR)/SOURCES RPMBUILD_SPECDIR=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm RPMBUILD_BUILDDIR=$(_ABS_DIST)/.. SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec RPM_INCIDENTALS=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm RPM_CMD = \ echo Creating RPM && \ $(PYTHON) -m mozbuild.action.preprocessor \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ - -DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \ + -DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \ $(RPM_INCIDENTALS)/mozilla.desktop \ -o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \ rm -rf $(_ABS_DIST)/$(TARGET_CPU) && \ $(RPMBUILD) -bb \ $(SPEC_FILE) \ --target $(TARGET_CPU) \ --buildroot $(RPMBUILD_TOPDIR)/BUILDROOT \ - --define "moz_app_name $(MOZ_APP_NAME)" \ - --define "moz_app_displayname $(MOZ_APP_DISPLAYNAME)" \ - --define "moz_app_version $(MOZ_APP_VERSION)" \ - --define "moz_numeric_app_version $(MOZ_NUMERIC_APP_VERSION)" \ - --define "moz_rpm_release $(MOZ_RPM_RELEASE)" \ - --define "buildid $(BUILDID)" \ - --define "moz_source_repo $(MOZ_SOURCE_REPO)" \ - --define "moz_source_stamp $(MOZ_SOURCE_STAMP)" \ - --define "moz_branding_directory $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)" \ - --define "_topdir $(RPMBUILD_TOPDIR)" \ - --define "_rpmdir $(RPMBUILD_RPMDIR)" \ - --define "_sourcedir $(RPMBUILD_SOURCEDIR)" \ - --define "_specdir $(RPMBUILD_SPECDIR)" \ - --define "_srcrpmdir $(RPMBUILD_SRPMDIR)" \ - --define "_builddir $(RPMBUILD_BUILDDIR)" \ - --define "_prefix $(prefix)" \ - --define "_libdir $(libdir)" \ - --define "_bindir $(bindir)" \ - --define "_datadir $(datadir)" \ - --define "_installdir $(installdir)" + --define 'moz_app_name $(MOZ_APP_NAME)' \ + --define 'moz_app_displayname $(MOZ_APP_DISPLAYNAME)' \ + --define 'moz_app_version $(MOZ_APP_VERSION)' \ + --define 'moz_numeric_app_version $(MOZ_NUMERIC_APP_VERSION)' \ + --define 'moz_rpm_release $(MOZ_RPM_RELEASE)' \ + --define 'buildid $(BUILDID)' \ + --define 'moz_source_repo $(MOZ_SOURCE_REPO)' \ + --define 'moz_source_stamp $(MOZ_SOURCE_STAMP)' \ + --define 'moz_branding_directory $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)' \ + --define '_topdir $(RPMBUILD_TOPDIR)' \ + --define '_rpmdir $(RPMBUILD_RPMDIR)' \ + --define '_sourcedir $(RPMBUILD_SOURCEDIR)' \ + --define '_specdir $(RPMBUILD_SPECDIR)' \ + --define '_srcrpmdir $(RPMBUILD_SRPMDIR)' \ + --define '_builddir $(RPMBUILD_BUILDDIR)' \ + --define '_prefix $(prefix)' \ + --define '_libdir $(libdir)' \ + --define '_bindir $(bindir)' \ + --define '_datadir $(datadir)' \ + --define '_installdir $(installdir)' ifdef ENABLE_TESTS RPM_CMD += \ - --define "createtests yes" \ - --define "_testsinstalldir $(shell basename $(installdir))" + --define 'createtests yes' \ + --define '_testsinstalldir $(shell basename $(installdir))' endif ifdef INSTALL_SDK RPM_CMD += \ - --define "createdevel yes" \ - --define "_idldir $(idldir)" \ - --define "_sdkdir $(sdkdir)" \ - --define "_includedir $(includedir)" + --define 'createdevel yes' \ + --define '_idldir $(idldir)' \ + --define '_sdkdir $(sdkdir)' \ + --define '_includedir $(includedir)' endif #For each of the main, tests, sdk rpms we want to make sure that #if they exist that they are in objdir/dist/ and that they get #uploaded and that they are beside the other build artifacts MAIN_RPM= $(MOZ_APP_NAME)-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) UPLOAD_EXTRA_FILES += $(MAIN_RPM) RPM_CMD += && mv $(TARGET_CPU)/$(MAIN_RPM) $(_ABS_DIST)/ @@ -442,70 +442,70 @@ INNER_UNMAKE_PACKAGE = \ $(if $(filter-out ./,$(OMNIJAR_DIR)), \ && mv $(OMNIJAR_DIR)$(OMNIJAR_NAME) $(OMNIJAR_NAME)) ) endif ifeq ($(MOZ_PKG_FORMAT),DMG) PKG_SUFFIX = .dmg PKG_DMG_FLAGS = ifneq (,$(MOZ_PKG_MAC_DSSTORE)) -PKG_DMG_FLAGS += --copy "$(MOZ_PKG_MAC_DSSTORE):/.DS_Store" +PKG_DMG_FLAGS += --copy '$(MOZ_PKG_MAC_DSSTORE):/.DS_Store' endif ifneq (,$(MOZ_PKG_MAC_BACKGROUND)) -PKG_DMG_FLAGS += --mkdir /.background --copy "$(MOZ_PKG_MAC_BACKGROUND):/.background" +PKG_DMG_FLAGS += --mkdir /.background --copy '$(MOZ_PKG_MAC_BACKGROUND):/.background' endif ifneq (,$(MOZ_PKG_MAC_ICON)) -PKG_DMG_FLAGS += --icon "$(MOZ_PKG_MAC_ICON)" +PKG_DMG_FLAGS += --icon '$(MOZ_PKG_MAC_ICON)' endif ifneq (,$(MOZ_PKG_MAC_RSRC)) -PKG_DMG_FLAGS += --resource "$(MOZ_PKG_MAC_RSRC)" +PKG_DMG_FLAGS += --resource '$(MOZ_PKG_MAC_RSRC)' endif ifneq (,$(MOZ_PKG_MAC_EXTRA)) PKG_DMG_FLAGS += $(MOZ_PKG_MAC_EXTRA) endif _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) ifndef PKG_DMG_SOURCE PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_DIR) endif INNER_MAKE_PACKAGE = $(_ABS_MOZSRCDIR)/build/package/mac_osx/pkg-dmg \ - --source "$(PKG_DMG_SOURCE)" --target "$(PACKAGE)" \ - --volname "$(MOZ_APP_DISPLAYNAME)" $(PKG_DMG_FLAGS) + --source '$(PKG_DMG_SOURCE)' --target '$(PACKAGE)' \ + --volname '$(MOZ_APP_DISPLAYNAME)' $(PKG_DMG_FLAGS) INNER_UNMAKE_PACKAGE = \ set -ex; \ rm -rf $(_ABS_DIST)/unpack.tmp; \ mkdir -p $(_ABS_DIST)/unpack.tmp; \ $(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(_ABS_DIST)/unpack.tmp; \ - rsync -a "$(_ABS_DIST)/unpack.tmp/$(_APPNAME)" $(MOZ_PKG_DIR); \ - test -n "$(MOZ_PKG_MAC_DSSTORE)" && \ - rsync -a "$(_ABS_DIST)/unpack.tmp/.DS_Store" "$(MOZ_PKG_MAC_DSSTORE)"; \ - test -n "$(MOZ_PKG_MAC_BACKGROUND)" && \ - rsync -a "$(_ABS_DIST)/unpack.tmp/.background/`basename "$(MOZ_PKG_MAC_BACKGROUND)"`" "$(MOZ_PKG_MAC_BACKGROUND)"; \ - test -n "$(MOZ_PKG_MAC_ICON)" && \ - rsync -a "$(_ABS_DIST)/unpack.tmp/.VolumeIcon.icns" "$(MOZ_PKG_MAC_ICON)"; \ + rsync -a '$(_ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \ + test -n '$(MOZ_PKG_MAC_DSSTORE)' && \ + rsync -a '$(_ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \ + test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \ + rsync -a '$(_ABS_DIST)/unpack.tmp/.background/`basename '$(MOZ_PKG_MAC_BACKGROUND)'`' '$(MOZ_PKG_MAC_BACKGROUND)'; \ + test -n '$(MOZ_PKG_MAC_ICON)' && \ + rsync -a '$(_ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \ rm -rf $(_ABS_DIST)/unpack.tmp; \ - if test -n "$(MOZ_PKG_MAC_RSRC)" ; then \ + if test -n '$(MOZ_PKG_MAC_RSRC)' ; then \ cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \ hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \ - { /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > "$(MOZ_PKG_MAC_RSRC)" || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \ + { /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > '$(MOZ_PKG_MAC_RSRC)' || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \ rm -f $(MOZ_PKG_APPNAME).tmp.dmg; \ fi # The plst and blkx resources are skipped because they belong to each # individual dmg and are created by hdiutil. SDK_SUFFIX = .tar.bz2 SDK = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX) ifeq ($(MOZ_APP_NAME),xulrunner) SDK = $(SDK_PATH)$(MOZ_APP_NAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX) endif MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK) endif ifdef MOZ_INTERNAL_SIGNING_FORMAT MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x)) ifeq (WINNT,$(OS_ARCH)) -MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd "$(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i" +MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i' endif endif # For final GPG / authenticode signing / dmg signing if required ifdef MOZ_EXTERNAL_SIGNING_FORMAT MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) endif @@ -521,17 +521,17 @@ MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PA $(MOZ_PKG_DIR) && $(INNER_MAKE_PACKAGE) endif #Darwin else MAKE_PACKAGE = $(INNER_MAKE_PACKAGE) endif ifdef MOZ_SIGN_PACKAGE_CMD -MAKE_PACKAGE += && $(MOZ_SIGN_PACKAGE_CMD) "$(PACKAGE)" +MAKE_PACKAGE += && $(MOZ_SIGN_PACKAGE_CMD) '$(PACKAGE)' endif ifdef MOZ_SIGN_CMD MAKE_SDK += && $(MOZ_SIGN_CMD) -f gpg $(SDK) UPLOAD_EXTRA_FILES += $(SDK).asc endif NO_PKG_FILES += \ @@ -583,24 +583,24 @@ DEFINES += -DMOZ_FOLD_LIBS=1 endif GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) # The following target stages files into two directories: one directory for # core files, and one for optional extensions based on the information in # the MOZ_PKG_MANIFEST file. -PKG_ARG = , "$(pkg)" +PKG_ARG = , '$(pkg)' installer-stage: prepare-package ifndef MOZ_PKG_MANIFEST $(error MOZ_PKG_MANIFEST unspecified!) endif @rm -rf $(DEPTH)/installer-stage $(DIST)/xpt - @echo "Staging installer files..." + @echo 'Staging installer files...' @$(NSINSTALL) -D $(DEPTH)/installer-stage/core @cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core @(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD)) ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD # The && true is necessary to make sure Pymake spins a shell $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true endif @@ -653,38 +653,38 @@ stage-package: $(MOZ_PKG_MANIFEST) $(if $(OPTIMIZEJARS),--optimizejars) \ $(addprefix --unify ,$(UNIFY_DIST)) \ $(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \ $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR) ifndef LIBXUL_SDK ifdef MOZ_PACKAGE_JSSHELL # Package JavaScript Shell - @echo "Packaging JavaScript Shell..." + @echo 'Packaging JavaScript Shell...' $(RM) $(PKG_JSSHELL) $(MAKE_JSSHELL) endif # MOZ_PACKAGE_JSSHELL endif # LIBXUL_SDK prepare-package: stage-package make-package-internal: prepare-package make-sourcestamp-file make-buildinfo-file - @echo "Compressing..." + @echo 'Compressing...' cd $(DIST) && $(MAKE_PACKAGE) make-package: FORCE $(MAKE) make-package-internal $(TOUCH) $@ GARBAGE += make-package make-sourcestamp-file:: $(NSINSTALL) -D $(DIST)/$(PKG_PATH) - @echo "$(BUILDID)" > $(MOZ_SOURCESTAMP_FILE) - @echo "$(MOZ_SOURCE_REPO)/rev/$(MOZ_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE) + @echo '$(BUILDID)' > $(MOZ_SOURCESTAMP_FILE) + @echo '$(MOZ_SOURCE_REPO)/rev/$(MOZ_SOURCE_STAMP)' >> $(MOZ_SOURCESTAMP_FILE) .PHONY: make-buildinfo-file make-buildinfo-file: $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/informulate.py \ $(MOZ_BUILDINFO_FILE) \ BUILDID=$(BUILDID) \ MOZ_SOURCE_REPO=$(MOZ_SOURCE_REPO) \ MOZ_SOURCE_STAMP=$(MOZ_SOURCE_STAMP) \ @@ -718,38 +718,38 @@ ifdef INSTALL_SDK # Here comes the hard (cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ (cd $(DESTDIR)$(idldir) && tar -xf -) # SDK directory is the libs + a bunch of symlinks $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin if test -f $(DIST)/include/xpcom-config.h; then \ $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ fi - find $(DIST)/sdk -name "*.pyc" | xargs rm -f + find $(DIST)/sdk -name '*.pyc' | xargs rm -f (cd $(DIST)/sdk/lib && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) (cd $(DIST)/sdk/bin && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin ln -s $(includedir) $(DESTDIR)$(sdkdir)/include ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl endif # INSTALL_SDK make-sdk: $(MAKE) stage-package UNIVERSAL_BINARY= STAGE_SDK=1 MOZ_PKG_DIR=sdk-stage - @echo "Packaging SDK..." + @echo 'Packaging SDK...' $(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin (cd $(DIST)/sdk-stage && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -) $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin (cd $(DIST)/host/bin && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin && tar -xf -) $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk - find $(DIST)/sdk -name "*.pyc" | xargs rm -f + find $(DIST)/sdk -name '*.pyc' | xargs rm -f (cd $(DIST)/sdk && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -) $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/include (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/$(MOZ_APP_NAME)-sdk/include && tar -xf -) $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/idl (cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/$(MOZ_APP_NAME)-sdk/idl && tar -xf -) @@ -767,26 +767,26 @@ ifeq ($(OS_TARGET), WINNT) INSTALLER_PACKAGE = $(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe endif # These are necessary because some of our packages/installers contain spaces # in their filenames and GNU Make's $(wildcard) function doesn't properly # deal with them. empty := space = $(empty) $(empty) -QUOTED_WILDCARD = $(if $(wildcard $(subst $(space),?,$(1))),"$(1)") +QUOTED_WILDCARD = $(if $(wildcard $(subst $(space),?,$(1))),'$(1)') ESCAPE_SPACE = $(subst $(space),\$(space),$(1)) ESCAPE_WILDCARD = $(subst $(space),?,$(1)) # This variable defines which OpenSSL algorithm to use to # generate checksums for files that we upload CHECKSUM_ALGORITHM_PARAM = -d sha512 -d md5 -d sha1 # This variable defines where the checksum file will be located -CHECKSUM_FILE = "$(DIST)/$(PKG_PATH)/$(CHECKSUMS_FILE_BASENAME).checksums" +CHECKSUM_FILE = '$(DIST)/$(PKG_PATH)/$(CHECKSUMS_FILE_BASENAME).checksums' CHECKSUM_FILES = $(CHECKSUM_FILE) ifeq (WINNT,$(OS_TARGET)) UPLOAD_EXTRA_FILES += host/bin/mar.exe UPLOAD_EXTRA_FILES += host/bin/mbsdiff.exe else UPLOAD_EXTRA_FILES += host/bin/mar UPLOAD_EXTRA_FILES += host/bin/mbsdiff @@ -830,45 +830,45 @@ endif checksum: mkdir -p `dirname $(CHECKSUM_FILE)` @$(PYTHON) $(MOZILLA_DIR)/build/checksums.py \ -o $(CHECKSUM_FILE) \ $(CHECKSUM_ALGORITHM_PARAM) \ -s $(call QUOTED_WILDCARD,$(DIST)) \ $(UPLOAD_FILES) - @echo "CHECKSUM FILE START" + @echo 'CHECKSUM FILE START' @cat $(CHECKSUM_FILE) - @echo "CHECKSUM FILE END" + @echo 'CHECKSUM FILE END' $(SIGN_CHECKSUM_CMD) upload: checksum $(PYTHON) $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \ $(UPLOAD_FILES) \ $(CHECKSUM_FILES) ifndef MOZ_PKG_SRCDIR MOZ_PKG_SRCDIR = $(topsrcdir) endif DIR_TO_BE_PACKAGED ?= ../$(notdir $(topsrcdir)) SRC_TAR_EXCLUDE_PATHS += \ - --exclude=".hg*" \ - --exclude="CVS" \ - --exclude=".cvs*" \ - --exclude=".mozconfig*" \ - --exclude="*.pyc" \ - --exclude="$(MOZILLA_DIR)/Makefile" \ - --exclude="$(MOZILLA_DIR)/dist" + --exclude='.hg*' \ + --exclude='CVS' \ + --exclude='.cvs*' \ + --exclude='.mozconfig*' \ + --exclude='*.pyc' \ + --exclude='$(MOZILLA_DIR)/Makefile' \ + --exclude='$(MOZILLA_DIR)/dist' ifdef MOZ_OBJDIR -SRC_TAR_EXCLUDE_PATHS += --exclude="$(MOZ_OBJDIR)" +SRC_TAR_EXCLUDE_PATHS += --exclude='$(MOZ_OBJDIR)' endif CREATE_SOURCE_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ - --mode="go-w" $(SRC_TAR_EXCLUDE_PATHS) -f + --mode=go-w $(SRC_TAR_EXCLUDE_PATHS) -f SOURCE_TAR = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).tar.bz2 HG_BUNDLE_FILE = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_BUNDLE_BASENAME).bundle SOURCE_CHECKSUM_FILE = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).checksums SOURCE_UPLOAD_FILES = $(SOURCE_TAR) HG ?= hg CREATE_HG_BUNDLE_CMD = $(HG) -v -R $(topsrcdir) bundle --base null @@ -887,20 +887,20 @@ SIGN_HG_BUNDLE_CMD = $(MOZ_SIGN_CMD) - ifdef UPLOAD_HG_BUNDLE SOURCE_UPLOAD_FILES += $(HG_BUNDLE_FILE).asc endif endif # source-package creates a source tarball from the files in MOZ_PKG_SRCDIR, # which is either set to a clean checkout or defaults to $topsrcdir source-package: - @echo "Packaging source tarball..." + @echo 'Packaging source tarball...' $(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH) (cd $(MOZ_PKG_SRCDIR) && $(CREATE_SOURCE_TAR) - $(DIR_TO_BE_PACKAGED)) | bzip2 -vf > $(SOURCE_TAR) $(SIGN_SOURCE_TAR_CMD) hg-bundle: $(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH) $(CREATE_HG_BUNDLE_CMD) $(SIGN_HG_BUNDLE_CMD) source-upload: - $(MAKE) upload UPLOAD_FILES="$(SOURCE_UPLOAD_FILES)" CHECKSUM_FILE="$(SOURCE_CHECKSUM_FILE)" + $(MAKE) upload UPLOAD_FILES='$(SOURCE_UPLOAD_FILES)' CHECKSUM_FILE='$(SOURCE_CHECKSUM_FILE)'
--- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -71,18 +71,18 @@ ifdef MOZ_WIDGET_GTK libs:: updater.png $(NSINSTALL) -D $(DIST)/bin/icons $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) libs:: $(NSINSTALL) -D $(DIST)/bin/updater.app - rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/updater.app - sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ + rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/updater.app + sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/updater.app/Contents/Resources/English.lproj/InfoPlist.strings $(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS $(NSINSTALL) $(DIST)/bin/updater $(DIST)/bin/updater.app/Contents/MacOS rm -f $(DIST)/bin/updater endif ifeq (,$(filter-out WINNT,$(OS_ARCH))) # Pick up nsWindowsRestart.cpp
--- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -32,19 +32,19 @@ ifdef MOZ_WIDGET_GTK CXXFLAGS += $(MOZ_PANGO_CFLAGS) endif # Should version be optional or required ? TOOLKIT_EM_VERSION=$(shell $(PERL) $(topsrcdir)/config/milestone.pl --topsrcdir=$(topsrcdir)) $(call warnIfEmpty,TOOLKIT_EM_VERSION) # Valid if null: {warn,error}IfEmpty -DEFINES += -DTOOLKIT_EM_VERSION=\"$(TOOLKIT_EM_VERSION)\" +DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"' -MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) +MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)) ifdef MOZ_SOURCE_STAMP INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) source_repo := $(call getSourceRepo) # extra sanity check for old versions of hg, no showconfig support ifneq (,$(filter http%,$(source_repo)))
--- a/toolkit/xre/test/win/Makefile.in +++ b/toolkit/xre/test/win/Makefile.in @@ -14,12 +14,12 @@ MOZ_WINCONSOLE = 1 USE_STATIC_LIBS = 1 include $(topsrcdir)/config/rules.mk libs:: TestXREMakeCommandLineWin.ini $(INSTALL) $^ $(FINAL_TARGET)/ check:: - @echo "Running TestXREMakeCommandLineWin tests" + @echo 'Running TestXREMakeCommandLineWin tests' @$(RUN_TEST_PROGRAM) $(FINAL_TARGET)/TestXREMakeCommandLineWin.exe - @echo "Running TestDllInterceptor tests" + @echo 'Running TestDllInterceptor tests' @$(RUN_TEST_PROGRAM) $(FINAL_TARGET)/TestDllInterceptor.exe
--- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -35,21 +35,21 @@ LIBS += \ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += $(DIST)/bin/XUL endif ifdef HAVE_BOUTELL_GD ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += \ - -I"$(HAVE_BOUTELL_GD)" \ + -I'$(HAVE_BOUTELL_GD)' \ $(NULL) LIBS += \ -lmozz_s \ - "$(HAVE_BOUTELL_GD)/gd.lib" \ + '$(HAVE_BOUTELL_GD)/gd.lib' \ $(NULL) else LIBS += \ -lgd \ $(NULL) endif DEFINES += \
--- a/tools/update-packaging/Makefile.in +++ b/tools/update-packaging/Makefile.in @@ -30,19 +30,19 @@ endif MAR_BIN = $(LIBXUL_DIST)/host/bin/mar$(HOST_BIN_SUFFIX) MBSDIFF_BIN = $(LIBXUL_DIST)/host/bin/mbsdiff$(HOST_BIN_SUFFIX) OVERRIDE_DEFAULT_GOAL := full-update full-update:: complete-patch ifeq ($(OS_TARGET), WINNT) MOZ_PKG_FORMAT := SFX7Z -UNPACKAGE = "$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))" +UNPACKAGE = '$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))' ifdef AB_CD -UNPACKAGE = "$(PACKAGE_BASE_DIR)/$(PACKAGE)" +UNPACKAGE = '$(PACKAGE_BASE_DIR)/$(PACKAGE)' endif endif include $(topsrcdir)/config/rules.mk include $(topsrcdir)/toolkit/mozapps/installer/signing.mk include $(topsrcdir)/toolkit/mozapps/installer/packager.mk ifdef MOZ_EXTERNAL_SIGNING_FORMAT @@ -51,29 +51,29 @@ MOZ_EXTERNAL_SIGNING_FORMAT := $(filter- MOZ_EXTERNAL_SIGNING_FORMAT := mar $(MOZ_EXTERNAL_SIGNING_FORMAT) endif dir-stage := $(call mkdir_deps,$(STAGE_DIR)) complete-patch:: $(dir-stage) ifeq ($(OS_TARGET), WINNT) test -f $(UNPACKAGE) - $(RM) -rf "$(PACKAGE_DIR)" + $(RM) -rf '$(PACKAGE_DIR)' cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE) endif MAR=$(MAR_BIN) \ $(srcdir)/make_full_update.sh \ - "$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).complete.mar" \ - "$(PACKAGE_DIR)" + '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).complete.mar' \ + '$(PACKAGE_DIR)' ifdef MOZ_SIGN_PACKAGE_CMD - $(MOZ_SIGN_PACKAGE_CMD) "$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).complete.mar" + $(MOZ_SIGN_PACKAGE_CMD) '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).complete.mar' endif partial-patch:: $(dir-stage) MAR=$(MAR_BIN) \ MBSDIFF=$(MBSDIFF_BIN) \ $(srcdir)/make_incremental_update.sh \ - "$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar" \ - "$(SRC_BUILD)" \ - "$(DST_BUILD)" + '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar' \ + '$(SRC_BUILD)' \ + '$(DST_BUILD)' ifdef MOZ_SIGN_PACKAGE_CMD - $(MOZ_SIGN_PACKAGE_CMD) "$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar" + $(MOZ_SIGN_PACKAGE_CMD) '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar' endif
--- a/webapprt/Makefile.in +++ b/webapprt/Makefile.in @@ -6,17 +6,17 @@ include $(topsrcdir)/config/config.mk PREF_JS_EXPORTS = $(srcdir)/prefs.js \ $(NULL) include $(topsrcdir)/config/rules.mk libs:: $(call mkdir_deps,$(FINAL_TARGET)) - $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "resource webapprt ./") + $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'resource webapprt ./') GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid) DEFINES += -DGRE_BUILDID=$(GRE_BUILDID) webapprt.ini: application.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt $(call py_action,preprocessor,$(DEFINES) $< -o $@) libs:: webapprt.ini
--- a/xpcom/analysis/Makefile.in +++ b/xpcom/analysis/Makefile.in @@ -34,13 +34,13 @@ classapi: $(call mkdir_deps,$(MDDEPDIR)) upload_classapi: $(EXIT_ON_ERROR) \ for class in `cat dumptypes.list`; do \ $(PYTHON) $(srcdir)/MDC-upload.py $${class}-fixed.html en/$${class}; \ done $(EXIT_ON_ERROR) \ for class in `cat graphtypes.list`; do \ - $(PYTHON) $(srcdir)/MDC-attach.py $${class}-graph.png en/$${class} "image/png" "Class inheritance graph"; \ + $(PYTHON) $(srcdir)/MDC-attach.py $${class}-graph.png en/$${class} image/png 'Class inheritance graph'; \ done GARBAGE += $(wildcard *.html) $(wildcard *.png) $(wildcard *.map) \ $(wildcard *.gv) classapi.out graphtypes.list dumptypes.list
--- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -24,13 +24,13 @@ endif ifeq (,$(filter-out WINNT os2-emx, $(HOST_OS_ARCH))) getnativepath = $(call normalizepath,$(1)) else getnativepath = $(1) endif abs_srcdir = $(abspath $(srcdir)) -regOrderDir="$(call getnativepath,$(abs_srcdir)/regorder)"; +regOrderDir = $(call getnativepath,$(abs_srcdir)/regorder) check:: XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) \ - $(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) $(regOrderDir) + $(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) '$(regOrderDir)'
--- a/xpcom/tests/static-checker/Makefile.in +++ b/xpcom/tests/static-checker/Makefile.in @@ -110,37 +110,37 @@ include $(topsrcdir)/config/rules.mk # We want to compile each file and invert the result to ensure that # compilation failed. check:: \ $(STATIC_FAILURE_TESTCASES:.cpp=.s-fail) \ $(STATIC_WARNING_TESTCASES:.cpp=.s-warn) \ $(STATIC_PASS_TESTCASES:.cpp=.s-pass) %.s-fail: %.cpp $(GLOBAL_DEPS) $(DEHYDRA_SCRIPTS) $(call mkdir_deps,$(MDDEPDIR)) - @printf "Compiling $(<F) to check that the static-analysis script is checking properly..." + @printf 'Compiling $(<F) to check that the static-analysis script is checking properly...' @if $(CCC) $(OUTOPTION)/dev/null -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) >$(*F).errlog 2>&1; then \ - printf "fail:\nerror: compilation of $(<F) succeeded. It shouldn't have!\n"; \ + printf 'fail:\nerror: compilation of $(<F) succeeded. It shouldn't have!\n'; \ exit 1; \ else \ - printf "ok.\n"; \ + printf 'ok.\n'; \ fi %.s-warn: %.cpp $(GLOBAL_DEPS) $(DEHYDRA_SCRIPTS) $(call mkdir_deps,$(MDDEPDIR)) - @printf "Compiling $(<F) to check that the static-analysis script is checking properly..." + @printf 'Compiling $(<F) to check that the static-analysis script is checking properly...' @if $(CCC) -Werror $(OUTOPTION)/dev/null -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) >$(*F).errlog 2>&1; then \ - printf "fail:\nerror: compilation of $(<F) succeeded with -Werror. It shouldn't have!\n"; \ + printf 'fail:\nerror: compilation of $(<F) succeeded with -Werror. It shouldn't have!\n'; \ exit 1; \ fi @if $(CCC) $(OUTOPTION)/dev/null -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) >$(*F).werrlog 2>&1; then \ - printf "ok.\n"; \ + printf 'ok.\n'; \ else \ - printf "fail:\nerror: compilation of $(<F) without -Werror failed. A warning should have been issued.\n"; \ + printf 'fail:\nerror: compilation of $(<F) without -Werror failed. A warning should have been issued.\n'; \ exit 1; \ fi %.s-pass: %.cpp $(GLOBAL_DEPS) $(DEHYDRA_SCRIPTS) $(call mkdir_deps,$(MDDEPDIR)) - @printf "Compiling $(<F) to check that the static-analysis script is checking properly..." + @printf 'Compiling $(<F) to check that the static-analysis script is checking properly...' @if $(CCC) -Werror $(OUTOPTION)/dev/null -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) >$(*F).errlog 2>&1; then \ - printf "ok.\n"; \ + printf 'ok.\n'; \ else \ - printf "fail:\nerror: compilation of $(<F) failed. It shouldn't have!\n"; \ + printf 'fail:\nerror: compilation of $(<F) failed. It shouldn't have!\n'; \ exit 1; \ fi
--- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -59,22 +59,22 @@ endif endif ifeq ($(OS_ARCH),OS2) RESFILE=splashos2.res RCFLAGS += -DMOZ_XULRUNNER ifdef DEBUG RCFLAGS += -DDEBUG endif -RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" +RCFLAGS += -DXULRUNNER_ICO='"$(DIST)/branding/xulrunner.ico"' -DDOCUMENT_ICO='"$(DIST)/branding/document.ico"' endif include $(topsrcdir)/config/rules.mk -DEFINES += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" +DEFINES += -DXULRUNNER_ICO='"$(DIST)/branding/xulrunner.ico"' -DDOCUMENT_ICO='"$(DIST)/branding/document.ico"' ifeq ($(OS_ARCH),WINNT) # # Control the default heap size. # This is the heap returned by GetProcessHeap(). # As we use the CRT heap, the default size is too large and wastes VM. # # The default heap size is 1MB on Win32. @@ -122,17 +122,17 @@ FRAMEWORK_VERSION = $(MOZILLA_VERSION) FRAMEWORK_DIR = \ $(DIST)/$(FRAMEWORK_NAME).framework/Versions/$(FRAMEWORK_VERSION) $(FRAMEWORK_DIR)/Resources: $(NSINSTALL) -D $@ tools:: $(PROGRAM) $(FRAMEWORK_DIR)/Resources $(NSINSTALL) $(srcdir)/macbuild/InfoPlist.strings $(FRAMEWORK_DIR)/Resources - sed -e "s/APP_VERSION/$(APP_VERSION)/" $(srcdir)/macbuild/Info.plist.in > $(FRAMEWORK_DIR)/Info.plist + sed -e 's/APP_VERSION/$(APP_VERSION)/' $(srcdir)/macbuild/Info.plist.in > $(FRAMEWORK_DIR)/Info.plist rsync -av $(DIST)/bin/ $(FRAMEWORK_DIR) --exclude mangle --exclude shlibsign rm -f $(DIST)/$(FRAMEWORK_NAME).framework/Versions/Current \ $(DIST)/$(FRAMEWORK_NAME).framework/libxpcom.dylib \ $(DIST)/$(FRAMEWORK_NAME).framework/XUL \ $(DIST)/$(FRAMEWORK_NAME).framework/xulrunner ln -s $(FRAMEWORK_VERSION) $(DIST)/$(FRAMEWORK_NAME).framework/Versions/Current ln -s Versions/Current/libxpcom.dylib $(DIST)/$(FRAMEWORK_NAME).framework/libxpcom.dylib ln -s Versions/Current/XUL $(DIST)/$(FRAMEWORK_NAME).framework/XUL
--- a/xulrunner/build.mk +++ b/xulrunner/build.mk @@ -1,14 +1,14 @@ # 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/. installer: - @echo "XULRunner doesn't have an installer yet." + @echo 'XULRunner doesn't have an installer yet.' package: @$(MAKE) -C xulrunner/installer install: @$(MAKE) -C xulrunner/installer install sdk: