mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Makefile: use git-archive --add-file
Add untracked files for the dist target directly using git archive instead of calling tar cr to append them. This reduces the dependency on external tools and gives the untracked files the same access times and user information as tracked ones, integrating them seamlessly. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2947a7930d
commit
df368fae35
41
Makefile
41
Makefile
|
@ -3045,32 +3045,29 @@ quick-install-html:
|
|||
# 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_ARCHIVE_EXTRA_FILES = \
|
||||
--prefix=$(GIT_TARNAME)/ \
|
||||
--add-file=configure \
|
||||
--add-file=$(GIT_TARNAME)/version \
|
||||
--prefix=$(GIT_TARNAME)/git-gui/ \
|
||||
--add-file=$(GIT_TARNAME)/git-gui/version
|
||||
ifdef DC_SHA1_SUBMODULE
|
||||
GIT_ARCHIVE_EXTRA_FILES += \
|
||||
--prefix=$(GIT_TARNAME)/sha1collisiondetection/ \
|
||||
--add-file=sha1collisiondetection/LICENSE.txt \
|
||||
--prefix=$(GIT_TARNAME)/sha1collisiondetection/lib/ \
|
||||
--add-file=sha1collisiondetection/lib/sha1.c \
|
||||
--add-file=sha1collisiondetection/lib/sha1.h \
|
||||
--add-file=sha1collisiondetection/lib/ubc_check.c \
|
||||
--add-file=sha1collisiondetection/lib/ubc_check.h
|
||||
endif
|
||||
dist: git-archive$(X) configure
|
||||
./git-archive --format=tar \
|
||||
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
|
||||
@mkdir -p $(GIT_TARNAME)
|
||||
@cp configure $(GIT_TARNAME)
|
||||
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
||||
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
|
||||
$(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \
|
||||
$(GIT_TARNAME)/configure \
|
||||
$(GIT_TARNAME)/version \
|
||||
$(GIT_TARNAME)/git-gui/version
|
||||
ifdef DC_SHA1_SUBMODULE
|
||||
@mkdir -p $(GIT_TARNAME)/sha1collisiondetection/lib
|
||||
@cp sha1collisiondetection/LICENSE.txt \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/
|
||||
@cp sha1collisiondetection/LICENSE.txt \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/
|
||||
@cp sha1collisiondetection/lib/sha1.[ch] \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/lib/
|
||||
@cp sha1collisiondetection/lib/ubc_check.[ch] \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/lib/
|
||||
$(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \
|
||||
$(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch]
|
||||
endif
|
||||
./git-archive --format=tar \
|
||||
$(GIT_ARCHIVE_EXTRA_FILES) \
|
||||
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
|
||||
@$(RM) -r $(GIT_TARNAME)
|
||||
gzip -f -9 $(GIT_TARNAME).tar
|
||||
|
||||
|
|
Loading…
Reference in a new issue