diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8b0f50b162..ec55948f72 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +20000207-22:13 GMT+1 Victor Szakats + * makefile.b32 + ngdoc/* -> utils/hbdoc/* + * NGDOC directory renamed a moved to the right place. + * utils/hbdoc/hbdoc.prg + * Help screen formatted and corrected to be in sync with other Harbour + command-line utilities. + 20000207-20:40 GMT+1 Victor Szakats - common.b32 ft_helpc.b32 diff --git a/harbour/Makefile b/harbour/Makefile index ca5be2e2cd..64ee43ca7e 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -9,7 +9,7 @@ DIRS=\ source \ obj \ tests \ - ngdoc \ + utils \ # samples \ include $(ROOT)config/dir.cf diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index 7940262f6b..1a97a26658 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -26,7 +26,7 @@ OBJ_DIR = obj LIB_DIR = lib\b32 BIN_DIR = bin REGRESS_DIR = tests\regress -HBDOC_DIR = ngdoc +HBDOC_DIR = utils\hbdoc COMMON_LIB = $(LIB_DIR)\common.lib COMMON_LIB_OBJS = $(OBJ_DIR)\hbfsapi.obj \ diff --git a/harbour/ngdoc/harbwww.rps b/harbour/ngdoc/harbwww.rps deleted file mode 100644 index 2f3cc67336..0000000000 --- a/harbour/ngdoc/harbwww.rps +++ /dev/null @@ -1,126 +0,0 @@ -..\source\rdd\dbcmd.c -..\source\rtl\achoice.prg -..\source\rtl\adir.prg -..\source\rtl\alert.prg -..\source\rtl\arrays.c -..\source\rtl\asort.prg -..\source\rtl\binnum.c -..\source\rtl\break.c -..\source\rtl\browdb.prg -..\source\rtl\browse.prg -..\source\rtl\classes.c -..\source\rtl\codebloc.c -..\source\rtl\console.c -..\source\rtl\copyfile.c -..\source\rtl\dates.c -..\source\rtl\dbedit.prg -..\source\rtl\descend.c -..\source\rtl\devoutp.prg -..\source\rtl\dir.c -..\source\rtl\dircmd.prg -..\source\rtl\do.c -..\source\rtl\dummy.prg -..\source\rtl\empty.c -..\source\rtl\environ.c -..\source\rtl\errorapi.c -..\source\rtl\errorsys.prg -..\source\rtl\extend.c -..\source\rtl\fieldbl.prg -..\source\rtl\filesys.c -..\source\rtl\fm.c -..\source\rtl\gtapi.c -..\source\rtl\gtxxx.c -..\source\rtl\harbinit.prg -..\source\rtl\hardcr.c -..\source\rtl\initexit.c -..\source\rtl\inkey.c -..\source\rtl\input.prg -..\source\rtl\isprint.c -..\source\rtl\itemapi.c -..\source\rtl\langapi.c -..\source\rtl\len.c -..\source\rtl\license.prg -..\source\rtl\math.c -..\source\rtl\memofile.c -..\source\rtl\memoline.c -..\source\rtl\memvarbl.prg -..\source\rtl\memvars.c -..\source\rtl\menuto.prg -..\source\rtl\mlcount.c -..\source\rtl\mlpos.c -..\source\rtl\mouseapi.c -..\source\rtl\mousexxx.c -..\source\rtl\msgxxx.c -..\source\rtl\mtran.c -..\source\rtl\natmsg.c -..\source\rtl\net.c -..\source\rtl\objfunc.prg -..\source\rtl\oemansi.c -..\source\rtl\oldbox.c -..\source\rtl\oldclear.c -..\source\rtl\pcount.c -..\source\rtl\proc.c -..\source\rtl\pvalue.c -..\source\rtl\readkey.prg -..\source\rtl\readme.prg -..\source\rtl\readvar.prg -..\source\rtl\samples.c -..\source\rtl\set.c -..\source\rtl\setcolor.c -..\source\rtl\setfunc.prg -..\source\rtl\setkey.prg -..\source\rtl\setta.prg -..\source\rtl\soundex.c -..\source\rtl\strings.c -..\source\rtl\tbcolumn.prg -..\source\rtl\tbrowse.prg -..\source\rtl\tclass.prg -..\source\rtl\terror.prg -..\source\rtl\text.prg -..\source\rtl\tget.prg -..\source\rtl\tgetlist.prg -..\source\rtl\tone.c -..\source\rtl\trace.c -..\source\rtl\transfrm.c -..\source\rtl\type.c -..\source\rtl\valtype.c -..\source\rtl\wait.prg -..\source\rtl\word.c -..\source\rtl\xhelp.c -..\source\rtl\xsavescr.prg -..\source\tools\asciisum.c -..\source\tools\ascpos.c -..\source\tools\atdiff.c -..\source\tools\chareven.c -..\source\tools\charmix.c -..\source\tools\charodd.c -..\source\tools\chrcount.c -..\source\tools\chrfirst.c -..\source\tools\chrtotal.c -..\source\tools\ctchksum.c -..\source\tools\ctchrmix.c -..\source\tools\ctcrypt.c -..\source\tools\dates2.c -..\source\tools\datesx.c -..\source\tools\fileread.prg -..\source\tools\hb_f.c -..\source\tools\html.prg -..\source\tools\io.c -..\source\tools\mathx.c -..\source\tools\nconvert.prg -..\source\tools\numtxten.prg -..\source\tools\numtxthu.prg -..\source\tools\rtf.prg -..\source\tools\ng.prg -..\source\tools\strasint.c -..\source\tools\strcount.c -..\source\tools\strcspn.c -..\source\tools\strdiff.c -..\source\tools\strexpan.c -..\source\tools\strfmt.c -..\source\tools\stringp.prg -..\source\tools\stringsx.c -..\source\tools\strleft.c -..\source\tools\strpbrk.c -..\source\tools\strright.c -..\doc\subcodes.txt diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile new file mode 100644 index 0000000000..ab272c25a5 --- /dev/null +++ b/harbour/utils/Makefile @@ -0,0 +1,10 @@ +# +# $Id$ +# + +ROOT = ../ + +DIRS=\ + hbdoc \ + +include $(ROOT)config/dir.cf diff --git a/harbour/ngdoc/makefile b/harbour/utils/hbdoc/Makefile similarity index 95% rename from harbour/ngdoc/makefile rename to harbour/utils/hbdoc/Makefile index 7704fd052f..d11f8913eb 100644 --- a/harbour/ngdoc/makefile +++ b/harbour/utils/hbdoc/Makefile @@ -6,7 +6,7 @@ ifeq ($(HB_MAIN),) HB_MAIN = std endif -ROOT = ../ +ROOT = ../../ PRG_SOURCES=\ hbdoc.prg diff --git a/harbour/ngdoc/ha.lnk b/harbour/utils/hbdoc/ha.lnk similarity index 100% rename from harbour/ngdoc/ha.lnk rename to harbour/utils/hbdoc/ha.lnk diff --git a/harbour/ngdoc/harbour.lnk b/harbour/utils/hbdoc/harbour.lnk similarity index 100% rename from harbour/ngdoc/harbour.lnk rename to harbour/utils/hbdoc/harbour.lnk diff --git a/harbour/ngdoc/harbour.rsp b/harbour/utils/hbdoc/harbour.rsp similarity index 100% rename from harbour/ngdoc/harbour.rsp rename to harbour/utils/hbdoc/harbour.rsp diff --git a/harbour/utils/hbdoc/harbwww.rps b/harbour/utils/hbdoc/harbwww.rps new file mode 100644 index 0000000000..8c3f4ef900 --- /dev/null +++ b/harbour/utils/hbdoc/harbwww.rps @@ -0,0 +1,126 @@ +..\..\source\rdd\dbcmd.c +..\..\source\rtl\achoice.prg +..\..\source\rtl\adir.prg +..\..\source\rtl\alert.prg +..\..\source\rtl\arrays.c +..\..\source\rtl\asort.prg +..\..\source\rtl\binnum.c +..\..\source\rtl\break.c +..\..\source\rtl\browdb.prg +..\..\source\rtl\browse.prg +..\..\source\rtl\classes.c +..\..\source\rtl\codebloc.c +..\..\source\rtl\console.c +..\..\source\rtl\copyfile.c +..\..\source\rtl\dates.c +..\..\source\rtl\dbedit.prg +..\..\source\rtl\descend.c +..\..\source\rtl\devoutp.prg +..\..\source\rtl\dir.c +..\..\source\rtl\dircmd.prg +..\..\source\rtl\do.c +..\..\source\rtl\dummy.prg +..\..\source\rtl\empty.c +..\..\source\rtl\environ.c +..\..\source\rtl\errorapi.c +..\..\source\rtl\errorsys.prg +..\..\source\rtl\extend.c +..\..\source\rtl\fieldbl.prg +..\..\source\rtl\filesys.c +..\..\source\rtl\fm.c +..\..\source\rtl\gtapi.c +..\..\source\rtl\gtxxx.c +..\..\source\rtl\harbinit.prg +..\..\source\rtl\hardcr.c +..\..\source\rtl\initexit.c +..\..\source\rtl\inkey.c +..\..\source\rtl\input.prg +..\..\source\rtl\isprint.c +..\..\source\rtl\itemapi.c +..\..\source\rtl\langapi.c +..\..\source\rtl\len.c +..\..\source\rtl\license.prg +..\..\source\rtl\math.c +..\..\source\rtl\memofile.c +..\..\source\rtl\memoline.c +..\..\source\rtl\memvarbl.prg +..\..\source\rtl\memvars.c +..\..\source\rtl\menuto.prg +..\..\source\rtl\mlcount.c +..\..\source\rtl\mlpos.c +..\..\source\rtl\mouseapi.c +..\..\source\rtl\mousexxx.c +..\..\source\rtl\msgxxx.c +..\..\source\rtl\mtran.c +..\..\source\rtl\natmsg.c +..\..\source\rtl\net.c +..\..\source\rtl\objfunc.prg +..\..\source\rtl\oemansi.c +..\..\source\rtl\oldbox.c +..\..\source\rtl\oldclear.c +..\..\source\rtl\pcount.c +..\..\source\rtl\proc.c +..\..\source\rtl\pvalue.c +..\..\source\rtl\readkey.prg +..\..\source\rtl\readme.prg +..\..\source\rtl\readvar.prg +..\..\source\rtl\samples.c +..\..\source\rtl\set.c +..\..\source\rtl\setcolor.c +..\..\source\rtl\setfunc.prg +..\..\source\rtl\setkey.prg +..\..\source\rtl\setta.prg +..\..\source\rtl\soundex.c +..\..\source\rtl\strings.c +..\..\source\rtl\tbcolumn.prg +..\..\source\rtl\tbrowse.prg +..\..\source\rtl\tclass.prg +..\..\source\rtl\terror.prg +..\..\source\rtl\text.prg +..\..\source\rtl\tget.prg +..\..\source\rtl\tgetlist.prg +..\..\source\rtl\tone.c +..\..\source\rtl\trace.c +..\..\source\rtl\transfrm.c +..\..\source\rtl\type.c +..\..\source\rtl\valtype.c +..\..\source\rtl\wait.prg +..\..\source\rtl\word.c +..\..\source\rtl\xhelp.c +..\..\source\rtl\xsavescr.prg +..\..\source\tools\asciisum.c +..\..\source\tools\ascpos.c +..\..\source\tools\atdiff.c +..\..\source\tools\chareven.c +..\..\source\tools\charmix.c +..\..\source\tools\charodd.c +..\..\source\tools\chrcount.c +..\..\source\tools\chrfirst.c +..\..\source\tools\chrtotal.c +..\..\source\tools\ctchksum.c +..\..\source\tools\ctchrmix.c +..\..\source\tools\ctcrypt.c +..\..\source\tools\dates2.c +..\..\source\tools\datesx.c +..\..\source\tools\fileread.prg +..\..\source\tools\hb_f.c +..\..\source\tools\html.prg +..\..\source\tools\io.c +..\..\source\tools\mathx.c +..\..\source\tools\nconvert.prg +..\..\source\tools\numtxten.prg +..\..\source\tools\numtxthu.prg +..\..\source\tools\rtf.prg +..\..\source\tools\ng.prg +..\..\source\tools\strasint.c +..\..\source\tools\strcount.c +..\..\source\tools\strcspn.c +..\..\source\tools\strdiff.c +..\..\source\tools\strexpan.c +..\..\source\tools\strfmt.c +..\..\source\tools\stringp.prg +..\..\source\tools\stringsx.c +..\..\source\tools\strleft.c +..\..\source\tools\strpbrk.c +..\..\source\tools\strright.c +..\..\doc\subcodes.txt diff --git a/harbour/ngdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg similarity index 99% rename from harbour/ngdoc/hbdoc.prg rename to harbour/utils/hbdoc/hbdoc.prg index b88d5ef122..28f9e52d1d 100644 --- a/harbour/ngdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -226,21 +226,26 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // Get the linkfile name and get the info in it IF cLinkName = NIL - ? "Syntax: HBDOC -txt|-con|-ngi|-doc|-HPC|-RTF|-HTM|-OS2|-TRF []" - ? " Where -txt creates an ascii file instead of a Norton Guide" - ? " -con creates an ascii file without formfeeds" - ? " -HPC Helpc source file" - ? " -Ngi adds the -NG switch to EHC command for compile FOR DOS/WINDOWS/LINUX." - ? " -RTF Winhelp source Code For Windows" - ? " -OS2 OS2 help Source Code For OS2" - ? " -HTM Generate HTML Output FOR WINDOWS/LINUX/OS2/MAC" - ? " -TRF Gerenate Linux TROFF code" - ? " -DOC creates continuous ascii file w/o author information" + ? "Harbour Doc Extractor" + ? "Copyright 1999-2000, http://www.harbour-project.org" + ? "" + ? "Syntax: hbdoc [options] []" + ? "" + ? "Options: -txt Create an ASCII file instead of a Norton Guide" + ? " -con Create an ASCII file without formfeeds" + ? " -hpc Helpc source file" + ? " -ngi Adds the -NG switch to EHC command for compile for" + ? " DOS/Windows/Linux." + ? " -rtf Winhelp source code for Windows" + ? " -os2 OS/2 help source code For OS/2" + ? " -htm Generate HTML output" + ? " -trf Gerenate Linux TROFF code" + ? " -doc Create continuous ASCII file w/o author information" ? " " - ? " NOTE: -txt,-con,-hpc,-ngi,-rtf,-os2,-htm,-trf and -doc cannot be used together." - ? " linkname is the name of the Norton Guide Link file" - ? " iFile is a file containing a list of files to process" - ? " otherwise *.PRG, *.C, *.ASM and *.CH are used" + ? "Notes: - Only one option can be specified at a time." + ? " - is the name of the Norton Guide Link file." + ? " - is a file containing a list of files to process" + ? " otherwise *.prg, *.c, *.asm and *.ch are used." RETURN NIL ENDIF diff --git a/harbour/ngdoc/makewww.bat b/harbour/utils/hbdoc/makewww.bat similarity index 100% rename from harbour/ngdoc/makewww.bat rename to harbour/utils/hbdoc/makewww.bat