From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Sam James <sam@gentoo.org>,
Eli Schwartz <eschwartz@gentoo.org>,
Thorsten Glaser <tg@debian.org>,
Peter Seiderer <ps.report@gmx.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH v2 2/5] gitweb: fix generation of "gitweb.js"
Date: Mon, 31 Mar 2025 10:33:08 +0200 [thread overview]
Message-ID: <20250331-b4-pks-collect-build-fixes-v2-2-6b06136808f3@pks.im> (raw)
In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im>
In 19d8fe7da65 (Makefile: extract script to generate gitweb.js,
2024-12-06) we have extracted the logic to build "gitweb.js" into a
separate script. As part of that the rules that builds the script
has gained a new dependency on that script.
This refactoring is broken though because we use "$^" to determine
the set of JavaScript files that need to be concatenated, and this
implicit variable now also contains the build script itself. As a
result, the build script ends up ni the generated "gitweb.js" file,
which is wrong.
Fix the issue by filtering out non-JavaScript files.
Based-on-patch-by: Thorsten Glaser <tg@debian.org>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
gitweb/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitweb/Makefile b/gitweb/Makefile
index d5748e93594..26a683d4421 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -118,7 +118,7 @@ $(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)gitweb.perl
$(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh
$(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES))
$(QUIET_GEN)$(RM) $@ $@+ && \
- $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $^ && \
+ $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $(filter %.js,$^) && \
mv $@+ $@
### Installation rules
--
2.49.0.604.gff1f9ca942.dirty
next prev parent reply other threads:[~2025-03-31 8:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-28 8:38 [PATCH 0/4] Collection of build fixes Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 1/4] meson: fix handling of '-Dcurl=auto' Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 2/4] gitweb: fix generation of "gitweb.js" Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 3/4] meson: require Perl when building docs Patrick Steinhardt
2025-03-29 17:56 ` Junio C Hamano
2025-03-31 5:59 ` Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 4/4] meson: respect 'tests' build option in contrib Patrick Steinhardt
2025-03-28 18:25 ` Sam James
2025-03-31 8:33 ` [PATCH v2 0/5] Collection of build fixes Patrick Steinhardt
2025-03-31 8:33 ` [PATCH v2 1/5] meson: fix handling of '-Dcurl=auto' Patrick Steinhardt
2025-04-03 8:24 ` Karthik Nayak
2025-03-31 8:33 ` Patrick Steinhardt [this message]
2025-04-01 16:30 ` [PATCH v2 2/5] gitweb: fix generation of "gitweb.js" Johannes Schindelin
2025-04-02 6:40 ` Patrick Steinhardt
2025-04-01 16:30 ` Toon Claes
2025-03-31 8:33 ` [PATCH v2 3/5] meson: respect 'tests' build option in contrib Patrick Steinhardt
2025-04-01 16:31 ` Johannes Schindelin
2025-03-31 8:33 ` [PATCH v2 4/5] meson: distinguish build and target host binaries Patrick Steinhardt
2025-04-03 8:38 ` Karthik Nayak
2025-03-31 8:33 ` [PATCH v2 5/5] ci: use Visual Studio for win+meson job on GitHub Workflows Patrick Steinhardt
2025-04-01 16:41 ` [PATCH v2 0/5] Collection of build fixes Johannes Schindelin
2025-04-03 8:39 ` Karthik Nayak
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250331-b4-pks-collect-build-fixes-v2-2-6b06136808f3@pks.im \
--to=ps@pks.im \
--cc=Johannes.Schindelin@gmx.de \
--cc=eschwartz@gentoo.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps.report@gmx.net \
--cc=sam@gentoo.org \
--cc=tg@debian.org \
/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.
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 NNTP newsgroup(s).