Bug 736519 - Package jssubloader cache in omnijar. r=khuey

This commit is contained in:
Mike Hommey 2012-03-16 18:32:02 +01:00
parent 1cfe016bf0
commit eba04b4403

View File

@ -485,10 +485,10 @@ endif
# Silence the unzip step so we don't print any binary data from the comment field. # 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 jssubloader && \
$(UNZIP) -q 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) jssubloader/*/resource/$(PRECOMPILE_RESOURCE)
else else
GENERATE_CACHE = true GENERATE_CACHE = true
endif endif
@ -507,6 +507,7 @@ OMNIJAR_FILES = \
defaults \ defaults \
greprefs.js \ greprefs.js \
jsloader \ jsloader \
jssubloader \
hyphenation \ hyphenation \
update.locale \ update.locale \
$(NULL) $(NULL)