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

This commit is contained in:
Ted Mielczarek 2011-06-13 10:40:35 -04:00
commit 1bb6830a2c

View File

@ -82,22 +82,6 @@ endif
SDK_SUFFIX = $(PKG_SUFFIX)
SDK = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
# JavaScript Shell packaging
JSSHELL_BINS = \
$(DIST)/bin/js$(BIN_SUFFIX) \
$(DIST)/bin/$(LIB_PREFIX)nspr4$(DLL_SUFFIX) \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
JSSHELL_BINS += $(DIST)/bin/mozcrt19$(DLL_SUFFIX)
else
JSSHELL_BINS += \
$(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \
$(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \
$(NULL)
endif
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))
JARLOG_DIR = $(call core_abspath,$(DEPTH)/jarlog/)
@ -688,10 +672,6 @@ endif
ifdef MOZ_PKG_REMOVALS
$(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
endif # MOZ_PKG_REMOVALS
# Package JavaScript Shell
@echo "Packaging JavaScript Shell..."
$(RM) $(JSSHELL_PKG)
$(MAKE_JSSHELL)
make-package: stage-package $(PACKAGE_XULRUNNER) make-sourcestamp-file
@echo "Compressing..."
@ -802,7 +782,6 @@ 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)) \
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
checksum: