luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dist: drop buildconf

Browse Source 
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 85868537d6

Closes #14412
This commit is contained in:
Daniel Stenberg 2024-08-06 10:01:17 +02:00
parent 8577f4ca08
commit 91fcbc5d1a
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
6 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/scripts/spellcheck.words vendored
View File

@ -44,6 +44,7 @@ Autoconf
autoconf autoconf
Automake Automake
automake automake
autoreconf
Autotools Autotools
autotools autotools
AVR AVR
@ -78,7 +79,6 @@ bugfix
bugfixes bugfixes
buildable buildable
buildbot buildbot
buildconf
Caddy Caddy
calloc calloc
CAPA CAPA

7
Makefile.am
View File

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

2
maketgz
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Script to build release-archives with. Note that this requires a checkout # 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.
# #
#*************************************************************************** #***************************************************************************
# _ _ ____ _ # _ _ ____ _

8
tests/runtests.md
View File

@ -106,7 +106,7 @@ with the test being run.
Load the **exclude_file** with additional reasons why certain tests should be 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 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 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 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\>` ## `-o \<variablename=value\>`
Overwrite the specified internal **variable** with **value**. Useful to change 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. see which variables are available.
## `-P \<proxy\>` ## `-P \<proxy\>`
Use the specified HTTP proxy when executing tests, even if the tests 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. proxies using curl's regression test suite.
## `-p` ## `-p`
@ -291,5 +291,5 @@ for all tests. In these cases, the problematic tests can be skipped using the
# WRITING TESTS # WRITING TESTS
The simplest way to write test cases is to start with a similar existing test, 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**. document the test case file format in **tests/FILEFORMAT.md**.

20
tests/testcurl.md
View File

@ -31,10 +31,10 @@ https://curl.se/dev/builds.html
*options* may be omitted. See *--setup* for what happens then. *options* may be omitted. See *--setup* for what happens then.
*dir* is a curl source dir, possibly a daily snapshot one. Using this will *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. 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 in a separate build directory and then runs `make test` to test the fresh
build. build.
@ -67,24 +67,24 @@ Set name to report as. Displayed in the build summary on the site.
## `--nobuildconf` ## `--nobuildconf`
Don't run buildconf. Useful when many builds use the same source tree, as then Do not run autoreconf. Useful when many builds use the same source tree, as
only one need to do this. Also, if multiple processes run tests simultaneously then only one need to do this. Also, if multiple processes run tests
on the same source tree (like several hosts on a NFS mounted dir), simultaneously on the same source tree (like several hosts on a NFS mounted
simultaneous buildconf invokes may cause problems. (Added in 7.14.1) dir), simultaneous autoreconf invokes may cause problems. (Added in 7.14.1)
## `--nogitpull` ## `--nogitpull`
Don't update from git even though it is a git tree. Useful to still be able to Do not update from git even though it is a git tree. Useful to still be able
test even though your network is down, or similar. to test even though your network is down, or similar.
## `--runtestopts=[options]` ## `--runtestopts=[options]`
Options that is passed to the runtests script. Useful for disabling valgrind Options that is passed to the runtests script. Useful for disabling valgrind
by force, and similar. 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 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 store the info in a 'setup' file, which it will look for on each invoke. Use
*--name*, *--email*, *--configure* and *--desc* instead. *--name*, *--email*, *--configure* and *--desc* instead.

8
tests/testcurl.pl
View File

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