Skip to content

Commit aba98d2

Browse files
committed
buildconf.bat: remove outdated groff/nroff use
- don't try to generate the real hugehelp file, because it requires curl.txt which needs a build - don't attempt to do anything in a c-ares subdirectory Follow-up to f03c856 Closes #13078
1 parent 5267bf5 commit aba98d2

1 file changed

Lines changed: 12 additions & 66 deletions

File tree

buildconf.bat

Lines changed: 12 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,6 @@ rem
4040
rem Check we are running from a curl git repository
4141
if not exist GIT-INFO.md goto norepo
4242

43-
rem Detect programs. HAVE_<PROGNAME>
44-
rem When not found the variable is set undefined. The undefined pattern
45-
rem allows for statements like "if not defined HAVE_PERL (command)"
46-
groff --version <NUL 1>NUL 2>&1
47-
if errorlevel 1 (set HAVE_GROFF=) else (set HAVE_GROFF=Y)
48-
nroff --version <NUL 1>NUL 2>&1
49-
if errorlevel 1 (set HAVE_NROFF=) else (set HAVE_NROFF=Y)
50-
perl --version <NUL 1>NUL 2>&1
51-
if errorlevel 1 (set HAVE_PERL=) else (set HAVE_PERL=Y)
52-
gzip --version <NUL 1>NUL 2>&1
53-
if errorlevel 1 (set HAVE_GZIP=) else (set HAVE_GZIP=Y)
54-
5543
:parseArgs
5644
if "%~1" == "" goto start
5745

@@ -125,15 +113,6 @@ rem
125113
)
126114
cmd /c exit 0
127115

128-
rem Setup c-ares git tree
129-
if exist ares\buildconf.bat (
130-
echo.
131-
echo Configuring c-ares build environment
132-
cd ares
133-
call buildconf.bat
134-
cd ..
135-
)
136-
137116
if "%BASIC_HUGEHELP%" == "1" (
138117
if "%OS%" == "Windows_NT" endlocal
139118
exit /B 1
@@ -182,47 +161,20 @@ rem
182161
:genHugeHelp
183162
if "%OS%" == "Windows_NT" setlocal
184163
set LC_ALL=C
185-
set ROFFCMD=
186164
set BASIC=1
187165

188-
if defined HAVE_PERL (
189-
if defined HAVE_GROFF (
190-
set ROFFCMD=groff -mtty-char -Tascii -P-c -man
191-
) else if defined HAVE_NROFF (
192-
set ROFFCMD=nroff -c -Tascii -man
193-
)
194-
)
195-
196-
if defined ROFFCMD (
166+
if exist src\tool_hugehelp.c.cvs (
167+
copy /Y src\tool_hugehelp.c.cvs src\tool_hugehelp.c 1>NUL 2>&1
168+
) else (
197169
echo #include "tool_setup.h"> src\tool_hugehelp.c
198170
echo #include "tool_hugehelp.h">> src\tool_hugehelp.c
199-
200-
if defined HAVE_GZIP (
201-
echo #ifndef HAVE_LIBZ>> src\tool_hugehelp.c
202-
)
203-
204-
%ROFFCMD% docs\curl.1 2>NUL | perl src\mkhelp.pl docs\MANUAL >> src\tool_hugehelp.c
205-
if defined HAVE_GZIP (
206-
echo #else>> src\tool_hugehelp.c
207-
%ROFFCMD% docs\curl.1 2>NUL | perl src\mkhelp.pl -c docs\MANUAL >> src\tool_hugehelp.c
208-
echo #endif /^* HAVE_LIBZ ^*/>> src\tool_hugehelp.c
209-
)
210-
211-
set BASIC=0
212-
) else (
213-
if exist src\tool_hugehelp.c.cvs (
214-
copy /Y src\tool_hugehelp.c.cvs src\tool_hugehelp.c 1>NUL 2>&1
215-
) else (
216-
echo #include "tool_setup.h"> src\tool_hugehelp.c
217-
echo #include "tool_hugehelp.h">> src\tool_hugehelp.c
218-
echo.>> src\tool_hugehelp.c
219-
echo void hugehelp(void^)>> src\tool_hugehelp.c
220-
echo {>> src\tool_hugehelp.c
221-
echo #ifdef USE_MANUAL>> src\tool_hugehelp.c
222-
echo fputs("Built-in manual not included\n", stdout^);>> src\tool_hugehelp.c
223-
echo #endif>> src\tool_hugehelp.c
224-
echo }>> src\tool_hugehelp.c
225-
)
171+
echo.>> src\tool_hugehelp.c
172+
echo void hugehelp(void^)>> src\tool_hugehelp.c
173+
echo {>> src\tool_hugehelp.c
174+
echo #ifdef USE_MANUAL>> src\tool_hugehelp.c
175+
echo fputs("Built-in manual not included\n", stdout^);>> src\tool_hugehelp.c
176+
echo #endif>> src\tool_hugehelp.c
177+
echo }>> src\tool_hugehelp.c
226178
)
227179

228180
findstr "/C:void hugehelp(void)" src\tool_hugehelp.c 1>NUL 2>&1
@@ -244,13 +196,8 @@ rem Windows 9x as setlocal isn't available until Windows NT
244196
rem
245197
:dosCleanup
246198
set MODE=
247-
set HAVE_GROFF=
248-
set HAVE_NROFF=
249-
set HAVE_PERL=
250-
set HAVE_GZIP=
251199
set BASIC_HUGEHELP=
252200
set LC_ALL
253-
set ROFFCMD=
254201
set BASIC=
255202

256203
exit /B
@@ -296,10 +243,9 @@ rem
296243
:warning
297244
echo.
298245
echo Warning: The curl manual could not be integrated in the source. This means when
299-
echo you build curl the manual will not be available (curl --man^). Integration of
246+
echo you build curl the manual will not be available (curl --manual^). Integration of
300247
echo the manual is not required and a summary of the options will still be available
301-
echo (curl --help^). To integrate the manual your PATH is required to have
302-
echo groff/nroff, perl and optionally gzip for compression.
248+
echo (curl --help^). To integrate the manual build with configure or cmake.
303249
goto success
304250

305251
:error

0 commit comments

Comments
 (0)