undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/dist-tarball-tweak'

Browse Source 
Allow maintainers to tweak $(TAR) invocations done while making
distribution tarballs.

* jc/dist-tarball-tweak:
  Makefile: allow extra tweaking of distribution tarball
This commit is contained in:
Junio C Hamano 2020-09-18 17:58:05 -07:00
commit 52bcf6e181
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -3041,6 +3041,9 @@ quick-install-html:
### Maintainer's dist rules ### Maintainer's dist rules
# Allow tweaking to hide local environment effects, like perm bits.
# With GNU tar, "--mode=u+rwX,og+rX,og-w" would be a good idea, for example.
TAR_DIST_EXTRA_OPTS =
GIT_TARNAME = git-$(GIT_VERSION) GIT_TARNAME = git-$(GIT_VERSION)
dist: git-archive$(X) configure dist: git-archive$(X) configure
./git-archive --format=tar \ ./git-archive --format=tar \
@ -3049,7 +3052,7 @@ dist: git-archive$(X) configure
@cp configure $(GIT_TARNAME) @cp configure $(GIT_TARNAME)
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version @echo $(GIT_VERSION) > $(GIT_TARNAME)/version
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
$(TAR) rf $(GIT_TARNAME).tar \ $(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \
$(GIT_TARNAME)/configure \ $(GIT_TARNAME)/configure \
$(GIT_TARNAME)/version \ $(GIT_TARNAME)/version \
$(GIT_TARNAME)/git-gui/version $(GIT_TARNAME)/git-gui/version
@ -3063,7 +3066,7 @@ ifdef DC_SHA1_SUBMODULE
$(GIT_TARNAME)/sha1collisiondetection/lib/ $(GIT_TARNAME)/sha1collisiondetection/lib/
@cp sha1collisiondetection/lib/ubc_check.[ch] \ @cp sha1collisiondetection/lib/ubc_check.[ch] \
$(GIT_TARNAME)/sha1collisiondetection/lib/ $(GIT_TARNAME)/sha1collisiondetection/lib/
$(TAR) rf $(GIT_TARNAME).tar \ $(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \
$(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \ $(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \
$(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \ $(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \
$(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch] $(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch]
@ -3097,7 +3100,7 @@ dist-doc:
$(RM) -r .doc-tmp-dir $(RM) -r .doc-tmp-dir
mkdir .doc-tmp-dir mkdir .doc-tmp-dir
$(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc $(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar . cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar $(TAR_DIST_EXTRA_OPTS) .
gzip -n -9 -f $(htmldocs).tar gzip -n -9 -f $(htmldocs).tar
: :
$(RM) -r .doc-tmp-dir $(RM) -r .doc-tmp-dir
@ -3107,7 +3110,7 @@ dist-doc:
man5dir=../.doc-tmp-dir/man5 \ man5dir=../.doc-tmp-dir/man5 \
man7dir=../.doc-tmp-dir/man7 \ man7dir=../.doc-tmp-dir/man7 \
install install
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar . cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar $(TAR_DIST_EXTRA_OPTS) .
gzip -n -9 -f $(manpages).tar gzip -n -9 -f $(manpages).tar
$(RM) -r .doc-tmp-dir $(RM) -r .doc-tmp-dir