]> git.ipfire.org Git - thirdparty/git.git/commitdiff
artifacts-tar: when including `.dll` files, don't forget the unit-tests
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 25 Sep 2023 11:20:33 +0000 (11:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Nov 2023 23:16:27 +0000 (08:16 +0900)
As of recent, Git also builds executables in `t/unit-tests/`. For
technical reasons, when building with CMake and Visual C, the
dependencies (".dll files") need to be copied there, too, otherwise
running the executable will fail "due to missing dependencies".

The CMake definition already contains the directives to copy those
`.dll` files, but we also need to adjust the `artifacts-tar` rule in
the `Makefile` accordingly to let the `vs-test` job in the CI runs
pass successfully.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile

index 18c13f06c03a2c6aec372737e95fe9c0a7343c58..e15c34e506a2ae175b646d0266c744e00d2fa744 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3597,7 +3597,7 @@ rpm::
 .PHONY: rpm
 
 ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),)
-OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll)
+OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll t/unit-tests/bin/*.dll)
 endif
 
 artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \