Skip to content

Commit 9c13621

Browse files
dschodscho
authored
Support UCRT64 in check-for-missing-dlls (#716)
I noticed over in git-for-windows/git-sdk-64#117 that the `check-for-missing-dlls` job failed. That's because the script needed some adjustment. (The `make-file-list.sh` script, to be precise.)
2 parents 5031c64 + 965f854 commit 9c13621

2 files changed

Lines changed: 74 additions & 67 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,12 @@ jobs:
365365
msystem: MINGW64
366366
sdk-repo: git-sdk-64
367367
runner: windows-latest
368+
- name: ucrt64
369+
mingw-prefix: ucrt64
370+
msystem: UCRT64
371+
sdk-repo: git-sdk-64
372+
sdk-branch: ucrt64
373+
runner: windows-latest
368374
- name: aarch64
369375
mingw-prefix: clangarm64
370376
msystem: CLANGARM64
@@ -376,7 +382,8 @@ jobs:
376382
- name: initialize bare SDK clone
377383
shell: bash
378384
run: |
379-
git clone --bare --depth=1 --single-branch --branch=main --filter=blob:none \
385+
git clone --bare --depth=1 --single-branch \
386+
--branch=${{ matrix.arch.sdk-branch || 'main' }} --filter=blob:none \
380387
https://github.com/git-for-windows/${{ matrix.arch.sdk-repo }} .sdk
381388
- name: build build-installers-${{ matrix.arch.name }} artifact
382389
shell: bash

‎make-file-list.sh‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pacman_list () {
130130
sed 's/[<>=].*//' |
131131
grep -v "^\\($(echo $PACKAGE_EXCLUDES | sed \
132132
-e 's/ /\\|/g' \
133-
-e 's/mingw-w64-/&\\(i686\\|x86_64\\|clang-aarch64\\)-/g')\\)\$" |
133+
-e 's/mingw-w64-/&\\(i686\\|x86_64\\|ucrt-x86_64\\|clang-aarch64\\)-/g')\\)\$" |
134134
sort |
135135
uniq) &&
136136

@@ -229,49 +229,49 @@ pacman_list $packages "$@" |
229229

