generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl tool: renaming hugehelp files to tool_hugehelp

Browse Source
This commit is contained in:
Yang Tse
2012-12-26 23:30:54 +01:00
parent eb5aa12c8b
commit ae2a2c9931
26 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
GIT-INFO
View File

@@ -48,9 +48,9 @@ installed:
o nroff + perl o nroff + perl
If you don't have nroff and perl and you for some reason don't want to If you don't have nroff and perl and you for some reason don't want to
install them, you can rename the source file src/hugehelp.c.cvs to install them, you can rename the source file src/tool_hugehelp.c.cvs to
src/hugehelp.c and avoid having to generate this file. This will give you src/tool_hugehelp.c and avoid having to generate this file. This will
a stubbed version of the file that doesn't contain actual content. give you a stubbed version of the file that doesn't contain actual content.
MAC OS X MAC OS X

6
buildconf.bat
View File

@@ -12,9 +12,9 @@ ECHO ERROR: This file shall only be used with a curl git tree checkout.
goto end_all goto end_all
:start_doing :start_doing
REM create hugehelp.c REM create tool_hugehelp.c
if not exist src\hugehelp.c.cvs goto end_hugehelp_c if not exist src\tool_hugehelp.c.cvs goto end_hugehelp_c
copy /Y src\hugehelp.c.cvs src\hugehelp.c copy /Y src\tool_hugehelp.c.cvs src\tool_hugehelp.c
:end_hugehelp_c :end_hugehelp_c
REM create Makefile REM create Makefile

2
docs/INSTALL.cmake
View File

@@ -24,7 +24,7 @@ Current flaws in the curl CMake build
Missing features in the cmake build: Missing features in the cmake build:
- Builds libcurl without large file support - Builds libcurl without large file support
- It doesn't build src/hugehelp.c which creates the --manual output - It doesn't build src/tool_hugehelp.c which creates the --manual output
- Can't select which SSL library to build with, only OpenSSL - Can't select which SSL library to build with, only OpenSSL
- Doesn't build with SCP and SFTP support (libssh2) - Doesn't build with SCP and SFTP support (libssh2)
- Doesn't allow different resolver backends (no c-ares build support) - Doesn't allow different resolver backends (no c-ares build support)

8
docs/INTERNALS
View File

@@ -413,10 +413,10 @@ Client
main() resides in src/main.c together with most of the client code. main() resides in src/main.c together with most of the client code.
src/hugehelp.c is automatically generated by the mkhelp.pl perl script to src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script
display the complete "manual" and the src/urlglob.c file holds the functions to display the complete "manual" and the src/urlglob.c file holds the
used for the URL-"globbing" support. Globbing in the sense that the {} and [] functions used for the URL-"globbing" support. Globbing in the sense that
expansion stuff is there. the {} and [] expansion stuff is there.
The client mostly messes around to setup its 'config' struct properly, then The client mostly messes around to setup its 'config' struct properly, then
it calls the curl_easy_*() functions of the library and when it gets back it calls the curl_easy_*() functions of the library and when it gets back

2
docs/TODO
View File

@@ -512,7 +512,7 @@ to provide the data to send.
17.1 roffit 17.1 roffit
Consider extending 'roffit' to produce decent ASCII output, and use that Consider extending 'roffit' to produce decent ASCII output, and use that
instead of (g)nroff when building src/hugehelp.c instead of (g)nroff when building src/tool_hugehelp.c
18. Test suite 18. Test suite

2
packages/Symbian/group/curl.mmp
View File

@@ -8,7 +8,6 @@ UID 0x00000000 0xF0206442
SOURCEPATH ../../../src SOURCEPATH ../../../src
SOURCE \ SOURCE \
hugehelp.c \
tool_binmode.c \ tool_binmode.c \
tool_bname.c \ tool_bname.c \
tool_cb_dbg.c \ tool_cb_dbg.c \
@@ -28,6 +27,7 @@ SOURCE \
tool_help.c \ tool_help.c \
tool_helpers.c \ tool_helpers.c \
tool_homedir.c \ tool_homedir.c \
tool_hugehelp.c \
tool_libinfo.c \ tool_libinfo.c \
tool_main.c \ tool_main.c \
tool_metalink.c \ tool_metalink.c \

