build: drop tool_hugehelp.c.cvs, tidy up macros, drop buildconf.bat
#16081
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vszakats
force-pushed
the
hugehelp-opt
branch
4 times, most recently
from
aaefb69 to
8943e14
Compare
vszakats
force-pushed
the
hugehelp-opt
branch
from
48fda62 to
f4ac904
Compare
fix hugehelp generation in cases when the .cvs file was missing. in reality this happened only if someone created a GIT-INFO.md file inside an official source tarball and used buildconf.bat. Follow-up to 9a0cf56 curl#13997
It's no longer required to be present unconditionally. Stop setting the `USE_MANUAL` macro instead.
It's unlikely this ever worked to actually include a manual. Unless manually building it with Perl. In that case this macro needs to be set manually via `CPPFLAGS`.
This reverts commit f4ac904.
This reverts commit 3b58d0e.
This reverts commit cc3c583.
This reverts commit 615aecb.
To avoid causing compiler warnings when included in the build but without `-DUSE_MANUAL`.
vszakats
force-pushed
the
hugehelp-opt
branch
from
f4ac904 to
8143ff4
Compare
vszakats
force-pushed
the
hugehelp-opt
branch
from
2fccd22 to
1b7e2d8
Compare
This drops `make vc` and `make vc-x64` to launch winbuild builds via GNU Make. You can do this instead: make vc: % cd winbuild % nmake /f Makefile.vc MACHINE=x86 make vc-x64: $ cd winbuild % nmake /f Makefile.vc MACHINE=x64
vszakats
changed the title
tool_hugehelp.c.cvs, tidy up feature macrostool_hugehelp.c.cvs, tidy up macros, drop buildconf.bat
bagder
approved these changes
Jan 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rework the way
tool_hugehelp.cis included in builds.After this patch, with
./configureand CMaketool_hugehelp.cis onlycompiled when building with manuals enabled. With manuals disabled this
source file is not used anymore. The method is similar to how
8a3740b implemented
tool_ca_embed.c../configurealways generates it as before, otherwise the build fails.winbuild: rework to not need
buildconf.bat, but automatically usetool_hugehelp.cif present (e.g. when building from an officialsource tarball) and enable
USE_MANUALaccordingly.buildconf.bat: after droppingtool_hugehelp.cgeneration, the onlylogic left was
cp Makefile.dist Makefile. This allowed to launchwinbuild builds via GNU Make in a Git repo. Drop this option together
with the batch file.
build
libcurltoolwithoutUSE_MANUALmacro to exclude the manualand the dependence on the generator commands. Drop relying on
UNITTESTSfor this purpose.Follow-up to 96843f4 src: omit hugehelp and ca-embed from libcurltool #16068
src/mkhelp.pl: includetool_hugehelp.hbefore usingUSE_MANUALto have it set in
config-*.hbuilds with source tarballs createdwith manual but without zlib.
tool_hugehelp.cwithingMakefile.vcand set
USE_MANUALwhen detected. This would allow dropping thestub generator logic, and then the whole
buildconf.batscript with it,which does nothing else, except
cp Makefile.dist Makefile, to allowlaunching winbuild via GNU Make.
podmancommit to separate PR pending.buildconf.batto separate PR pending.UNITTESTSguards for hugehelp and ca-embed.Follow-up to 96843f4 src: omit hugehelp and ca-embed from libcurltool #16068