Backed out changeset 055e5a11a673 – bug 543463 - Make it easier for non-Mozilla devs to get and use the JavaScript Shell, for causing bug 663796 (unittests failing to run)

toolkit/mozapps/installer/package-name.mk

@@ -168,6 +168,3 @@ _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

toolkit/mozapps/installer/packager.mk

@@ -95,7 +95,8 @@ JSSHELL_BINS += \
   $(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \
   $(NULL)
 endif
-MAKE_JSSHELL  = $(ZIP) -9j $(PKG_JSSHELL) $(JSSHELL_BINS)
+JSSHELL_PKG   = $(DIST)/jsshell.zip
+MAKE_JSSHELL  = $(ZIP) -9j $(JSSHELL_PKG) $(JSSHELL_BINS)
 
 MAKE_PACKAGE	= $(error What is a $(MOZ_PKG_FORMAT) package format?);
 _ABS_DIST = $(call core_abspath,$(DIST))
@@ -689,7 +690,7 @@ ifdef MOZ_PKG_REMOVALS
 endif # MOZ_PKG_REMOVALS
 # Package JavaScript Shell
 	@echo "Packaging JavaScript Shell..."
-	$(RM) $(PKG_JSSHELL)
+	$(RM) $(JSSHELL_PKG)
 	$(MAKE_JSSHELL)
 
 make-package: stage-package $(PACKAGE_XULRUNNER) make-sourcestamp-file
@@ -801,7 +802,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,$(PKG_JSSHELL)) \
+  $(call QUOTED_WILDCARD,$(JSSHELL_PKG)) \
   $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
 
 checksum: