tidy-up: `.gitignore` lines mostly

- `.gitignore`: delete, dedupe and move rules upwards.
  Ref: 6389ba87b8e5cf74b70c54beab3498dfc773364e #13311
- `.gitignore`: fix generated test sources.
  Follow-up to 71cf0d1fca9e1f53524e1545ef0c08d174458d80 #14772
- `.gitignore`: replace exe listings with a wildcard.
- lib: move `setup-*.h` from `EXTRA_DIST` to `CURL_HFILES`.
- `makedebug.bat`: uppercase an argument to match docs.
- GHA/non-native: delete stray env.
  Follow-up to 12a6de2f660dd692cce93cb65ce6e3ec126bb531 #16043
- sort source lists.

Closes #16093

diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml
index 319dd6ec9806e96a408bdb229055350752395243..92889affa6b72bb44acfb603663aaba352358a72 100644 (file)
--- a/.github/workflows/non-native.yml
+++ b/.github/workflows/non-native.yml
@@ -318,7 +318,6 @@ jobs:
       - name: 'configure'
         run: |
           if [ -n '${{ matrix.build.generate }}' ]; then
-            export OPENSSL_DIR=/
             # https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-visionos-or-watchos
             [ -n '${{ matrix.build.generator }}' ] && options='-G ${{ matrix.build.generator }}'
             cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \

diff --git a/.gitignore b/.gitignore
index 9823563740a02192feb64611a3f279cdb4dae282..9c901f9fffef52f90f5e61d1f15a263e1ae863fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,15 @@
 *.exp
 *.la
 *.lib
+*.a
+*.res
 *.lo
 *.o
 *.obj
 *.pdb
 *.pyc
+*.orig
+*.rej
 *~
 .*.sw?
 .cproject
@@ -60,6 +64,7 @@ missing
 mkinstalldirs
 tags
 test-driver
+stamp-h*
 scripts/_curl
 scripts/curl.fish
 curl_fuzzer

diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index 468426ef7aab8993914baeb933486815ccc3f4ea..1428238cb0d845492d44c05a8cba4c0bc5287adc 100644 (file)
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -50,7 +50,6 @@ int main(void)
   int flags = 0;
   if(0 != fcntl(0, F_SETFL, flags | O_NONBLOCK))
     return 1;
-  ;
   return 0;
 }
 #endif

diff --git a/docs/examples/.gitignore b/docs/examples/.gitignore
index 370170743e585d5807103b923912e7b26a6a7afe..2e8b02b246bbe3e1f18ef7493a90700e62151cb7 100644 (file)
--- a/docs/examples/.gitignore
+++ b/docs/examples/.gitignore
@@ -2,120 +2,4 @@
 #
 # SPDX-License-Identifier: curl
 
-10-at-a-time
-address-scope
-altsvc
-anyauthput
-block_ip
-certinfo
-chkspeed
-connect-to
-cookie_interface
-debug
-default-scheme
-externalsocket
-fileupload
-fopen
-ftp-wildcard
-ftpget
-ftpgetinfo
-ftpgetresp
-ftpsget
-ftpupload
-ftpuploadfrommem
-ftpuploadresume
-getinfo
-getinmemory
-getredirect
-getreferrer
-headerapi
-hsts-preload
-http-options
-http-post
-http2-download
-http2-pushinmemory
-http2-serverpush
-http2-upload
-http3
-http3-present
-httpcustomheader
-httpput
-httpput-postfields
-https
-imap-append
-imap-authzid
-imap-copy
-imap-create
-imap-delete
-imap-examine
-imap-fetch
-imap-list
-imap-lsub
-imap-multi
-imap-noop
-imap-search
-imap-ssl
-imap-store
-imap-tls
-interface
-ipv6
-keepalive
-localport
-maxconnects
-multi-app
-multi-debugcallback
-multi-double
-multi-formadd
-multi-legacy
-multi-poll
-multi-post
-multi-single
-netrc
-new-gitignore
-parseurl
-persistent
-pop3-authzid
-pop3-dele
-pop3-list
-pop3-multi
-pop3-noop
-pop3-retr
-pop3-ssl
-pop3-stat
-pop3-tls
-pop3-top
-pop3-uidl
-post-callback
-postinmemory
-postit2
-postit2-formadd
-progressfunc
-protofeats
-range
-resolve
-rtsp
-rtsp-options
-sendrecv
-sepheaders
-sftpget
-sftpuploadresume
-shared-connection-cache
-simple
-simplepost
-simplessl
-smtp-authzid
-smtp-expn
-smtp-mail
-smtp-mime
-smtp-multi
-smtp-ssl
-smtp-tls
-smtp-vrfy
-sslbackend
-unixsocket
-url2file
-urlapi
-usercertinmem
-websocket
-websocket-cb
-xmlstream
+/[0-9a-z_-]+

