diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dd42238c3f..247833ffd2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-07 11:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/pp/hbpp.c + * utils/hbdoc/hbdoc.prg + * utils/hbmake/hbmake.prg + * utils/hbtest/hbtest.prg + * Synced help screen, header and copyright layout. + 2008-08-07 10:11 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbodbc/odbc.c ! Replaced depracated ODBC API calls to new ones, thus diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c index cfe9d802a3..64ea731f62 100644 --- a/harbour/source/pp/hbpp.c +++ b/harbour/source/pp/hbpp.c @@ -570,7 +570,7 @@ int main( int argc, char * argv[] ) printf( "Harbour Preprocessor %d.%d.%d\n", HB_VER_MAJOR, HB_VER_MINOR, HB_VER_REVISION ); - printf( "Copyright 1999-2008, http://www.harbour-project.org\n" ); + printf( "Copyright (c) 1999-2008, http://www.harbour-project.org/\n" ); pState = hb_pp_new(); diff --git a/harbour/utils/hbdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg index 6bcc59f18f..f4b198af0a 100644 --- a/harbour/utils/hbdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -276,27 +276,27 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF cLinkName = NIL outstd( "Harbour Doc Extractor"+ hb_osnewline() ) - outstd( "Copyright 1999-2008, http://www.harbour-project.org"+ hb_osnewline() ) + outstd( "Copyright (c) 1999-2008, http://www.harbour-project.org/"+ hb_osnewline() ) outstd( ""+ hb_osnewline() ) outstd( "Syntax: hbdoc [options] []"+ hb_osnewline() ) outstd( ""+ hb_osnewline() ) - outstd( "Options: /txt Create an ASCII file instead of a Norton Guide"+ hb_osnewline() ) - outstd( " /con Create an ASCII file without form feeds"+ hb_osnewline() ) - outstd( " /hpc Helpc source file"+ hb_osnewline() ) - outstd( " /ngi Add the -NG switch to EHC command to compile for"+ hb_osnewline() ) + outstd( "Options: -txt Create an ASCII file instead of a Norton Guide"+ hb_osnewline() ) + outstd( " -con Create an ASCII file without form feeds"+ hb_osnewline() ) + outstd( " -hpc Helpc source file"+ hb_osnewline() ) + outstd( " -ngi Add the -NG switch to EHC command to compile for"+ hb_osnewline() ) outstd( " DOS/Windows/Linux."+ hb_osnewline() ) - outstd( " /rtf Winhelp source code for Windows"+ hb_osnewline() ) - outstd( " /os2 OS/2 help source code for OS/2"+ hb_osnewline() ) - outstd( " /htm Generate HTML output"+ hb_osnewline() ) - outstd( " /ht2 Generate HTML output (new doc model)"+ hb_osnewline() ) - outstd( " /chm Generate HTML source files for Windows .chm help files"+ hb_osnewline() ) - outstd( " /ch2 Generate HTML source files for Windows .chm help files"+ hb_osnewline() ) + outstd( " -rtf Winhelp source code for Windows"+ hb_osnewline() ) + outstd( " -os2 OS/2 help source code for OS/2"+ hb_osnewline() ) + outstd( " -htm Generate HTML output"+ hb_osnewline() ) + outstd( " -ht2 Generate HTML output (new doc model)"+ hb_osnewline() ) + outstd( " -chm Generate HTML source files for Windows .chm help files"+ hb_osnewline() ) + outstd( " -ch2 Generate HTML source files for Windows .chm help files"+ hb_osnewline() ) outstd( " (new doc model)"+ hb_osnewline() ) #ifdef HBDOC_PDF - outstd( " /pdf Generate an Adobe Portable Document (.pdf)"+ hb_osnewline() ) + outstd( " -pdf Generate an Adobe Portable Document (.pdf)"+ hb_osnewline() ) #endif - outstd( " /trf Generate Linux TROFF code"+ hb_osnewline() ) - outstd( " /doc Create continuous ASCII file without author information"+ hb_osnewline() ) + outstd( " -trf Generate Linux TROFF code"+ hb_osnewline() ) + outstd( " -doc Create continuous ASCII file without author information"+ hb_osnewline() ) outstd( " "+ hb_osnewline() ) outstd( "Notes: - Only one option can be specified at a time."+ hb_osnewline() ) outstd( " - is the name of the Norton Guide Link file."+ hb_osnewline() ) diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 769a93f886..997b3d32ea 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -5870,25 +5870,24 @@ FUNCTION ShowHelp() OutStd( HbMake_ID() + HB_OSNewLine() +; HbMake_Copyright() + HB_OSNewLine() +; HB_OSNewLine() +; - "Syntax: hbmake [switches]" + HB_OSNewLine() +; + "Syntax: hbmake [options]" + HB_OSNewLine() +; HB_OSNewLine() +; - "Switches:" + HB_OSNewLine() +; - " -b Use BCC as the C compiler. This options is default under Win32" + HB_OSNewLine() +; - " -g Use GCC as the C compiler. This options is default under OS/2" + HB_OSNewLine() +; - " -gl Use GCC as the C compiler on Linux" + HB_OSNewLine() +; - " -v Use MSVC as the C compiler" + HB_OSNewLine() +; - " -D Define a macro. Multiple macros can be used in a single line" + HB_OSNewLine() +; - " Ex: -DOBJ=c.obj;d.obj" + HB_OSNewLine() +; - " Multiple -D is also supported" + HB_OSNewLine() +; - " -p Print all commands and defines" + HB_OSNewLine() +; - " -f Force all files to be rebuilt" + HB_OSNewLine() +; - " -e Open the editor mode" + HB_OSNewLine() +; - " -ec create/edit and compile (only for a unique prg)" + HB_OSNewLine() +; - " -ex Open the editor mode in extended mode" + HB_OSNewLine() +; - " -el Open the editor mode for creating libraries" + HB_OSNewLine() +; - " -elx Open the editor mode for creating libraries in extended mode" + HB_OSNewLine() +; - " -i Ignore errors returned by commands" + HB_OSNewLine() +; - " -r Recurse directories for source code" + HB_OSNewLine() +; + "Options: -b Use BCC as the C compiler. This options is default under Win32" + HB_OSNewLine() +; + " -g Use GCC as the C compiler. This options is default under OS/2" + HB_OSNewLine() +; + " -gl Use GCC as the C compiler on Linux" + HB_OSNewLine() +; + " -v Use MSVC as the C compiler" + HB_OSNewLine() +; + " -D Define a macro. Multiple macros can be used in a single line" + HB_OSNewLine() +; + " Ex: -DOBJ=c.obj;d.obj" + HB_OSNewLine() +; + " Multiple -D is also supported" + HB_OSNewLine() +; + " -p Print all commands and defines" + HB_OSNewLine() +; + " -f Force all files to be rebuilt" + HB_OSNewLine() +; + " -e Open the editor mode" + HB_OSNewLine() +; + " -ec create/edit and compile (only for a unique prg)" + HB_OSNewLine() +; + " -ex Open the editor mode in extended mode" + HB_OSNewLine() +; + " -el Open the editor mode for creating libraries" + HB_OSNewLine() +; + " -elx Open the editor mode for creating libraries in extended mode" + HB_OSNewLine() +; + " -i Ignore errors returned by commands" + HB_OSNewLine() +; + " -r Recurse directories for source code" + HB_OSNewLine() +; HB_OSNewLine() +; "Note: Linked with " + Version() + HB_OSNewLine() ) @@ -5897,12 +5896,12 @@ RETURN NIL *------------------- FUNCTION HbMake_ID() *------------------- -RETURN ( "HBMake v"+s_cHbMakeVersion+" - Harbour Make Utility") +RETURN "Harbour Make Utility " + s_cHbMakeVersion *-------------------------- FUNCTION HbMake_Copyright() *-------------------------- -RETURN ( "Copyright (C) 2000-2008 Harbour project - http://www.harbour-project.org") +RETURN "Copyright (c) 2000-2008, http://www.harbour-project.org/" *--------------------- FUNCTION ShowCredits() diff --git a/harbour/utils/hbtest/hbtest.prg b/harbour/utils/hbtest/hbtest.prg index e4e93f0cc1..5e7cfd794b 100644 --- a/harbour/utils/hbtest/hbtest.prg +++ b/harbour/utils/hbtest/hbtest.prg @@ -102,7 +102,7 @@ STATIC s_nEndTime PROCEDURE Main( cPar1, cPar2 ) OutStd( "Harbour Regression Test Suite" + HB_OSNewLine() +; - "Copyright 1999-2008, http://www.harbour-project.org" + HB_OSNewLine() ) + "Copyright (c) 1999-2008, http://www.harbour-project.org/" + HB_OSNewLine() ) IF cPar1 == NIL cPar1 := "" @@ -119,9 +119,9 @@ PROCEDURE Main( cPar1, cPar2 ) OutStd( HB_OSNewLine() +; "Syntax: hbtest [options]" + HB_OSNewLine() +; HB_OSNewLine() +; - "Options: /h, /? Display this help." + HB_OSNewLine() +; - " /all Display all tests, not only the failures." + HB_OSNewLine() +; - " /skip: Skip the listed test numbers." + HB_OSNewLine() ) + "Options: -h, -? Display this help." + HB_OSNewLine() +; + " -all Display all tests, not only the failures." + HB_OSNewLine() +; + " -skip: Skip the listed test numbers." + HB_OSNewLine() ) RETURN ENDIF