зеркало из https://github.com/mozilla/pjs.git
Avoid packaging symlinks in the sdk on *x builds.
Bug #192828 r=leaf a=asa
This commit is contained in:
Родитель
4f896e48f3
Коммит
f6923c6c32
|
@ -65,21 +65,22 @@ endif
|
|||
ifeq ($(MOZ_PKG_FORMAT),TAR)
|
||||
PKG_SUFFIX = .tar
|
||||
MAKE_PACKAGE = tar -cf - $(MOZ_PKG_APPNAME) > $(PACKAGE)
|
||||
MAKE_SDK = tar -cf - $(MOZ_PKG_APPNAME)-$(SDK_DIR) > $(SDK)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),TGZ)
|
||||
PKG_SUFFIX = .tar.gz
|
||||
MAKE_PACKAGE = tar -cf - $(MOZ_PKG_APPNAME) | gzip -vf9 > $(PACKAGE)
|
||||
MAKE_SDK = tar -cf - $(SDK_DIR) | gzip -vf9 > $(SDK)
|
||||
MAKE_SDK = tar -cf - $(MOZ_PKG_APPNAME)-$(SDK_DIR) | gzip -vf9 > $(SDK)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),BZ2)
|
||||
PKG_SUFFIX = .tar.bz2
|
||||
MAKE_PACKAGE = tar -cf - $(MOZ_PKG_APPNAME) | bzip2 -vf > $(PACKAGE)
|
||||
MAKE_SDK = tar -cf - $(SDK_DIR) | bzip2 -vf > $(SDK)
|
||||
MAKE_SDK = tar -cf - $(MOZ_PKG_APPNAME)-$(SDK_DIR) | bzip2 -vf > $(SDK)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),ZIP)
|
||||
PKG_SUFFIX = .zip
|
||||
MAKE_PACKAGE = $(ZIP) -r9 $(PACKAGE) $(MOZ_PKG_APPNAME)
|
||||
MAKE_SDK = $(ZIP) -r9 $(SDK) $(SDK_DIR)
|
||||
MAKE_SDK = $(ZIP) -r9 $(SDK) $(MOZ_PKG_APPNAME)-$(SDK_DIR)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),RPM)
|
||||
PKG_SUFFIX = .rpm
|
||||
|
@ -133,7 +134,10 @@ PLATFORM_EXCLUDE_LIST = ! -name "*.ico"
|
|||
endif
|
||||
|
||||
$(SDK):
|
||||
cd $(DIST); if [ -d $(SDK_DIR) ]; then $(MAKE_SDK); fi
|
||||
@rm -rf $(DIST)/$(MOZ_PKG_APPNAME)-$(SDK_DIR) $@
|
||||
@mkdir $(DIST)/$(MOZ_PKG_APPNAME)-$(SDK_DIR)
|
||||
@cd $(DIST)/$(SDK_DIR) && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME)-$(SDK_DIR); tar -xf -)
|
||||
cd $(DIST) && $(MAKE_SDK)
|
||||
|
||||
$(PACKAGE): $(MOZILLA_BIN)
|
||||
@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $@ $(EXCLUDE_LIST)
|
||||
|
|
Загрузка…
Ссылка в новой задаче