diff --git a/docs/examples/Makefile.inc b/docs/examples/Makefile.inc
index 5c03ab865b98b9c7f263f7ce9252208f53d99443..99980e39f41f441a3ffd76e13e65f574abe0b1d0 100644 (file)
--- a/docs/examples/Makefile.inc
+++ b/docs/examples/Makefile.inc
@@ -82,7 +82,7 @@ check_PROGRAMS = \
   ipv6 \
   keepalive \
   localport \
-  maxconnects  \
+  maxconnects \
   multi-app \
   multi-debugcallback \
   multi-double \

diff --git a/docs/libcurl/Makefile.inc b/docs/libcurl/Makefile.inc
index 0ae1a053899408c37322621d84270424d3cdbb7e..c0d1d716f15152c8fadb2d0d58801d7c3b9f5eb5 100644 (file)
--- a/docs/libcurl/Makefile.inc
+++ b/docs/libcurl/Makefile.inc
@@ -41,8 +41,8 @@ man_MANS = \
  curl_easy_reset.3 \
  curl_easy_send.3 \
  curl_easy_setopt.3 \
- curl_easy_ssls_import.3 \
  curl_easy_ssls_export.3 \
+ curl_easy_ssls_import.3 \
  curl_easy_strerror.3 \
  curl_easy_unescape.3 \
  curl_easy_upkeep.3 \
@@ -56,8 +56,8 @@ man_MANS = \
  curl_global_cleanup.3 \
  curl_global_init.3 \
  curl_global_init_mem.3 \
- curl_global_trace.3 \
  curl_global_sslset.3 \
+ curl_global_trace.3 \
  curl_mime_addpart.3 \
  curl_mime_data.3 \
  curl_mime_data_cb.3 \
@@ -87,11 +87,11 @@ man_MANS = \
  curl_multi_socket_all.3 \
  curl_multi_strerror.3 \
  curl_multi_timeout.3 \
- curl_multi_wakeup.3 \
  curl_multi_wait.3 \
  curl_multi_waitfds.3 \
- curl_pushheader_bynum.3 \
+ curl_multi_wakeup.3 \
  curl_pushheader_byname.3 \
+ curl_pushheader_bynum.3 \
  curl_share_cleanup.3 \
  curl_share_init.3 \
  curl_share_setopt.3 \
@@ -113,8 +113,8 @@ man_MANS = \
  curl_ws_recv.3 \
  curl_ws_send.3 \
  libcurl-easy.3 \
- libcurl-env.3 \
  libcurl-env-dbg.3 \
+ libcurl-env.3 \
  libcurl-errors.3 \
  libcurl-multi.3 \
  libcurl-security.3 \

diff --git a/include/curl/.gitignore b/include/curl/.gitignore
deleted file mode 100644 (file)
index 2467938..0000000
--- a/include/curl/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-curlver.h.dist
-stamp-h2
-stamp-h3

diff --git a/lib/.gitattributes b/lib/.gitattributes
deleted file mode 100644 (file)
index 7e1eea5..0000000
--- a/lib/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl

diff --git a/lib/.gitignore b/lib/.gitignore
index 0e624c8de30608ffce3cdc29e53c62516d29ed64..177371a2f9dc65e84b16d123ab2ac2bde657f60a 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -2,12 +2,6 @@
 #
 # SPDX-License-Identifier: curl
 
-*.a
-*.orig
-*.rej
-*.res
-TAGS
 curl_config.h
 curl_config.h.in
 libcurl.vers
-stamp-h1

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e57707850e7013cebd5df7e30bef68dcad91bfbb..fa6c9756b5962f41493578c0578d209874ca9430 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,11 +28,9 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 CHECKSRC_DIST = .checksrc vauth/.checksrc vquic/.checksrc vssh/.checksrc \
  vtls/.checksrc
 