2
src/.gitignore vendored
View File

@@ -1,7 +1,7 @@
curl curl
curl_config.h curl_config.h
curl_config.h.in curl_config.h.in
hugehelp.c tool_hugehelp.c
stamp-h2 stamp-h2
Makefile.vc8.dist Makefile.vc8.dist
Makefile.vc9.dist Makefile.vc9.dist

8
src/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
set(EXE_NAME curl) set(EXE_NAME curl)
# First try to locate hugehelp.c to see if it has already been created # First try to locate tool_hugehelp.c to see if it has already been created
# TODO Find the file WITHOUT adding a cache entry!!! Or else the user can delete the file after the script was first run, and the script won't notice it has gone. # TODO Find the file WITHOUT adding a cache entry!!! Or else the user can delete the file after the script was first run, and the script won't notice it has gone.
find_file(HUGEHELP_C_FILE hugehelp.c PATHS . NO_DEFAULT_PATH) find_file(HUGEHELP_C_FILE tool_hugehelp.c PATHS . NO_DEFAULT_PATH)
if (NOT HUGEHELP_C_FILE) if (NOT HUGEHELP_C_FILE)
message(STATUS "Warning: hugehelp.c file was not generated before. Generating an 'empty' file...") message(STATUS "Warning: tool_hugehelp.c file was not generated before. Generating an 'empty' file...")
file(WRITE hugehelp.c "/* built-in manual is disabled, blank function */\n#include \"hugehelp.h\"\nvoid hugehelp(void) {}\n\n") file(WRITE tool_hugehelp.c "/* built-in manual is disabled, blank function */\n#include \"tool_hugehelp.h\"\nvoid hugehelp(void) {}\n\n")
endif() endif()
transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")

10
src/Makefile.Watcom
View File

