Bug 509147 - Port |Bug 483856 - Use $(CURDIR) to make pymake happy| to comm-central; (Av2a) Just copy it.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 11 Mar 2010 12:37:27 +0100
changeset 5136 7353fbf8aafe11dda06b2288d7e2103295d733d9
parent 5135 1745c699f0b5cba1b0b7722d1f5f1e3d401d0941
child 5137 aa53ff82623bee1e646fd0e2c35fc180447d2170
push idunknown
push userunknown
push dateunknown
bugs509147, 483856
Bug 509147 - Port |Bug 483856 - Use $(CURDIR) to make pymake happy| to comm-central; (Av2a) Just copy it. r=standard8.
calendar/locales/Makefile.in
client.mk
mail/installer/windows/Makefile.in
mail/locales/Makefile.in
suite/common/Makefile.in
suite/locales/Makefile.in
--- a/calendar/locales/Makefile.in
+++ b/calendar/locales/Makefile.in
@@ -47,17 +47,17 @@ include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(AB_CD),)
 DIRS = ../timezones
 endif
 
 include $(topsrcdir)/config/config.mk
 
 run_for_effects := $(shell if test ! -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if test ! -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
-_ABS_DIST := $(shell cd $(DIST) && pwd)
+_ABS_DIST := $(call core_abspath,$(DIST))
 
 SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile
 
 # This makefile uses variable overrides from the libs-% target to
 # build non-default locales to non-default dist/ locations. Be aware!
 
 AB = $(firstword $(subst -, ,$(AB_CD)))
 
--- a/client.mk
+++ b/client.mk
@@ -70,17 +70,17 @@
 #   MOZ_UNIFY_BDATE      - Set to use the same bdate for each project in
 #                          MOZ_BUILD_PROJECTS
 #
 #######################################################################
 # Defines
 
 comma := ,
 
-CWD := $(shell pwd)
+CWD := $(CURDIR)
 ifneq (1,$(words $(CWD)))
 $(error The mozilla directory cannot be located in a path with spaces.)
 endif
 
 ifeq "$(CWD)" "/"
 CWD   := /.
 endif
 
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -104,17 +104,17 @@ uninstaller::
 	done
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	for i in $(BRANDING_FILES_CONV); do \
 	  iconv -f UTF-8 -t UTF-16LE $(DIST)/branding/$$i | \
 	    cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	    $(CONFIG_DIR)/$$i; \
 	done
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
+	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in | iconv -f UTF-8 -t UTF-16LE | \
 	  cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	  $(CONFIG_DIR)/defines.nsi
 	$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \
 	  $(MOZILLA_SRCDIR) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer $(AB_CD) \
 	  $(CONFIG_DIR)
 
 $(CONFIG_DIR)/setup.exe::
@@ -130,17 +130,17 @@ uninstaller::
 	    cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	    $(CONFIG_DIR)/$$i; \
 	done
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 ifeq ($(CONFIG_DIR),instgen)
 	$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/make-installremoves.pl \
 	  ../removed-files > $(CONFIG_DIR)/removed-files.log
 endif
-	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
+	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in | iconv -f UTF-8 -t UTF-16LE | \
 	  cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
 	  $(CONFIG_DIR)/defines.nsi
 	$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \
 	  $(MOZILLA_SRCDIR) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer $(AB_CD) \
 	  $(CONFIG_DIR)
 
 include $(topsrcdir)/config/rules.mk
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -40,17 +40,17 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 relativesrcdir  = mail/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
 run_for_effects := $(shell if test ! -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if test ! -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
-_ABS_DIST := $(shell cd $(DIST) && pwd)
+_ABS_DIST := $(call core_abspath,$(DIST))
 
 ifndef MOZ_BRANDING_DIRECTORY
 MOZ_BRANDING_DIRECTORY = mail/branding/nightly
 endif
 
 SUBMAKEFILES += \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
--- a/suite/common/Makefile.in
+++ b/suite/common/Makefile.in
@@ -49,17 +49,17 @@ PARALLEL_DIRS += tests downloads/tests
 endif
 
 EXTRA_COMPONENTS = \
 	sidebar/nsSidebar.js \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-abs_srcdir = $(shell cd $(srcdir) && pwd)
+abs_srcdir = $(call core_abspath,$(srcdir))
 
 CHROME_DEPS += $(abs_srcdir)/app-license.html
 
 # DEFINES for preprocessing
 # Use suite/common/app-license.html as input when generating 
 # chrome://content/communicator/license.html to override 
 # chrome://global/content/license.html (about:license)
 DEFINES += -DAPP_EULA_BLOCK=$(abs_srcdir)/app-license.html
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -45,17 +45,17 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 vpath %.src @srcdir@/en-US/searchplugins
 vpath %.png @srcdir@/en-US/searchplugins
 vpath %.src $(LOCALE_SRCDIR)/searchplugins
 vpath %.png $(LOCALE_SRCDIR)/searchplugins
 
 run_for_effects := $(shell if test ! -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if test ! -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
-_ABS_DIST := $(shell cd $(DIST) && pwd)
+_ABS_DIST := $(call core_abspath,$(DIST))
 
 AB = $(firstword $(subst -, ,$(AB_CD)))
 
 PWD := $(CURDIR)
 
 # These are defaulted to be compatible with the files the wget-en-US target
 # pulls. You may override them if you provide your own files. You _must_
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not