-EXTRA_DIST = config-win32.h config-plan9.h                              \
- config-riscos.h config-mac.h curl_config.h.in libcurl.rc               \
- config-os400.h setup-os400.h                                           \
- $(CMAKE_DIST) setup-win32.h Makefile.soname optiontable.pl libcurl.def \
- $(CHECKSRC_DIST)
+EXTRA_DIST = config-mac.h config-os400.h config-plan9.h config-riscos.h \
+ config-win32.h curl_config.h.in libcurl.rc libcurl.def                 \
+ $(CMAKE_DIST) Makefile.soname optiontable.pl $(CHECKSRC_DIST)
 
 lib_LTLIBRARIES = libcurl.la
 

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index fc6201e9e62b7e518248542b2d63cfa025684112..25c6df84ecb9448473aba9381b9cfb4c72e423b4 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -349,7 +349,9 @@ LIB_HFILES =         \
   select.h           \
   sendf.h            \
   setopt.h           \
+  setup-os400.h      \
   setup-vms.h        \
+  setup-win32.h      \
   share.h            \
   sigpipe.h          \
   slist.h            \

diff --git a/m4/.gitignore b/m4/.gitignore
index 59602da5a44f4e5f77980a0cf4a9ec850c4d6a17..97cc6685166d33dddde8c222d6957004e64cadec 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: curl
 
 libtool.m4
-libtool.m4.tmp
 ltoptions.m4
 ltsugar.m4
 ltversion.m4

diff --git a/projects/Windows/.gitignore b/projects/Windows/.gitignore
index 257839afe434c11360ee1c7122941178a0643952..f32b8558a23c5ea44c3f9511793ad94d35703c76 100644 (file)
--- a/projects/Windows/.gitignore
+++ b/projects/Windows/.gitignore
@@ -2,7 +2,9 @@
 #
 # SPDX-License-Identifier: curl
 
