Skip to content

Commit 45912cf

Browse files
committed
make-file-list: do not include unneeded DLLs
The newly improved `check-for-missing-dlls.sh` script learned to point out which `.dll` files can be skipped, and now we do that, saving some bandwidth and disk space. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 65736c7 commit 45912cf

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

make-file-list.sh

+13-11
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
146146
-e '^/mingw../itcl/' \
147147
-e '^/mingw../t\(cl\|k\)[^/]*/\(demos\|msgs\|encoding\|tzdata\)/' \
148148
-e '^/mingw../bin/\(autopoint\|[a-z]*-config\)$' \
149-
-e '^/mingw../bin/lib\(asprintf\|gettext\|gnutls\|gnutlsxx\|gmpxx\|pcre[013-9a-oq-z]\|quadmath\|stdc++\)[^/]*\.dll$' \
149+
-e '^/mingw../bin/lib\(asprintf\|brotlienc\|gettext\|gnutls\|gnutlsxx\|gmpxx\|pcre[013-9a-oq-z]\|pcre2-[13p]\|quadmath\|stdc++\|zip\)[^/]*\.dll$' \
150+
-e '^/mingw../bin/lib\(atomic\|charset\|ffi\|gomp\|systre\|tasn1\)-[0-9]*\.dll$' \
150151
-e '^/mingw../bin/\(asn1\|gnutls\|idn\|mini\|msg\|nettle\|ngettext\|ocsp\|pcre\|rtmp\|xgettext\)[^/]*\.exe$' \
151152
-e '^/mingw../bin/recode-sr-latin.exe$' \
152153
-e '^/mingw../bin/\(cert\|p11\|psk\|srp\)tool.exe$' \
153-
-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \
154154
-e '^/mingw../.*/git-\(remote-testsvn\|shell\)\.exe$' \
155155
-e '^/mingw../.*/git-cvsserver.*$' \
156156
-e '^/mingw../.*/gitweb/' \
157-
-e '^/mingw../lib/tdbc' \
157+
-e '^/mingw../lib/\(dde\|itcl\|sqlite\|tdbc\)' \
158158
-e '^/mingw../libexec/git-core/git-archimport$' \
159159
-e '^/mingw../share/doc/git-doc/git-archimport' \
160160
-e '^/mingw../libexec/git-core/git-cvsimport$' \
@@ -163,11 +163,16 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
163163
-e '^/mingw../share/doc/git-doc/git-cvsimport' \
164164
-e '^/mingw../share/git\(k\|-gui\)/lib/msgs/' \
165165
-e '^/mingw../share/nghttp2/' \
166-
-e '^/usr/bin/msys-\(db\|icu\|gfortran\|stdc++\|quadmath\)[^/]*\.dll$' \
167-
-e '^/usr/bin/msys-\(gmpxx\|gnutlsxx\|xml2\|xslt\|exslt\)-.*\.dll$' \
166+
-e '^/usr/bin/msys-\(db\|curl\|icu\|gfortran\|stdc++\|quadmath\)[^/]*\.dll$' \
167+
-e '^/usr/bin/msys-\(fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|lzma\|xml2\|xslt\|exslt\)-.*\.dll$' \
168+
-e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \
169+
-e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|pcre2-8\|ssh2\)-.*\.dll$' \
170+
-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \
171+
-e '^/usr/bin/msys-\(formw6\|menuw6\|panelw6\)\.dll$' \
168172
-e '^/usr/bin/msys-svn_swig_\(py\|ruby\)-.*\.dll$' \
169173
-e '^/usr/bin/\(dumper\|sasl.*\)\.exe$' \
170174
-e '^/usr/lib/gio/' -e '^/usr/lib/sasl2/msys-sasldb-.*\.dll$' \
175+
-e '^/usr/lib/\(itcl\|tdbc\|pkcs11\|thread\)' \
171176
-e '^/usr/share.*/magic$' \
172177
-e '^/usr/share/perl5/core_perl/Unicode/' \
173178
-e '^/usr/share/perl5/core_perl/pods/' \
@@ -200,10 +205,9 @@ else
200205
-e '^/mingw../bin/.*-\(inflate\|deflate\)hd\.exe$' \
201206
-e '^/mingw../bin/\(gettext\.sh\|gettextize\)$' \
202207
-e '^/mingw../bin/\(gitk\|git-upload-archive\.exe\)$' \
203-
-e '^/mingw../bin/lib\(atomic\|charset\)-.*\.dll$' \
204208
-e '^/mingw../bin/libgcc_s_seh-.*\.dll$' \
205209
-e '^/mingw../bin/libjemalloc\.dll$' \
206-
-e '^/mingw../bin/lib\(gomp\|jansson\|minizip\)-.*\.dll$' \
210+
-e '^/mingw../bin/lib\(gmp\|gomp\|jansson\|metalink\|minizip\)-.*\.dll$' \
207211
-e '^/mingw../bin/libvtv.*\.dll$' \
208212
-e '^/mingw../bin/libpcreposix.*\.dll$' \
209213
-e '^/mingw../bin/\(.*\.def\|update-ca-trust\)$' \
@@ -252,8 +256,7 @@ else
252256
-e '^/usr/bin/\(stty\|sum\|sync\|tac\|tee\|timeout\)\.exe$' \
253257
-e '^/usr/bin/\(truncate\|tsort\|tty\|tzset\|umount\)\.exe$' \
254258
-e '^/usr/bin/\(unexpand\|unlink\|users\|vdir\|who.*\)\.exe$' \
255-
-e '^/usr/bin/msys-\(atomic\|charset\|cilkrts\)-.*\.dll$' \
256-
-e '^/usr/bin/msys-\(hdb\|kadm5\|kafs\|kdc\|otp\|sl\).*\.dll$' \
259+
-e '^/usr/bin/msys-\(cilkrts\|kafs\|ssl\)-.*\.dll$' \
257260
-e '^/usr/bin/msys-sqlite3[a-z].*\.dll$' \
258261
-e '^/usr/bin/msys-\(gomp.*\|vtv.*\)-.*\.dll$' \
259262
-e '^/usr/lib/\(awk\|coreutils\|gawk\|openssl\|ssh\)/' \
@@ -262,8 +265,7 @@ else
262265
-e '^/usr/ssl/misc/' \
263266
-e '^/usr/bin/\(captoinfo\|clear\|infocmp\|infotocap\)\.exe$' \
264267
-e '^/usr/bin/\(reset\|tabs\|tic\|toe\|tput\|tset\)\.exe$' \
265-
-e '^/usr/bin/msys-\(formw6\|menuw6\)\.dll$' \
266-
-e '^/usr/bin/msys-\(panelw6\|ticw6\)\.dll$' \
268+
-e '^/usr/bin/msys-ticw6\.dll$' \
267269
-e '^/usr/\(lib\|share\)/terminfo/' -e '^/usr/share/tabset/' \
268270
-e "^\\($(echo $EXTRA_FILE_EXCLUDES |
269271
sed 's/ /\\|/g')\\)\$"

0 commit comments

Comments
 (0)