mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Makefile: don't use a versioned temp distribution directory
The 'dist' target uses a versioned temp directory, $(GIT_TARNAME), into which it copies various files added to the distribution tarball. Should it be necessary to remove this directory in the 'clean' target, since the name depends on $(GIT_VERSION), the current HEAD must be positioned on the same commit as when 'make dist' was issued. Otherwise, the target will fail to remove that directory. Create an '.dist-tmp-dir' directory and copy the various files into this now un-versioned directory while creating the distribution tarball. Change the 'clean' target to remove the '.dist-tmp-dir' directory, instead of the version dependent $(GIT_TARNAME) directory. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
98836a8a12
commit
c5312033dd
15
Makefile
15
Makefile
|
@ -3061,9 +3061,9 @@ GIT_TARNAME = git-$(GIT_VERSION)
|
|||
GIT_ARCHIVE_EXTRA_FILES = \
|
||||
--prefix=$(GIT_TARNAME)/ \
|
||||
--add-file=configure \
|
||||
--add-file=$(GIT_TARNAME)/version \
|
||||
--add-file=.dist-tmp-dir/version \
|
||||
--prefix=$(GIT_TARNAME)/git-gui/ \
|
||||
--add-file=$(GIT_TARNAME)/git-gui/version
|
||||
--add-file=.dist-tmp-dir/git-gui/version
|
||||
ifdef DC_SHA1_SUBMODULE
|
||||
GIT_ARCHIVE_EXTRA_FILES += \
|
||||
--prefix=$(GIT_TARNAME)/sha1collisiondetection/ \
|
||||
|
@ -3075,13 +3075,14 @@ GIT_ARCHIVE_EXTRA_FILES += \
|
|||
--add-file=sha1collisiondetection/lib/ubc_check.h
|
||||
endif
|
||||
dist: git-archive$(X) configure
|
||||
@mkdir -p $(GIT_TARNAME)
|
||||
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
||||
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
|
||||
@$(RM) -r .dist-tmp-dir
|
||||
@mkdir .dist-tmp-dir
|
||||
@echo $(GIT_VERSION) > .dist-tmp-dir/version
|
||||
@$(MAKE) -C git-gui TARDIR=../.dist-tmp-dir/git-gui dist-version
|
||||
./git-archive --format=tar \
|
||||
$(GIT_ARCHIVE_EXTRA_FILES) \
|
||||
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
|
||||
@$(RM) -r $(GIT_TARNAME)
|
||||
@$(RM) -r .dist-tmp-dir
|
||||
gzip -f -9 $(GIT_TARNAME).tar
|
||||
|
||||
rpm::
|
||||
|
@ -3158,7 +3159,7 @@ clean: profile-clean coverage-clean cocciclean
|
|||
$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
|
||||
$(RM) -r po/build/
|
||||
$(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope*
|
||||
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
|
||||
$(RM) -r .dist-tmp-dir .doc-tmp-dir
|
||||
$(RM) $(GIT_TARNAME).tar.gz
|
||||
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
|
||||
$(MAKE) -C Documentation/ clean
|
||||
|
|
Loading…
Reference in a new issue