Skip to content

Commit fb93dd3

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
compat/vcbuild: possibly reuse Git for Windows' SDK's NuGet
In Git for Windows' SDK, there is already a script to package Git for Windows as a NuGet package, downloading nuget.exe if needed. Let's just fall back to using that executable (if it is there) if nuget.exe was not found in the PATH. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b1e3f95 commit fb93dd3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

compat/vcbuild/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ INST_LIB=$(INST)/lib
77
INST_BIN=$(INST)/bin
88

99
PKGDIR=GEN.PKGS
10+
NUGET ?= nuget.exe
11+
ifneq ($(shell $(NUGET) help 2>/dev/null; echo $$?),0)
12+
NUGET := /usr/src/build-extra/nuget/nuget.exe
13+
endif
1014

1115
##################################################################
1216
all: unpack expat libssh libssh_redist curl curl_redist openssl zlib \
1317
libiconv libiconv_redist
1418

1519
unpack:
1620
[ -d $(PKGDIR) ] || mkdir $(PKGDIR)
17-
nuget.exe restore packages.config -ConfigFile nuget.config \
21+
"$(NUGET)" restore packages.config -ConfigFile nuget.config \
1822
-NonInteractive -OutputDirectory $(PKGDIR)
1923

2024
insdir:

0 commit comments

Comments
 (0)