dist: drop buildconf

The documented and mandated step has been to not use buildconf but to
invoke 'autoreconf -fi' for four years already.

This change only drops buildconf from the release tarball, it remains
present in git for now.

Follow-up to 85868537d6d5b8

Closes #14412

diff --git a/.github/scripts/spellcheck.words b/.github/scripts/spellcheck.words
index 39e6dbbea5170373739334855a99a5dca2072c68..4203c3a4e8865eda9d9a95cf8863bb41e57f549d 100644 (file)
--- a/.github/scripts/spellcheck.words
+++ b/.github/scripts/spellcheck.words
@@ -44,6 +44,7 @@ Autoconf
 autoconf
 Automake
 automake
+autoreconf
 Autotools
 autotools
 AVR
@@ -78,7 +79,6 @@ bugfix
 bugfixes
 buildable
 buildbot
-buildconf
 Caddy
 calloc
 CAPA

diff --git a/Makefile.am b/Makefile.am
index 1729cb36330e48eb70b38508a6141eb62d4ce158..224a7f7124bdd4056c4557c977ee1ace1bc8ac4c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,10 +75,9 @@ PLAN9_DIST = plan9/include/mkfile \
  plan9/src/mkfile.inc             \
  plan9/src/mkfile
 
-EXTRA_DIST = CHANGES.md COPYING maketgz Makefile.dist curl-config.in       \
- RELEASE-NOTES buildconf libcurl.pc.in $(CMAKE_DIST) $(VC_DIST)         \
- $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat       \
- libcurl.def Dockerfile
+EXTRA_DIST = CHANGES.md COPYING maketgz Makefile.dist curl-config.in    \
+ RELEASE-NOTES libcurl.pc.in $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST)  \
+ $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat libcurl.def Dockerfile
 
 CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) \
  $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ)       \

diff --git a/maketgz b/maketgz
index 55c3a3fa12678295aa691bfa434585ec3e3a5c5d..996fd06fede4df2ab50606e500e6ccb594bc8d0a 100755 (executable)
--- a/maketgz
+++ b/maketgz
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Script to build release-archives with. Note that this requires a checkout
-# from git and you should first run ./buildconf and build curl once.
+# from git and you should first run autoreconf -fi and build curl once.
 #
 #***************************************************************************
 #                                  _   _ ____  _

diff --git a/tests/runtests.md b/tests/runtests.md
index beefd3bec7d0926001b6e52c25957d63534213f6..0bb862c016179b6ac667118cec13e5b81b333111 100644 (file)
--- a/tests/runtests.md
+++ b/tests/runtests.md
@@ -106,7 +106,7 @@ with the test being run.
 
 Load the **exclude_file** with additional reasons why certain tests should be
 skipped. Useful when testing with external HTTP proxies in which case some of
-the tests aren't appropriate.
+the tests are not appropriate.
 
 The file contains colon-delimited lines. The first field contains the type of
 exclusion, the second field contains a pattern and the final field contains
@@ -183,13 +183,13 @@ etc not able to use this functionality.
 ## `-o \<variablename=value\>`
 
 Overwrite the specified internal **variable** with **value**. Useful to change
-variables that didn't get a dedicated flag to change them. Check the source to
+variables that did not get a dedicated flag to change them. Check the source to
 see which variables are available.
 
 ## `-P \<proxy\>`
 
 Use the specified HTTP proxy when executing tests, even if the tests
-themselves don't specify a proxy. This option allows one to test external
+themselves do not specify a proxy. This option allows one to test external
 proxies using curl's regression test suite.
 
 ## `-p`
@@ -291,5 +291,5 @@ for all tests. In these cases, the problematic tests can be skipped using the
 # WRITING TESTS
 
 The simplest way to write test cases is to start with a similar existing test,
-save it with a new number and then adjust it to fit. There's an attempt to
+save it with a new number and then adjust it to fit. There is an attempt to
 document the test case file format in **tests/FILEFORMAT.md**.

diff --git a/tests/testcurl.md b/tests/testcurl.md
index a325477344056e4bca7d66609f877e91e765cc99..1cadd88db6369cbe614b942c940db2ec7cbcbd65 100644 (file)
--- a/tests/testcurl.md
+++ b/tests/testcurl.md
@@ -31,10 +31,10 @@ https://curl.se/dev/builds.html
 *options* may be omitted. See *--setup* for what happens then.
 
 *dir* is a curl source dir, possibly a daily snapshot one. Using this will
-make *testcurl* skip the 'buildconf' stage and thus it removes the dependency
+make *testcurl* skip the *autoreconf* stage and thus it removes the dependency
 on automake, autoconf, libtool, GNU m4 and possibly a few other things.
 
-*testcurl* runs `buildconf` (or similar), configure, builds curl and libcurl
+*testcurl* runs `autoreconf` (or similar), configure, builds curl and libcurl
 in a separate build directory and then runs `make test` to test the fresh
 build.
 
@@ -67,24 +67,24 @@ Set name to report as. Displayed in the build summary on the site.
 
 ## `--nobuildconf`
 
-Don't run buildconf. Useful when many builds use the same source tree, as then
-only one need to do this. Also, if multiple processes run tests simultaneously
-on the same source tree (like several hosts on a NFS mounted dir),
-simultaneous buildconf invokes may cause problems. (Added in 7.14.1)
+Do not run autoreconf. Useful when many builds use the same source tree, as
+then only one need to do this. Also, if multiple processes run tests
+simultaneously on the same source tree (like several hosts on a NFS mounted
+dir), simultaneous autoreconf invokes may cause problems. (Added in 7.14.1)
 
 ## `--nogitpull`
 
-Don't update from git even though it is a git tree. Useful to still be able to
-test even though your network is down, or similar.
+Do not update from git even though it is a git tree. Useful to still be able
+to test even though your network is down, or similar.
 
 ## `--runtestopts=[options]`
 
 Options that is passed to the runtests script. Useful for disabling valgrind
 by force, and similar.
 
-## `--setup=[file name]`
+## `--setup=[filename]`
 
-File name to read setup from (deprecated). The old style of providing info.
+filename to read setup from (deprecated). The old style of providing info.
 If info is missing when *testcurl* is started, it will prompt you and then
 store the info in a 'setup' file, which it will look for on each invoke. Use
 *--name*, *--email*, *--configure* and *--desc* instead.

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index a9154855ba883d6e5db29757a098934f13eaf480..5c230ef4eee544c321db60e202c8a735fff893b9 100755 (executable)
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -51,7 +51,7 @@
 # --notes=[notes]          More human-readable information about this configuration
 # --nocvsup                Don't pull from git even though it is a git tree
 # --nogitpull              Don't pull from git even though it is a git tree
-# --nobuildconf            Don't run buildconf
+# --nobuildconf            Don't run autoreconf -fi
 # --noconfigure            Don't run configure
 # --runtestopts=[options]  Options to pass to runtests.pl
 # --setup=[file name]      File name to read setup from (deprecated)
@@ -460,7 +460,7 @@ if ($git) {
   }
 
   if($nobuildconf) {
-    logit "told to not run buildconf";
+    logit "told to not run autoreconf -fi";
   }
   elsif ($configurebuild) {
     # remove possible left-overs from the past
@@ -479,10 +479,10 @@ if ($git) {
     close($f);
     close($log);
 
-    logit "buildconf was successful";
+    logit "autoreconf -fi was successful";
   }
   else {
-    logit "buildconf was successful (dummy message)";
+    logit "autoreconf -fi was successful (dummy message)";
   }
 }