bug 543463 - Make it easier for non-Mozilla devs to get and use the JavaScript Shell, r=ted

This commit is contained in:
David Humphrey 2011-06-11 08:02:00 -04:00
parent b5c26437fc
commit e34eb4baec
2 changed files with 6 additions and 4 deletions

View File

@ -168,3 +168,6 @@ _dollar=$$
MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
# JavaScript Shell
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip

View File

@ -95,8 +95,7 @@ JSSHELL_BINS += \
$(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \
$(NULL)
endif
JSSHELL_PKG = $(DIST)/jsshell.zip
MAKE_JSSHELL = $(ZIP) -9j $(JSSHELL_PKG) $(JSSHELL_BINS)
MAKE_JSSHELL = $(ZIP) -9j $(PKG_JSSHELL) $(JSSHELL_BINS)
MAKE_PACKAGE = $(error What is a $(MOZ_PKG_FORMAT) package format?);
_ABS_DIST = $(call core_abspath,$(DIST))
@ -685,7 +684,7 @@ ifdef MOZ_PKG_REMOVALS
endif # MOZ_PKG_REMOVALS
# Package JavaScript Shell
@echo "Packaging JavaScript Shell..."
$(RM) $(JSSHELL_PKG)
$(RM) $(PKG_JSSHELL)
$(MAKE_JSSHELL)
make-package: stage-package $(PACKAGE_XULRUNNER) make-sourcestamp-file
@ -797,7 +796,7 @@ UPLOAD_FILES= \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
$(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
$(call QUOTED_WILDCARD,$(JSSHELL_PKG)) \
$(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
checksum: