Use tar instead of cp to copy dist/bin & resolve symlinks.

Bug #133168 r=jdunn a=asa
This commit is contained in:
seawood%netscape.com 2002-03-30 01:44:44 +00:00
Родитель bf26ffab3f
Коммит e390b504fc
1 изменённых файлов: 7 добавлений и 6 удалений

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

@ -56,19 +56,19 @@ endif
ifeq ($(MOZ_PKG_FORMAT),TAR) ifeq ($(MOZ_PKG_FORMAT),TAR)
PKG_SUFFIX = .tar PKG_SUFFIX = .tar
MAKE_PACKAGE = tar $(TAR_CREATE_FLAGS) - $(MOZ_PKG_APPNAME) > $(PACKAGE) MAKE_PACKAGE = tar -cf - $(MOZ_PKG_APPNAME) > $(PACKAGE)
endif endif
ifeq ($(MOZ_PKG_FORMAT),TGZ) ifeq ($(MOZ_PKG_FORMAT),TGZ)
PKG_SUFFIX = .tar.gz PKG_SUFFIX = .tar.gz
MAKE_PACKAGE = tar $(TAR_CREATE_FLAGS) - $(MOZ_PKG_APPNAME) | gzip -vf9 > $(PACKAGE) MAKE_PACKAGE = tar -cf - $(MOZ_PKG_APPNAME) | gzip -vf9 > $(PACKAGE)
endif endif
ifeq ($(MOZ_PKG_FORMAT),BZ2) ifeq ($(MOZ_PKG_FORMAT),BZ2)
PKG_SUFFIX = .tar.bz2 PKG_SUFFIX = .tar.bz2
MAKE_PACKAGE = tar $(TAR_CREATE_FLAGS) - $(MOZ_PKG_APPNAME) | bzip2 -vf > $(PACKAGE) MAKE_PACKAGE = tar -cf - $(MOZ_PKG_APPNAME) | bzip2 -vf > $(PACKAGE)
endif endif
ifeq ($(MOZ_PKG_FORMAT),ZIP) ifeq ($(MOZ_PKG_FORMAT),ZIP)
PKG_SUFFIX = .zip PKG_SUFFIX = .zip
MAKE_PACKAGE = $(ZIP) -vr9 $(PACKAGE) $(MOZ_PKG_APPNAME) MAKE_PACKAGE = $(ZIP) -r9 $(PACKAGE) $(MOZ_PKG_APPNAME)
endif endif
ifeq ($(MOZ_PKG_FORMAT),RPM) ifeq ($(MOZ_PKG_FORMAT),RPM)
PKG_SUFFIX = .rpm PKG_SUFFIX = .rpm
@ -122,10 +122,11 @@ endif
$(PACKAGE): $(MOZILLA_BIN) $(PACKAGE): $(MOZILLA_BIN)
@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $@ $(EXCLUDE_LIST) @rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $@ $(EXCLUDE_LIST)
# NOTE: this must be a cp now that dist links into the tree so that we # NOTE: this must be a tar now that dist links into the tree so that we
# do not strip the binaries actually in the tree. # do not strip the binaries actually in the tree.
@echo "Creating package directory..." @echo "Creating package directory..."
@cp -rp ${DIST}/bin $(DIST)/$(MOZ_PKG_APPNAME) @mkdir $(DIST)/$(MOZ_PKG_APPNAME)
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -)
ifdef MOZ_NATIVE_NSPR ifdef MOZ_NATIVE_NSPR
ifndef EXCLUDE_NSPR_LIBS ifndef EXCLUDE_NSPR_LIBS
@echo "Copying NSPR libs..." @echo "Copying NSPR libs..."