| author | Mike Hommey <mh+mozilla@glandium.org> |
| Wed, 21 Sep 2011 18:06:14 +0200 | |
| changeset 77270 | f4b05b1c55965aff05b51962c7609fc708ff91b0 |
| parent 77269 | 50115be8eaf0a2848b5d2fe9b59d62c5a941a889 |
| child 77271 | 2089dc93c4324444d788049dfd29b538f618928d |
| push id | 21191 |
| push user | bmo@edmorley.co.uk |
| push date | Thu, 22 Sep 2011 00:52:59 +0000 |
| treeherder | mozilla-central@4495e1f795c2 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | khuey |
| bugs | 687805 |
| milestone | 9.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
|
| config/rules.mk | file | annotate | diff | comparison | revisions | |
| js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/config/rules.mk +++ b/config/rules.mk @@ -1402,19 +1402,20 @@ ifneq ($(PREF_JS_EXPORTS),) ifeq (WINNT,$(OS_ARCH)) PREF_PPFLAGS = --line-endings=crlf endif ifndef NO_DIST_INSTALL $(FINAL_TARGET)/$(PREF_DIR): $(NSINSTALL) -D $@ -libs:: $(FINAL_TARGET)/$(PREF_DIR) $(PREF_JS_EXPORTS) +libs:: $(FINAL_TARGET)/$(PREF_DIR) +libs:: $(PREF_JS_EXPORTS) $(EXIT_ON_ERROR) \ - for i in $(PREF_JS_EXPORTS); do \ + for i in $^; do \ dest=$(FINAL_TARGET)/$(PREF_DIR)/`basename $$i`; \ $(RM) -f $$dest; \ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \ done endif endif ################################################################################ @@ -1647,36 +1648,37 @@ ifndef NO_DIST_INSTALL $(JAR_MANIFEST) endif endif ifneq ($(DIST_FILES),) $(DIST)/bin: $(NSINSTALL) -D $@ -libs:: $(DIST_FILES) $(DIST)/bin +libs:: $(DIST)/bin +libs:: $(DIST_FILES) @$(EXIT_ON_ERROR) \ - for f in $(DIST_FILES); do \ + for f in $^; do \ dest=$(FINAL_TARGET)/`basename $$f`; \ $(RM) -f $$dest; \ $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ - $(srcdir)/$$f > $$dest; \ + $$f > $$dest; \ done endif ifneq ($(DIST_CHROME_FILES),) libs:: $(DIST_CHROME_FILES) @$(EXIT_ON_ERROR) \ - for f in $(DIST_CHROME_FILES); do \ + for f in $^; do \ dest=$(FINAL_TARGET)/chrome/`basename $$f`; \ $(RM) -f $$dest; \ $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ - $(srcdir)/$$f > $$dest; \ + $$f > $$dest; \ done endif ifneq ($(XPI_PKGNAME),) libs realchrome:: ifdef STRIP_XPI ifndef MOZ_DEBUG @echo "Stripping $(XPI_PKGNAME) package directory..."
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1402,19 +1402,20 @@ ifneq ($(PREF_JS_EXPORTS),) ifeq (WINNT,$(OS_ARCH)) PREF_PPFLAGS = --line-endings=crlf endif ifndef NO_DIST_INSTALL $(FINAL_TARGET)/$(PREF_DIR): $(NSINSTALL) -D $@ -libs:: $(FINAL_TARGET)/$(PREF_DIR) $(PREF_JS_EXPORTS) +libs:: $(FINAL_TARGET)/$(PREF_DIR) +libs:: $(PREF_JS_EXPORTS) $(EXIT_ON_ERROR) \ - for i in $(PREF_JS_EXPORTS); do \ + for i in $^; do \ dest=$(FINAL_TARGET)/$(PREF_DIR)/`basename $$i`; \ $(RM) -f $$dest; \ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \ done endif endif ################################################################################ @@ -1647,36 +1648,37 @@ ifndef NO_DIST_INSTALL $(JAR_MANIFEST) endif endif ifneq ($(DIST_FILES),) $(DIST)/bin: $(NSINSTALL) -D $@ -libs:: $(DIST_FILES) $(DIST)/bin +libs:: $(DIST)/bin +libs:: $(DIST_FILES) @$(EXIT_ON_ERROR) \ - for f in $(DIST_FILES); do \ + for f in $^; do \ dest=$(FINAL_TARGET)/`basename $$f`; \ $(RM) -f $$dest; \ $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ - $(srcdir)/$$f > $$dest; \ + $$f > $$dest; \ done endif ifneq ($(DIST_CHROME_FILES),) libs:: $(DIST_CHROME_FILES) @$(EXIT_ON_ERROR) \ - for f in $(DIST_CHROME_FILES); do \ + for f in $^; do \ dest=$(FINAL_TARGET)/chrome/`basename $$f`; \ $(RM) -f $$dest; \ $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ - $(srcdir)/$$f > $$dest; \ + $$f > $$dest; \ done endif ifneq ($(XPI_PKGNAME),) libs realchrome:: ifdef STRIP_XPI ifndef MOZ_DEBUG @echo "Stripping $(XPI_PKGNAME) package directory..."