@@ -132,7 +132,7 @@ OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
RESOURCE = $(OBJ_DIR)$(DS)curl.res RESOURCE = $(OBJ_DIR)$(DS)curl.res
all: hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC all: tool_hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC
@echo Welcome to cURL @echo Welcome to cURL
clean: .SYMBOLIC clean: .SYMBOLIC
@@ -141,13 +141,13 @@ clean: .SYMBOLIC
vclean distclean: clean .SYMBOLIC vclean distclean: clean .SYMBOLIC
-$(RD) $(OBJ_DIR) -$(RD) $(OBJ_DIR)
-$(RM) curl.exe curl.map curl.sym hugehelp.c -$(RM) curl.exe curl.map curl.sym tool_hugehelp.c
hugehelp.c: hugehelp.c.cvs tool_hugehelp.c: tool_hugehelp.c.cvs
$(CP) $[@ $^@ $(CP) $[@ $^@
hugehelp.c.cvs: .EXISTSONLY tool_hugehelp.c.cvs: .EXISTSONLY
$(CP) hugehelp.c $^@ $(CP) tool_hugehelp.c $^@
$(OBJ_DIR): $(OBJ_DIR):
-$(MD) $^@ -$(MD) $^@

19
src/Makefile.am
View File

@@ -67,8 +67,8 @@ curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
BUILT_SOURCES = hugehelp.c BUILT_SOURCES = tool_hugehelp.c
CLEANFILES = hugehelp.c CLEANFILES = tool_hugehelp.c
# Use the C locale to ensure that only ASCII characters appear in the # Use the C locale to ensure that only ASCII characters appear in the
# embedded text. # embedded text.
NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
@@ -83,13 +83,14 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
MANPAGE=$(top_srcdir)/docs/curl.1 MANPAGE=$(top_srcdir)/docs/curl.1
README=$(top_srcdir)/docs/MANUAL README=$(top_srcdir)/docs/MANUAL
MKHELP=$(top_srcdir)/src/mkhelp.pl MKHELP=$(top_srcdir)/src/mkhelp.pl
HUGE=hugehelp.c HUGE=tool_hugehelp.c
if USE_MANUAL if USE_MANUAL
# Here are the stuff to create a built-in manual # Here are the stuff to create a built-in manual
if HAVE_LIBZ if HAVE_LIBZ
# This generates the hugehelp.c file in both uncompressed and compressed formats # This generates the tool_hugehelp.c file in both uncompressed and
# compressed formats
$(HUGE): $(README) $(MANPAGE) mkhelp.pl $(HUGE): $(README) $(MANPAGE) mkhelp.pl
echo '#include "tool_setup.h"' > $(HUGE) echo '#include "tool_setup.h"' > $(HUGE)
echo '#ifndef HAVE_LIBZ' >> $(HUGE) echo '#ifndef HAVE_LIBZ' >> $(HUGE)
@@ -98,7 +99,7 @@ $(HUGE): $(README) $(MANPAGE) mkhelp.pl
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
echo '#endif /* HAVE_LIBZ */' >> $(HUGE) echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
else # HAVE_LIBZ else # HAVE_LIBZ
# This generates the hugehelp.c file uncompressed only # This generates the tool_hugehelp.c file uncompressed only
$(HUGE): $(README) $(MANPAGE) mkhelp.pl $(HUGE): $(README) $(MANPAGE) mkhelp.pl
echo '#include "tool_setup.h"' > $(HUGE) echo '#include "tool_setup.h"' > $(HUGE)
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
@@ -108,14 +109,14 @@ else # USE_MANUAL
# built-in manual has been disabled, make a blank file # built-in manual has been disabled, make a blank file
$(HUGE): $(HUGE):
echo "/* built-in manual is disabled, blank function */" > $(HUGE) echo "/* built-in manual is disabled, blank function */" > $(HUGE)
echo '#include "hugehelp.h"' >> $(HUGE) echo '#include "tool_hugehelp.h"' >> $(HUGE)
echo "void hugehelp(void) {}" >>$(HUGE) echo "void hugehelp(void) {}" >>$(HUGE)
endif endif
# ignore hugehelp.c since it is generated source code and it plays by slightly # ignore tool_hugehelp.c since it is generated source code and it plays
# different rules! # by slightly different rules!
checksrc: checksrc:
@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Whugehelp.c $(curl_SOURCES) @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Wtool_hugehelp.c $(curl_SOURCES)
if CURLDEBUG if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes # for debug builds, we scan the sources on all regular make invokes

14
src/Makefile.b32
View File

@@ -86,7 +86,7 @@ OBJECTS = $(CSOURCES:.c=.obj)
.c.obj: .c.obj:
$(CC_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$@ $< $(CC_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$@ $<
all: $(OBJDIR) hugehelp $(PROGNAME) all: $(OBJDIR) tool_hugehelp $(PROGNAME)
clean: clean:
cd $(OBJDIR) cd $(OBJDIR)
@@ -101,13 +101,13 @@ $(OBJDIR):
@-$(MKDIR) $(OBJDIR) @-$(MKDIR) $(OBJDIR)
!ifdef WITH_ZLIB !ifdef WITH_ZLIB
hugehelp: ..\docs\MANUAL ..\docs\curl.1 mkhelp.pl tool_hugehelp: ..\docs\MANUAL ..\docs\curl.1 mkhelp.pl
groff -Tascii -man -P -c ../docs/curl.1 > hugehelp.tmp groff -Tascii -man -P -c ../docs/curl.1 > tool_hugehelp.tmp
perl -w mkhelp.pl -c ../docs/MANUAL < hugehelp.tmp > hugehelp.c perl -w mkhelp.pl -c ../docs/MANUAL < tool_hugehelp.tmp > tool_hugehelp.c
@-$(RM) hugehelp.tmp @-$(RM) tool_hugehelp.tmp
!else !else
hugehelp: tool_hugehelp:
$(COPY) hugehelp.c.cvs hugehelp.c $(COPY) tool_hugehelp.c.cvs tool_hugehelp.c
!endif !endif
$(PROGNAME): $(OBJECTS) $(LIBCURL_LIB) $(LINKLIB) $(PROGNAME): $(OBJECTS) $(LIBCURL_LIB) $(LINKLIB)

6
src/Makefile.inc
View File

@@ -14,7 +14,7 @@ CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
$(top_srcdir)/lib/rawstr.c \ $(top_srcdir)/lib/rawstr.c \
$(top_srcdir)/lib/nonblock.c $(top_srcdir)/lib/nonblock.c
CURL_CFILES = hugehelp.c \ CURL_CFILES = \
tool_binmode.c \ tool_binmode.c \
tool_bname.c \ tool_bname.c \
tool_cb_dbg.c \ tool_cb_dbg.c \
@@ -34,6 +34,7 @@ CURL_CFILES = hugehelp.c \
tool_help.c \ tool_help.c \
tool_helpers.c \ tool_helpers.c \
tool_homedir.c \ tool_homedir.c \
tool_hugehelp.c \
tool_libinfo.c \ tool_libinfo.c \
tool_main.c \ tool_main.c \
tool_metalink.c \ tool_metalink.c \
@@ -53,7 +54,7 @@ CURL_CFILES = hugehelp.c \
tool_writeout.c \ tool_writeout.c \
tool_xattr.c tool_xattr.c
CURL_HFILES = hugehelp.h \ CURL_HFILES = \
tool_binmode.h \ tool_binmode.h \
tool_bname.h \ tool_bname.h \
tool_cb_dbg.h \ tool_cb_dbg.h \
@@ -73,6 +74,7 @@ CURL_HFILES = hugehelp.h \
tool_help.h \ tool_help.h \
tool_helpers.h \ tool_helpers.h \
tool_homedir.h \ tool_homedir.h \
tool_hugehelp.h \
tool_libinfo.h \ tool_libinfo.h \
tool_main.h \ tool_main.h \
tool_metalink.h \ tool_metalink.h \

12
src/Makefile.m32
View File

@@ -296,11 +296,11 @@ curl.exe: $(RESOURCE) $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(CC) $(LDFLAGS) -o $@ $< $(curl_OBJECTS) $(curl_LDADD) $(CC) $(LDFLAGS) -o $@ $< $(curl_OBJECTS) $(curl_LDADD)
# We don't have nroff normally under win32 # We don't have nroff normally under win32
# hugehelp.c: $(PROOT)/docs/MANUAL $(PROOT)/docs/curl.1 mkhelp.pl # tool_hugehelp.c: $(PROOT)/docs/MANUAL $(PROOT)/docs/curl.1 mkhelp.pl
# @$(call DEL, hugehelp.c) # @$(call DEL, tool_hugehelp.c)
# $(NROFF) -man $(PROOT)/docs/curl.1 | $(PERL) mkhelp.pl $(PROOT)/docs/MANUAL > hugehelp.c # $(NROFF) -man $(PROOT)/docs/curl.1 | $(PERL) mkhelp.pl $(PROOT)/docs/MANUAL > tool_hugehelp.c
hugehelp.c: tool_hugehelp.c:
@echo Creating $@ @echo Creating $@
@$(call COPY, $@.cvs, $@) @$(call COPY, $@.cvs, $@)
@@ -311,8 +311,8 @@ hugehelp.c:
$(RC) $(RCFLAGS) $< -o $@ $(RC) $(RCFLAGS) $< -o $@
clean: clean:
ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs" ifeq "$(wildcard tool_hugehelp.c.cvs)" "tool_hugehelp.c.cvs"
@$(call DEL, hugehelp.c) @$(call DEL, tool_hugehelp.c)
endif endif
@$(call DEL, $(curl_OBJECTS) $(curlx_OBJECTS) $(RESOURCE)) @$(call DEL, $(curl_OBJECTS) $(curlx_OBJECTS) $(RESOURCE))

8
src/Makefile.netware
View File

@@ -379,8 +379,8 @@ install: $(INSTDIR) all
@$(CP) $(TARGET).nlm $(INSTDIR) @$(CP) $(TARGET).nlm $(INSTDIR)
clean: clean:
ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs" ifeq "$(wildcard tool_hugehelp.c.cvs)" "tool_hugehelp.c.cvs"
-$(RM) hugehelp.c -$(RM) tool_hugehelp.c
endif endif
-$(RM) -r $(OBJDIR) -$(RM) -r $(OBJDIR)
@@ -488,9 +488,9 @@ endif
@echo $(DL)output $(TARGET).nlm$(DL) >> $@ @echo $(DL)output $(TARGET).nlm$(DL) >> $@
endif endif
hugehelp.c: tool_hugehelp.c:
@echo Creating $@ @echo Creating $@
@$(CP) hugehelp.c.cvs $@ @$(CP) tool_hugehelp.c.cvs $@
$(LIBCARES_PATH)/libcares.$(LIBEXT): $(LIBCARES_PATH)/libcares.$(LIBEXT):
$(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib $(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib

12
src/Makefile.vc6
View File

@@ -134,7 +134,6 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
!ENDIF !ENDIF
RELEASE_OBJS= \ RELEASE_OBJS= \
hugehelpr.obj \
nonblockr.obj \ nonblockr.obj \
rawstrr.obj \ rawstrr.obj \
strtoofftr.obj \ strtoofftr.obj \
@@ -157,6 +156,7 @@ RELEASE_OBJS= \
tool_helpr.obj \ tool_helpr.obj \
tool_helpersr.obj \ tool_helpersr.obj \
tool_homedirr.obj \ tool_homedirr.obj \
tool_hugehelpr.obj \
tool_libinfor.obj \ tool_libinfor.obj \
tool_mainr.obj \ tool_mainr.obj \
tool_metalinkr.obj \ tool_metalinkr.obj \
@@ -178,7 +178,6 @@ RELEASE_OBJS= \
curlr.res curlr.res
DEBUG_OBJS= \ DEBUG_OBJS= \
hugehelpd.obj \
nonblockd.obj \ nonblockd.obj \
rawstrd.obj \ rawstrd.obj \
strtoofftd.obj \ strtoofftd.obj \
@@ -201,6 +200,7 @@ DEBUG_OBJS= \
tool_helpd.obj \ tool_helpd.obj \
tool_helpersd.obj \ tool_helpersd.obj \
tool_homedird.obj \ tool_homedird.obj \
tool_hugehelpd.obj \
tool_libinfod.obj \ tool_libinfod.obj \
tool_maind.obj \ tool_maind.obj \
tool_metalinkd.obj \ tool_metalinkd.obj \
@@ -341,8 +341,6 @@ debug: $(DEBUG_OBJS)
$(MANIFESTTOOL) $(MANIFESTTOOL)
## Release ## Release
hugehelpr.obj: hugehelp.c
$(CCR) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c
nonblockr.obj: ../lib/nonblock.c nonblockr.obj: ../lib/nonblock.c
$(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
rawstrr.obj: ../lib/rawstr.c rawstrr.obj: ../lib/rawstr.c
@@ -387,6 +385,8 @@ tool_helpersr.obj: tool_helpers.c
$(CCR) $(CFLAGS) /Fo"$@" tool_helpers.c $(CCR) $(CFLAGS) /Fo"$@" tool_helpers.c
tool_homedirr.obj: tool_homedir.c tool_homedirr.obj: tool_homedir.c
$(CCR) $(CFLAGS) /Fo"$@" tool_homedir.c $(CCR) $(CFLAGS) /Fo"$@" tool_homedir.c
tool_hugehelpr.obj: tool_hugehelp.c
$(CCR) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c
tool_libinfor.obj: tool_libinfo.c tool_libinfor.obj: tool_libinfo.c
$(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c $(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c
tool_mainr.obj: tool_main.c tool_mainr.obj: tool_main.c
@@ -427,8 +427,6 @@ curlr.res : curl.rc
$(RCR) $(RESFLAGS) /Fo"$@" curl.rc $(RCR) $(RESFLAGS) /Fo"$@" curl.rc
## Debug ## Debug
hugehelpd.obj: hugehelp.c
$(CCD) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c
nonblockd.obj: ../lib/nonblock.c nonblockd.obj: ../lib/nonblock.c
$(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
rawstrd.obj: ../lib/rawstr.c rawstrd.obj: ../lib/rawstr.c
@@ -473,6 +471,8 @@ tool_helpersd.obj: tool_helpers.c
$(CCD) $(CFLAGS) /Fo"$@" tool_helpers.c $(CCD) $(CFLAGS) /Fo"$@" tool_helpers.c
tool_homedird.obj: tool_homedir.c tool_homedird.obj: tool_homedir.c
$(CCD) $(CFLAGS) /Fo"$@" tool_homedir.c $(CCD) $(CFLAGS) /Fo"$@" tool_homedir.c
tool_hugehelpd.obj: tool_hugehelp.c
$(CCD) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c
tool_libinfod.obj: tool_libinfo.c tool_libinfod.obj: tool_libinfo.c
$(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c $(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c
tool_maind.obj: tool_main.c tool_maind.obj: tool_main.c

2
src/hugehelp.c.cvs
View File

@@ -1,5 +1,5 @@
#include "tool_setup.h" #include "tool_setup.h"
#include "hugehelp.h" #include "tool_hugehelp.h"
void hugehelp(void) void hugehelp(void)
{ {
puts ( "This is a silly replacement for the actual file."); puts ( "This is a silly replacement for the actual file.");

6
src/hugehelp.h
View File

@@ -1,5 +1,5 @@
#ifndef HEADER_CURL_HUGEHELP_H #ifndef HEADER_CURL_TOOL_HUGEHELP_H
#define HEADER_CURL_HUGEHELP_H #define HEADER_CURL_TOOL_HUGEHELP_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@@ -25,4 +25,4 @@
void hugehelp(void); void hugehelp(void);
#endif /* HEADER_CURL_HUGEHELP_H */ #endif /* HEADER_CURL_TOOL_HUGEHELP_H */

2
src/macos/MACINSTALL.TXT
View File

@@ -1 +1 @@
MACOS (not MACOS X) MACOS (not MACOS X)

8
src/makefile.amiga
View File

@@ -20,12 +20,12 @@ include Makefile.inc
OBJS = $(CURL_CFILES:.c=.o) $(CURLX_ONES:.c=.o) OBJS = $(CURL_CFILES:.c=.o) $(CURLX_ONES:.c=.o)
all: hugehelp.c $(OBJS) all: tool_hugehelp.c $(OBJS)
$(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref $(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref
hugehelp.c: $(README) $(MANPAGE) mkhelp.pl tool_hugehelp.c: $(README) $(MANPAGE) mkhelp.pl
rm -f hugehelp.c rm -f tool_hugehelp.c
/bin/nroff -man $(MANPAGE) | /bin/perl $(MKHELP) -c $(README) > hugehelp.c /bin/nroff -man $(MANPAGE) | /bin/perl $(MKHELP) -c $(README) > tool_hugehelp.c
install: install:
$(INSTALL) -c cURL /c/cURL $(INSTALL) -c cURL /c/cURL

6
src/makefile.dj
View File

@@ -3,7 +3,7 @@
# Gisle Vanem <gvanem@broadpark.no> # Gisle Vanem <gvanem@broadpark.no>
# #
DEPEND_PREREQ = # hugehelp.c DEPEND_PREREQ = # tool_hugehelp.c
top_srcdir = .. top_srcdir = ..
TOPDIR = .. TOPDIR = ..
@@ -46,14 +46,14 @@ $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
# #
# groff 1.18+ requires "-P -c" # groff 1.18+ requires "-P -c"
# #
hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl tool_hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
groff -Tascii -man ../docs/curl.1 | \ groff -Tascii -man ../docs/curl.1 | \
perl -w mkhelp.pl ../docs/MANUAL > $@ perl -w mkhelp.pl ../docs/MANUAL > $@
# clean generated files # clean generated files
# #
genclean: genclean:
- $(DELETE) hugehelp.c - $(DELETE) tool_hugehelp.c
# clean object files and subdir # clean object files and subdir
# #

2
src/mkhelp.pl
View File

@@ -134,7 +134,7 @@ print <<HEAD
* Generation time: $now * Generation time: $now
*/ */
#ifdef USE_MANUAL #ifdef USE_MANUAL
#include "hugehelp.h" #include "tool_hugehelp.h"
HEAD HEAD
; ;
if($c) { if($c) {

2
src/tool_getparam.c
View File

@@ -28,7 +28,7 @@
#include "curlx.h" #include "curlx.h"
#ifdef USE_MANUAL #ifdef USE_MANUAL
# include "hugehelp.h" # include "tool_hugehelp.h"
#endif #endif
#include "tool_binmode.h" #include "tool_binmode.h"

16
src/vc6curlsrc.dsp
View File

@@ -139,10 +139,6 @@ LINK32=link.exe
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\hugehelp.c
# End Source File
# Begin Source File
SOURCE=..\lib\nonblock.c SOURCE=..\lib\nonblock.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -231,6 +227,10 @@ SOURCE=.\tool_homedir.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\tool_hugehelp.c
# End Source File
# Begin Source File
SOURCE=.\tool_libinfo.c SOURCE=.\tool_libinfo.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -311,10 +311,6 @@ SOURCE=".\config-win32.h"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hugehelp.h
# End Source File
# Begin Source File
SOURCE=..\lib\nonblock.h SOURCE=..\lib\nonblock.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -403,6 +399,10 @@ SOURCE=.\tool_homedir.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\tool_hugehelp.h
# End Source File
# Begin Source File
SOURCE=.\tool_libinfo.h SOURCE=.\tool_libinfo.h
# End Source File # End Source File
# Begin Source File # Begin Source File

2
tests/testcurl.pl
View File

@@ -364,7 +364,7 @@ if (-d $CURLDIR) {
logit "$CURLDIR is verified to be a fine git source dir"; logit "$CURLDIR is verified to be a fine git source dir";
# remove the generated sources to force them to be re-generated each # remove the generated sources to force them to be re-generated each
# time we run this test # time we run this test
unlink "$CURLDIR/src/hugehelp.c"; unlink "$CURLDIR/src/tool_hugehelp.c";
# find out if curl source dir has an in-tree c-ares repo # find out if curl source dir has an in-tree c-ares repo
$have_embedded_ares = 1 if (-f "$CURLDIR/ares/GIT-INFO"); $have_embedded_ares = 1 if (-f "$CURLDIR/ares/GIT-INFO");
} elsif (!$git && -f "$CURLDIR/tests/testcurl.pl") { } elsif (!$git && -f "$CURLDIR/tests/testcurl.pl") {

4
winbuild/Makefile.vc
View File

@@ -43,8 +43,8 @@ LIBCURL_OBJS=$(CSOURCES:.c=.obj)
top_srcdir=.. top_srcdir=..
!INCLUDE "../src/Makefile.inc" !INCLUDE "../src/Makefile.inc"
# hugehelp has a special rule # tool_hugehelp has a special rule
CURL_OBJS=$(CURL_CFILES:hugehelp.c=) CURL_OBJS=$(CURL_CFILES:tool_hugehelp.c=)
CURL_OBJS=$(CURL_OBJS:.c=.obj) CURL_OBJS=$(CURL_OBJS:.c=.obj)

6
winbuild/MakefileBuild.vc
View File

@@ -454,7 +454,7 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
!ENDIF !ENDIF
!ENDIF !ENDIF
CURL_FROM_LIBCURL=$(CURL_DIROBJ)\hugehelp.obj \ CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
$(CURL_DIROBJ)\nonblock.obj \ $(CURL_DIROBJ)\nonblock.obj \
$(CURL_DIROBJ)\rawstr.obj \ $(CURL_DIROBJ)\rawstr.obj \
$(CURL_DIROBJ)\strtoofft.obj $(CURL_DIROBJ)\strtoofft.obj
@@ -466,8 +466,8 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
{$(CURL_SRC_DIR)\}.c{$(CURL_DIROBJ)\}.obj: {$(CURL_SRC_DIR)\}.c{$(CURL_DIROBJ)\}.obj:
$(CC) $(CURL_CFLAGS) /Fo"$@" $< $(CC) $(CURL_CFLAGS) /Fo"$@" $<
$(CURL_DIROBJ)\hugehelp.obj: $(CURL_SRC_DIR)\hugehelp.c $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\hugehelp.c $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c
$(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c $(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c
$(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c $(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c