230230
grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
231231
-e '/man/' -e '/pkgconfig/' -e '/emacs/' \
232-
-e '^/usr/lib/python' -e '^/usr/lib/ruby' -e '^/\(mingw\|clang\)[^/]*/lib/python' \
232+
-e '^/usr/lib/python' -e '^/usr/lib/ruby' -e "^/$MSYSTEM_LOWER/lib/python" \
233233
-e '^/usr/share/subversion' \
234-
-e '^/etc/skel/' -e '^/\(mingw\|clang\)[^/]*/etc/skel/' \
234+
-e '^/etc/skel/' -e "^/$MSYSTEM_LOWER/etc/skel/" \
235235
-e '^/etc/sshd_config' \
236236
-e '^/usr/bin/svn' \
237237
-e '^/usr/bin/xml.*exe$' \
238238
-e '^/usr/bin/xslt.*$' \
239239
-e '^/usr/bin/b*zmore$' \
240-
-e '^/\(mingw\|clang\)[^/]*/bin/.*zstd\.exe$' \
241-
-e '^/\(mingw\|clang\)[^/]*/share/doc/openssl/' \
242-
-e '^/\(mingw\|clang\)[^/]*/share/doc/gettext/' \
243-
-e '^/\(mingw\|clang\)[^/]*/share/doc/lib' \
244-
-e '^/\(mingw\|clang\)[^/]*/share/doc/pcre2\?/' \
245-
-e '^/\(mingw\|clang\)[^/]*/share/doc/git-doc/.*\.txt$' \
246-
-e '^/\(mingw\|clang\)[^/]*/share/doc/zstd/' \
247-
-e '^/\(mingw\|clang\)[^/]*/lib/gettext/' -e '^/\(mingw\|clang\)[^/]*/share/gettext/' \
248-
-e '^/usr/include/' -e '^/\(mingw\|clang\)[^/]*/include/' \
240+
-e "^/$MSYSTEM_LOWER/bin/.*zstd\\.exe$" \
241+
-e "^/$MSYSTEM_LOWER/share/doc/openssl/" \
242+
-e "^/$MSYSTEM_LOWER/share/doc/gettext/" \
243+
-e "^/$MSYSTEM_LOWER/share/doc/lib" \
244+
-e "^/$MSYSTEM_LOWER/share/doc/pcre2\\?/" \
245+
-e "^/$MSYSTEM_LOWER/share/doc/git-doc/.*\\.txt$" \
246+
-e "^/$MSYSTEM_LOWER/share/doc/zstd/" \
247+
-e "^/$MSYSTEM_LOWER/lib/gettext/" -e "^/$MSYSTEM_LOWER/share/gettext/" \
248+
-e '^/usr/include/' -e "^/$MSYSTEM_LOWER/include/" \
249249
-e '^/usr/share/doc/' \
250-
-e '^/usr/share/info/' -e '^/\(mingw\|clang\)[^/]*/share/info/' \
251-
-e '^/\(mingw\|clang\)[^/]*/share/git-doc/technical/' \
252-
-e '^/\(mingw\|clang\)[^/]*/lib/cmake/' \
253-
-e '^/\(mingw\|clang\)[^/]*/itcl/' \
254-
-e '^/\(mingw\|clang\)[^/]*/t\(cl\|k\)[^/]*/\(demos\|msgs\|encoding\|tzdata\)/' \
255-
-e '^/\(mingw\|clang\)[^/]*/bin/\(autopoint\|[a-z]*-config\)$' \
256-
-e '^/\(mingw\|clang\)[^/]*/bin/lib\(asprintf\|gettext\|gnutls\|gnutlsxx\|gmpxx\|pcre[013-9a-oq-z]\|pcre2-[13]\|quadmath\|stdc++\|unwind\|zip\)[^/]*\.dll$' \
257-
-e '^/\(mingw\|clang\)[^/]*/bin/lib\(atomic\|charset\|gomp\|systre'"$EXCLUDE_MINGW_W64_DLLS"'\)-[0-9]*\.dll$' \
258-
-e '^/\(mingw\|clang\)[^/]*/bin/\(asn1\|gnutls\|idn\|mini\|msg\|nettle\|ngettext\|ocsp\|pcre\|rtmp\|xgettext\|zip\)[^/]*\.exe$' \
259-
-e '^/\(mingw\|clang\)[^/]*/bin/recode-sr-latin.exe$' \
260-
-e '^/\(mingw\|clang\)[^/]*/bin/\(cert\|p11\|psk\|srp\)tool.exe$' \
261-
-e '^/\(mingw\|clang\)[^/]*/.*/git-\(remote-testsvn\|shell\)\.exe$' \
262-
-e '^/\(mingw\|clang\)[^/]*/.*/git-cvsserver.*$' \
263-
-e '^/\(mingw\|clang\)[^/]*/.*/gitweb/' \
264-
-e '^/\(mingw\|clang\)[^/]*/.*/git-instaweb' \
265-
-e '^/\(mingw\|clang\)[^/]*/lib/\(dde\|itcl\|sqlite\|tdbc\)' \
266-
-e '^/\(mingw\|clang\)[^/]*/libexec/git-core/git-archimport$' \
267-
-e '^/\(mingw\|clang\)[^/]*/share/doc/git-doc/git-archimport' \
268-
-e '^/\(mingw\|clang\)[^/]*/libexec/git-core/git-cvsimport$' \
269-
-e '^/\(mingw\|clang\)[^/]*/share/doc/git-doc/git-cvsexport' \
270-
-e '^/\(mingw\|clang\)[^/]*/libexec/git-core/git-cvsexport' \
271-
-e '^/\(mingw\|clang\)[^/]*/share/doc/git-doc/git-cvsimport' \
250+
-e '^/usr/share/info/' -e "^/$MSYSTEM_LOWER/share/info/" \
251+
-e "^/$MSYSTEM_LOWER/share/git-doc/technical/" \
252+
-e "^/$MSYSTEM_LOWER/lib/cmake/" \
253+
-e "^/$MSYSTEM_LOWER/itcl/" \
254+
-e "^/$MSYSTEM_LOWER/t\\(cl\\|k\\)[^/]*/\\(demos\\|msgs\\|encoding\\|tzdata\\)/" \
255+
-e "^/$MSYSTEM_LOWER/bin/\\(autopoint\\|[a-z]*-config\\)$" \
256+
-e "^/$MSYSTEM_LOWER/bin/lib\\(asprintf\\|gettext\\|gnutls\\|gnutlsxx\\|gmpxx\\|pcre[013-9a-oq-z]\\|pcre2-[13]\\|quadmath\\|stdc++\\|unwind\\|zip\\)[^/]*\\.dll$" \
257+
-e "^/$MSYSTEM_LOWER/bin/lib\\(atomic\\|charset\\|gomp\\|systre$EXCLUDE_MINGW_W64_DLLS\\)-[0-9]*\\.dll$" \
258+
-e "^/$MSYSTEM_LOWER/bin/\\(asn1\\|gnutls\\|idn\\|mini\\|msg\\|nettle\\|ngettext\\|ocsp\\|pcre\\|rtmp\\|xgettext\\|zip\\)[^/]*\\.exe$" \
259+
-e "^/$MSYSTEM_LOWER/bin/recode-sr-latin.exe$" \
260+
-e "^/$MSYSTEM_LOWER/bin/\\(cert\\|p11\\|psk\\|srp\\)tool.exe$" \
261+
-e "^/$MSYSTEM_LOWER/.*/git-\\(remote-testsvn\\|shell\\)\\.exe$" \
262+
-e "^/$MSYSTEM_LOWER/.*/git-cvsserver.*$" \
263+
-e "^/$MSYSTEM_LOWER/.*/gitweb/" \
264+
-e "^/$MSYSTEM_LOWER/.*/git-instaweb" \
265+
-e "^/$MSYSTEM_LOWER/lib/\\(dde\\|itcl\\|sqlite\\|tdbc\\)" \
266+
-e "^/$MSYSTEM_LOWER/libexec/git-core/git-archimport$" \
267+
-e "^/$MSYSTEM_LOWER/share/doc/git-doc/git-archimport" \
268+
-e "^/$MSYSTEM_LOWER/libexec/git-core/git-cvsimport$" \
269+
-e "^/$MSYSTEM_LOWER/share/doc/git-doc/git-cvsexport" \
270+
-e "^/$MSYSTEM_LOWER/libexec/git-core/git-cvsexport" \
271+
-e "^/$MSYSTEM_LOWER/share/doc/git-doc/git-cvsimport" \
272272
-e "^\\($(echo $EXCLUDE_MISSING_BUILTINS | sed 's/ /\\|/g')\\)\$" \
273-
-e '^/\(mingw\|clang\)[^/]*/share/gtk-doc/' \
274-
-e '^/\(mingw\|clang\)[^/]*/share/nghttp2/' \
273+
-e "^/$MSYSTEM_LOWER/share/gtk-doc/" \
274+
-e "^/$MSYSTEM_LOWER/share/nghttp2/" \
275275
-e '^/usr/bin/msys-\(db\|curl\|icu\|gfortran\|stdc++\|quadmath\)[^/]*\.dll$' \
276276
-e '^/usr/bin/msys-\('"$I686_EXCLUDE"'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \
277277
-e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \
@@ -303,8 +303,8 @@ then
303303
cat
304304
else
305305
grep -v \
306-
-e '^/\(mingw\|clang\)[^/]*/share/locale/' \
307-
-e '^/\(mingw\|clang\)[^/]*/share/git\(k\|-gui\)/lib/msgs/' \
306+
-e "^/$MSYSTEM_LOWER/share/locale/" \
307+
-e "^/$MSYSTEM_LOWER/share/git\\(k\\|-gui\\)/lib/msgs/" \
308308
-e '^/usr/share/locale/'
309309
fi |
310310
if test -z "$MINIMAL_GIT"
@@ -315,39 +315,39 @@ else
315315
-e '^/etc/\(DIR_COLORS\|inputrc\|vimrc\)$' \
316316
-e '^/etc/profile\.d/\(aliases\|env\|git-prompt\)\.sh$' \
317317
-e '^/git-\(bash\|cmd\)\.exe$' \
318-
-e '^/\(mingw\|clang\)[^/]*/bin/\(certtool\.exe\|create-shortcut\.exe\)$' \
319-
-e '^/\(mingw\|clang\)[^/]*/bin/\(curl\.exe\|envsubst\.exe\|gettext\.exe\)$' \
320-
-e '^/\(mingw\|clang\)[^/]*/bin/.*-\(inflate\|deflate\)hd\.exe$' \
321-
-e '^/\(mingw\|clang\)[^/]*/bin/\(gettext\.sh\|gettextize\)$' \
322-
-e '^/\(mingw\|clang\)[^/]*/bin/\(gitk\|git-upload-archive\.exe\)$' \
323-
-e '^/\(mingw\|clang\)[^/]*/bin/libc++\.dll$' \
324-
-e '^/\(mingw\|clang\)[^/]*/bin/libgcc_s_seh-.*\.dll$' \
325-
-e '^/\(mingw\|clang\)[^/]*/bin/libjemalloc\.dll$' \
326-
-e '^/\(mingw\|clang\)[^/]*/bin/lib\(ffi\|gmp\|gomp\|jansson\|metalink\|minizip\|tasn1\)-.*\.dll$' \
327-
-e '^/\(mingw\|clang\)[^/]*/bin/libvtv.*\.dll$' \
328-
-e '^/\(mingw\|clang\)[^/]*/bin/libpcre\(2-\)\?posix.*\.dll$' \
329-
-e '^/\(mingw\|clang\)[^/]*/bin/\(.*\.def\|update-ca-trust\)$' \
330-
-e '^/\(mingw\|clang\)[^/]*/bin/\(openssl\|p11tool\|pkcs1-conv\)\.exe$' \
331-
-e '^/\(mingw\|clang\)[^/]*/bin/\(psktool\|recode-.*\|sexp.*\|srp.*\)\.exe$' \
332-
-e '^/\(mingw\|clang\)[^/]*/bin/\(WhoUses\|xmlwf\)\.exe$' \
333-
-e '^/\(mingw\|clang\)[^/]*/etc/pki' -e '^/\(mingw\|clang\)[^/]*/lib/p11-kit/' \
318+
-e "^/$MSYSTEM_LOWER/bin/\\(certtool\\.exe\\|create-shortcut\\.exe\\)$" \
319+
-e "^/$MSYSTEM_LOWER/bin/\\(curl\\.exe\\|envsubst\\.exe\\|gettext\\.exe\\)$" \
320+
-e "^/$MSYSTEM_LOWER/bin/.*-\\(inflate\\|deflate\\)hd\\.exe$" \
321+
-e "^/$MSYSTEM_LOWER/bin/\\(gettext\\.sh\\|gettextize\\)$" \
322+
-e "^/$MSYSTEM_LOWER/bin/\\(gitk\\|git-upload-archive\\.exe\\)$" \
323+
-e "^/$MSYSTEM_LOWER/bin/libc++\\.dll$" \
324+
-e "^/$MSYSTEM_LOWER/bin/libgcc_s_seh-.*\\.dll$" \
325+
-e "^/$MSYSTEM_LOWER/bin/libjemalloc\\.dll$" \
326+
-e "^/$MSYSTEM_LOWER/bin/lib\\(ffi\\|gmp\\|gomp\\|jansson\\|metalink\\|minizip\\|tasn1\\)-.*\\.dll$" \
327+
-e "^/$MSYSTEM_LOWER/bin/libvtv.*\\.dll$" \
328+
-e "^/$MSYSTEM_LOWER/bin/libpcre\\(2-\\)\\?posix.*\\.dll$" \
329+
-e "^/$MSYSTEM_LOWER/bin/\\(.*\\.def\\|update-ca-trust\\)$" \
330+
-e "^/$MSYSTEM_LOWER/bin/\\(openssl\\|p11tool\\|pkcs1-conv\\)\\.exe$" \
331+
-e "^/$MSYSTEM_LOWER/bin/\\(psktool\\|recode-.*\\|sexp.*\\|srp.*\\)\\.exe$" \
332+
-e "^/$MSYSTEM_LOWER/bin/\\(WhoUses\\|xmlwf\\)\\.exe$" \
333+
-e "^/$MSYSTEM_LOWER/etc/pki" -e "^/$MSYSTEM_LOWER/lib/p11-kit/" \
334334
-e '/git-\(add--interactive\|archimport\|citool\|cvs.*\)$' \
335335
-e '/git-\(gui.*\|p4\|relink\)$' \
336336
-e '/git-\(send-email\|svn\)$' \
337-
-e '/\(mingw\|clang\)[^/]*/libexec/git-core/git-\(imap-send\|daemon\)\.exe$' \
338-
-e '/\(mingw\|clang\)[^/]*/libexec/git-core/git-remote-ftp.*\.exe$' \
339-
-e '/\(mingw\|clang\)[^/]*/libexec/git-core/git-http-backend\.exe$' \
340-
-e "/\(mingw\|clang\)[^/]*/libexec/git-core/git-\\($(sed \
337+
-e "^/$MSYSTEM_LOWER/libexec/git-core/git-\\(imap-send\\|daemon\\)\\.exe$" \
338+
-e "^/$MSYSTEM_LOWER/libexec/git-core/git-remote-ftp.*\\.exe$" \
339+
-e "^/$MSYSTEM_LOWER/libexec/git-core/git-http-backend\\.exe$" \
340+
-e "/$MSYSTEM_LOWER/libexec/git-core/git-\\($(sed \
341341
-e 's/^git-//' -e 's/\.exe$//' -e 's/$/\\/' \
342342
</$MSYSTEM_LOWER/share/git/builtins.txt |
343343
tr '\n' '|')\\)\\.exe\$" \
344-
-e '^/\(mingw\|clang\)[^/]*/share/doc/nghttp2/' \
345-
-e '^/\(mingw\|clang\)[^/]*/share/gettext-' \
346-
-e '^/\(mingw\|clang\)[^/]*/share/git/\(builtins\|compat\|completion\)' \
347-
-e '^/\(mingw\|clang\)[^/]*/share/git/.*\.ico$' \
348-
-e '^/\(mingw\|clang\)[^/]*/share/git-gui/' \
349-
-e '^/\(mingw\|clang\)[^/]*/share/perl' \
350-
-e '^/\(mingw\|clang\)[^/]*/share/pki/' \
344+
-e "^/$MSYSTEM_LOWER/share/doc/nghttp2/" \
345+
-e "^/$MSYSTEM_LOWER/share/gettext-" \
346+
-e "^/$MSYSTEM_LOWER/share/git/\\(builtins\\|compat\\|completion\\)" \
347+
-e "^/$MSYSTEM_LOWER/share/git/.*\\.ico$" \
348+
-e "^/$MSYSTEM_LOWER/share/git-gui/" \
349+
-e "^/$MSYSTEM_LOWER/share/perl" \
350+
-e "^/$MSYSTEM_LOWER/share/pki/" \
351351
-e '/zsh/' \
352352
-e '^/usr/bin/\(astextplain\|bashbug\|c_rehash\|egrep\)$' \
353353
-e '^/usr/bin/\(fgrep\|findssl\.sh\|igawk\|notepad\)$' \
@@ -448,7 +448,7 @@ fi
448448

449449
EXTRA_DLL_FILES=
450450
case $MSYSTEM_LOWER in
451-
mingw*)
451+
mingw*|ucrt64)
452452
PDFTOTEXT_FILES="$MSYSTEM_LOWER/bin/pdftotext.exe
453453
$MSYSTEM_LOWER/bin/libstdc++-6.dll"
454454
if test i686 = "$ARCH" &&

0 commit comments

Comments
 (0)