Bug 548788 - [Shredder] Trunk packaging shouting about a missing file: "config/printconfigsetting.py': [Errno 2] No such file or directory"; (Bv1b-CC) Use $(MOZILLA_DIR) instead of $(topsrcdir)/mozilla where possible.
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 26 Mar 2010 17:14:45 +0100
changeset 5276 fa976251fb9d2eee63a56092722b3c4dd909d0cc
parent 5275 b90af1833692a35f9d9148a8e13f0a2b5475dca4
child 5277 f0450df04eb9203e47ea87e43f5e4e7da288ccec
push idunknown
push userunknown
push dateunknown
bugs548788
Bug 548788 - [Shredder] Trunk packaging shouting about a missing file: "config/printconfigsetting.py': [Errno 2] No such file or directory"; (Bv1b-CC) Use $(MOZILLA_DIR) instead of $(topsrcdir)/mozilla where possible. r=standard8.
calendar/sunbird/app/Makefile.in
config/rules.mk
mail/app/Makefile.in
suite/app/Makefile.in
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -271,17 +271,17 @@ ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
 endif
 endif
 
 $(PROGRAM): $(MOZDEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 
 ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 
-sunbird:: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
+sunbird:: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
 	chmod +x $@
 
 libs:: sunbird
 	$(INSTALL) $< $(DIST)/bin
 
 install:: sunbird
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -152,42 +152,42 @@ else
 	$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py \
 	  $(testxpcobjdir)/all-test-dirs.list \
 	  $(addprefix $(MODULE)/,$(XPCSHELL_TESTS))
 endif
 
 testxpcsrcdir = $(MOZILLA_SRCDIR)/testing/xpcshell
 
 # Execute all tests in the $(XPCSHELL_TESTS) directories.
-# See also mozilla/testsuite-targets.mk 'xpcshell-tests' target for global execution.
+# See also $(MOZILLA_DIR)/testing/testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
-	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
-	  -I$(topsrcdir)/mozilla/build \
+	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
+	  -I$(MOZILLA_DIR)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  $(DIST)/bin/xpcshell \
 	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
 # Execute a single test, specified in $(SOLO_FILE), but don't automatically
 # start the test. Instead, present the xpcshell prompt so the user can
 # attach a debugger and then start the test.
 check-interactive:
-	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
-	  -I$(topsrcdir)/mozilla/build \
+	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
+	  -I$(MOZILLA_DIR)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --test-path=$(SOLO_FILE) \
 	  --interactive \
 	  $(DIST)/bin/xpcshell \
 	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
-	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
-	  -I$(topsrcdir)/mozilla/build \
+	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
+	  -I$(MOZILLA_DIR)/build \
 	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
 	  --test-path=$(SOLO_FILE) \
 	  $(DIST)/bin/xpcshell \
 	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
 endif # XPCSHELL_TESTS
 
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -312,17 +312,17 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
 ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
-$(MOZ_APP_NAME):: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
+$(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
 	chmod +x $@
 
 libs:: $(MOZ_APP_NAME)
 	$(INSTALL) $< $(DIST)/bin
 
 install:: $(MOZ_APP_NAME)
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -252,17 +252,17 @@ ifneq (,$(filter-out OS2 WINNT Darwin,$(
 		-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|g" < $< > $@
 
 libs:: $(MOZ_APP_NAME).1
 	$(INSTALL) $< $(DIST)/man/man1
 
 install:: $(MOZ_APP_NAME).1
 	$(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mandir)/man1
 
-$(MOZ_APP_NAME):: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
+$(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" \
 		-e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
 	chmod +x $@
 
 libs:: $(MOZ_APP_NAME)
 	$(INSTALL) $< $(DIST)/bin