Bug 730196 - fix intermittent timeouts during make package on Windows; r=ted

This commit is contained in:
Nathan Froyd 2012-03-12 11:33:53 -04:00
parent aaeeb99ff6
commit 23f675673d

View File

@ -482,10 +482,11 @@ PRECOMPILE_RESOURCE=gre
PRECOMPILE_GRE=$$PWD PRECOMPILE_GRE=$$PWD
endif endif
# Silence the unzip step so we don't print any binary data from the comment field.
GENERATE_CACHE = \ GENERATE_CACHE = \
$(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \ $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \
rm -rf jsloader && \ rm -rf jsloader && \
$(UNZIP) startupCache.zip && \ $(UNZIP) -q startupCache.zip && \
rm startupCache.zip && \ rm startupCache.zip && \
$(ZIP) -r9m $(OMNIJAR_NAME) jsloader/resource/$(PRECOMPILE_RESOURCE) $(ZIP) -r9m $(OMNIJAR_NAME) jsloader/resource/$(PRECOMPILE_RESOURCE)
else else