Re: [PATCH 7/8] Makefile: don't delete dist tarballs directly by name
- From
Ramsay Jones <ramsay@ramsayjones.plus.com>
- Date
- Nov 6, 2020, 02:39 UTC
- Message-ID
- <ec59a5d8-26fc-988e-4458-fd2cd421f9d5@ramsayjones.plus.com>
- In-Reply-To
- <xmqqa6vvgs9y.fsf@gitster.c.googlers.com>
On 06/11/2020 01:58, Junio C Hamano wrote:
Show 9 quoted lines
> Ramsay Jones <ramsay@ramsayjones.plus.com> writes: > >> I did have a patch #9 that moved the removal of the tarballs from >> the 'clean' target to the 'distclean' target (that is move the new >> 'iterate over the dist-tars file' code). However, I wasn't convinced >> that it was a better place for it. > > I am not either, other than "things created by 'make distX' cleaned > by 'make distclean'---that sounds consistent" ;-).
:-D
Show 9 quoted lines
> >> Also, just moving the new removal code would not alter the concerns >> about it that you express above. So, we need to address that either >> way. > > "make distclean" can still depend on GIT-VERSION-FILE and your daily > cleaning needs can use "make clean" that cleans only the files that > can be cleaned without knowing what GIT_VERSION is, no? That way, > we do not have to use dist-tars file at all, no?
Hmm, so rather than dropping the last two patches, you are suggesting replacing this patch with a patch that moves:
$(RM) $(GIT_TARNAME).tar.gz $(RM) $(htmldocs).tar.gz $(manpages).tar.gz
to the 'distclean' target?
Well, that would address your concerns, but I was hoping to fix the 'your current branch has to be the same as the one you created the tarballs on' for the '(dist)clean' target to actually remove those files issue.
As I said in the commit message, my preferred solution was to simply put them in a 'dist-tars/' directory. Then you would only delete the files actually generated by the 'dist' and 'dist-doc' targets, and you could easily remove that directory (be it in 'clean' or 'distclean' or 'clean-dist-tars', ...).
Hmm, I wonder if my concerns about that solution are overblown? dunno.
ATB, Ramsay Jones