-VC*/src/*curl.vcproj.dist
-VC*/lib/*curl.vcproj.dist
-VC*/src/*curl.vcxproj.dist
-VC*/lib/*curl.vcxproj.dist
+*.ncb
+*.opensdf
+*.sdf
+*.suo
+*.user
+*.vcxproj

diff --git a/projects/Windows/VC10/.gitignore b/projects/Windows/VC10/.gitignore
deleted file mode 100644 (file)
index 53e3845..0000000
--- a/projects/Windows/VC10/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo

diff --git a/projects/Windows/VC10/lib/.gitignore b/projects/Windows/VC10/lib/.gitignore
deleted file mode 100644 (file)
index 853b57d..0000000
--- a/projects/Windows/VC10/lib/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo
-/*.user
-/*.vcxproj

diff --git a/projects/Windows/VC10/src/.gitignore b/projects/Windows/VC10/src/.gitignore
deleted file mode 100644 (file)
index 853b57d..0000000
--- a/projects/Windows/VC10/src/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo
-/*.user
-/*.vcxproj

diff --git a/projects/Windows/VC11/.gitignore b/projects/Windows/VC11/.gitignore
deleted file mode 100644 (file)
index 53e3845..0000000
--- a/projects/Windows/VC11/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo

diff --git a/projects/Windows/VC11/lib/.gitignore b/projects/Windows/VC11/lib/.gitignore
deleted file mode 100644 (file)
index 853b57d..0000000
--- a/projects/Windows/VC11/lib/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo
-/*.user
-/*.vcxproj

diff --git a/projects/Windows/VC11/src/.gitignore b/projects/Windows/VC11/src/.gitignore
deleted file mode 100644 (file)
index 853b57d..0000000
--- a/projects/Windows/VC11/src/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo
-/*.user
-/*.vcxproj

diff --git a/projects/Windows/VC12/.gitignore b/projects/Windows/VC12/.gitignore
deleted file mode 100644 (file)
index 53e3845..0000000
--- a/projects/Windows/VC12/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo

diff --git a/projects/Windows/VC12/lib/.gitignore b/projects/Windows/VC12/lib/.gitignore
deleted file mode 100644 (file)
index 853b57d..0000000
--- a/projects/Windows/VC12/lib/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo
-/*.user
-/*.vcxproj

diff --git a/projects/Windows/VC12/src/.gitignore b/projects/Windows/VC12/src/.gitignore
deleted file mode 100644 (file)
index 853b57d..0000000
--- a/projects/Windows/VC12/src/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-/*.ncb
-/*.opensdf
-/*.sdf
-/*.suo
-/*.user
-/*.vcxproj

diff --git a/src/.gitignore b/src/.gitignore
index 4f410a9928773dfe2ba0d401356e6fefc741345b..1f50e57f9aa78b1c42546e0b238fd06ce9ed4e6f 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,9 +2,6 @@
 #
 # SPDX-License-Identifier: curl
 
-*.a
-*.res
 curl
-stamp-h2
 tool_ca_embed.c
 tool_hugehelp.c

diff --git a/tests/.gitignore b/tests/.gitignore
index 42b5430ca4bf682d62df9345e301eb78e3549c3f..83cda8fcebc96dfb0d3fc664475228b03339f323 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: curl
 
 *pid
-*.1.dist
 configurehelp.pm
 curl_client_key
 curl_client_key.pub
@@ -18,12 +17,7 @@ curl_ssh_config
 curl_sshd_config
 ftps_stunnel.conf
 https_stunnel.conf
-log
 log*
-runtests.html
-runtests.pdf
-testcurl.html
-testcurl.pdf
 *.port
 config
 second-hsts.txt

diff --git a/tests/http/clients/.gitignore b/tests/http/clients/.gitignore
index dd6eb29e7fe88a94ebe6c13734ab5d3b380f878c..2e8b02b246bbe3e1f18ef7493a90700e62151cb7 100644 (file)
--- a/tests/http/clients/.gitignore
+++ b/tests/http/clients/.gitignore
@@ -2,12 +2,4 @@
 #
 # SPDX-License-Identifier: curl
 
-h2-serverpush
-hx-download
-hx-upload
-ws-data
-ws-pingpong
-h2-upgrade-extreme
-tls-session-reuse
-h2-pausing
-upload-pausing
+/[0-9a-z_-]+

diff --git a/tests/http/clients/Makefile.inc b/tests/http/clients/Makefile.inc
index c5e4e8afbeb756b1410e3916b916682644e3e514..d0494a39040cf215ab991788b6e04e25493ae385 100644 (file)
--- a/tests/http/clients/Makefile.inc
+++ b/tests/http/clients/Makefile.inc
@@ -24,11 +24,11 @@
 
 # These are all libcurl example programs to be test compiled
 check_PROGRAMS = \
-  hx-download \
-  hx-upload \
   h2-pausing \
   h2-serverpush \
   h2-upgrade-extreme \
+  hx-download \
+  hx-upload \
   tls-session-reuse \
   upload-pausing \
   ws-data \

diff --git a/tests/libtest/.gitignore b/tests/libtest/.gitignore
index 9fd1a098c7bcea72bc92eaca844af9316a825954..394ceae0db4befde600dc5dffae7620b762fde46 100644 (file)
--- a/tests/libtest/.gitignore
+++ b/tests/libtest/.gitignore
@@ -2,10 +2,6 @@
 #
 # SPDX-License-Identifier: curl
 
-lib[1234][0-9][0-9][0-9]
-lib[56][0-9][0-9]
+/lib[0-9a-z_-]+
 lib1521.c
-libtests.c
-libauthretry
-libntlmconnect
-libprereq
+libtest_bundle.c

diff --git a/tests/server/.gitignore b/tests/server/.gitignore
index 57c685b4e367cbd2e6dfe3b28bd11a19e719425c..b204a31e5fd93ba047630a0fb843b174141c643a 100644 (file)
--- a/tests/server/.gitignore
+++ b/tests/server/.gitignore
@@ -2,12 +2,4 @@
 #
 # SPDX-License-Identifier: curl
 
-getpart
-resolve
-rtspd
-sockfilt
-sws
-tftpd
-socksd
-disabled
-mqttd
+[0-9a-z_-]+

diff --git a/tests/unit/.gitignore b/tests/unit/.gitignore
index a91670e0d5a69059daa81f67b4216b29fffd0991..18e3e0d7c580ba5e45843a7ab168ded031ec8fa5 100644 (file)
--- a/tests/unit/.gitignore
+++ b/tests/unit/.gitignore
@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: curl
 
 /unit[0-9][0-9][0-9][0-9]
-units.c
+unit_bundle.c

diff --git a/winbuild/makedebug.bat b/winbuild/makedebug.bat
index e86e668ca0fb9f0cb833848dbb9092a7512d96c9..6305537e3ded13587cf25391e8d8d2eaa6fa3b79 100644 (file)
--- a/winbuild/makedebug.bat
+++ b/winbuild/makedebug.bat
@@ -28,6 +28,6 @@ where.exe nmake.exe >nul 2>&1
 if %ERRORLEVEL% EQU 1 (
   echo Error: Cannot find nmake.exe - be sure to run this script from within a Developer Command-Prompt
 ) else (
-  nmake.exe /f Makefile.vc mode=static DEBUG=yes GEN_PDB=yes
+  nmake.exe /f Makefile.vc MODE=static DEBUG=yes GEN_PDB=yes
   if %ERRORLEVEL% NEQ 0 echo Error: Build Failed
 )