From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: GIT Mailing-list <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 4/8] git-gui/Makefile: conditionally include GIT-VERSION-FILE
Date: Thu, 5 Nov 2020 21:06:22 +0000 [thread overview]
Message-ID: <f4e1a949-f543-7d2e-6cf3-d09a42d9c9f4@ramsayjones.plus.com> (raw)
The 'clean' target is still noticeably slow on cygwin, despite the
improvements made by previous patches. For example, the second
invocation of 'make clean' below:
$ make clean >/dev/null 2>&1
$ make clean
...
make -C git-gui clean
make[1]: Entering directory '/home/ramsay/git/git-gui'
GITGUI_VERSION = 0.21.0.78.g38c2a
rm -rf git-gui lib/tclIndex po/*.msg
...
$
has been timed at 8.430s on my laptop (on old core i5-4200M @ 2.50GHz,
8GB RAM, 1TB HDD).
Notice that the Makefile, as part of processing the 'clean' target, is
updating the 'git-gui/GIT-VERSION-FILE' (not to be confused with the
similarly named file at the root directory of the repository). This is
to ensure that the $(GITGUI_VERSION) make variable is set, once that file
had been included. (The Makefile target uses the 'git-gui/GIT-VERSION-GEN'
script to generate that file, which should also not be confused with the
similarly named script at the root). However, the 'clean' target does not
use the $(GITGUI_VERSION) variable, so this is wasted effort.
In order to eliminate such wasted effort, use the value of the internal
$(MAKECMDGOALS) variable to only '-include GIT-VERSION-FILE' when the
target is not 'clean'. (This drops the time down to 6.454s, on my laptop,
giving an improvement of 23.44%).
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
git-gui/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/git-gui/Makefile b/git-gui/Makefile
index f10caedaa7..56c85a85c1 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -9,7 +9,9 @@ all::
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
+ifneq ($(MAKECMDGOALS),clean)
-include GIT-VERSION-FILE
+endif
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
--
2.29.0
reply other threads:[~2020-11-05 21:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f4e1a949-f543-7d2e-6cf3-d09a42d9c9f4@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).