Backed out changeset 7886dc6ae0c8 - bug 549427 - tests tarball should be zip files (CLOSED TREE)

This commit is contained in:
Ted Mielczarek 2010-04-07 13:32:06 -04:00
Родитель 7c55fb74aa
Коммит 52d4077549
2 изменённых файлов: 2 добавлений и 4 удалений

Просмотреть файл

@ -131,9 +131,7 @@ endif
package-tests: package-tests:
$(NSINSTALL) -D $(DIST)/$(PKG_PATH) $(NSINSTALL) -D $(DIST)/$(PKG_PATH)
@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)" @(cd $(PKG_STAGE) && tar $(TAR_CREATE_FLAGS) - *) | bzip2 -f > "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
cd $(PKG_STAGE) && \
zip -r9D "../$(PKG_PATH)$(TEST_PACKAGE)" *
make-stage-dir: make-stage-dir:
rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs

Просмотреть файл

@ -168,7 +168,7 @@ endif # MOZ_PKG_PRETTYNAMES
SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
# Test package naming # Test package naming
TEST_PACKAGE = $(PKG_BASENAME).tests.zip TEST_PACKAGE = $(PKG_BASENAME).tests.tar.bz2
ifneq (,$(wildcard $(DIST)/bin/application.ini)) ifneq (,$(wildcard $(DIST)/bin/application.ini))
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)