From 8fb64a9c0ce17626b5fb4b40de2de1043fe78d35 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 15 Jan 2009 01:39:54 +0000 Subject: [PATCH] 2009-01-15 00:46 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/pp/hbpp.c * utils/hbdoc/hbdoc.prg * utils/hbmake/hbmake.prg * utils/hbtest/hbtest.prg * utils/hbrun/hbrun.prg * More copyrights bumped to 2009. --- harbour/ChangeLog | 13 +- harbour/source/pp/hbpp.c | 4 +- harbour/utils/hbdoc/hbdoc.prg | 344 ++++++++++++++++---------------- harbour/utils/hbmake/hbmake.prg | 2 +- harbour/utils/hbrun/hbrun.prg | 2 +- harbour/utils/hbtest/hbtest.prg | 4 +- 6 files changed, 188 insertions(+), 181 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b40303fd99..e4a27ad15d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-01-15 00:46 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/pp/hbpp.c + * utils/hbdoc/hbdoc.prg + * utils/hbmake/hbmake.prg + * utils/hbtest/hbtest.prg + * utils/hbrun/hbrun.prg + * More copyrights bumped to 2009. + 2009-01-15 03:20 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/include/hbcomp.h * harbour/include/hbcompdf.h @@ -57,7 +65,6 @@ 2009-01-14 16:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/rtl/net.c - * contrib/hbziparc/hbziparc.prg * contrib/hbct/files.c * Minor formatting. @@ -168,8 +175,8 @@ * include/hbextern.ch * source/rtl/philes.c - + HB_FSETATTR( , @ ) -> - + HB_FGETATTR( , ) -> + + HB_FGETATTR( , @ ) -> + + HB_FSETATTR( , ) -> + HB_FSETDATETIME( , [], [] ) -> * source/rtl/direct.c diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c index e65b98608f..08c1a317c4 100644 --- a/harbour/source/pp/hbpp.c +++ b/harbour/source/pp/hbpp.c @@ -357,7 +357,7 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL " * Harbour Project source code:\n" " * Version information and build time switches.\n" " *\n" - " * Copyright 2008 Przemyslaw Czerpak \n" + " * Copyright 2008-2009 Przemyslaw Czerpak \n" " * www - http://www.harbour-project.org\n" " *\n" " * This file is generated automatically by Harbour preprocessor\n" @@ -487,7 +487,7 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName, } else if( !*szLog ) { - if( szLine[ 4 ] == '-' && szLine[ 7 ] == '-' && + if( szLine[ 4 ] == '-' && szLine[ 7 ] == '-' && szLine[ 10 ] == ' ' && szLine[ 13 ] == ':' ) { int iLen; diff --git a/harbour/utils/hbdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg index 687272933d..c4c96f43ec 100644 --- a/harbour/utils/hbdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id$ */ /* @@ -126,7 +126,7 @@ MEMVAR aDirList MEMVAR aDocInfo MEMVAR aDocwwwInfo -MEMVAR aClassList +MEMVAR aClassList MEMVAR aLinkInfo MEMVAR aAuthorList MEMVAR lAscii @@ -138,15 +138,15 @@ MEMVAR lNgi MEMVAR lOs2 MEMVAR lPdf MEMVAR lWww -MEMVAR lWww2 +MEMVAR lWww2 MEMVAR lChm -MEMVAR lChm2 +MEMVAR lChm2 MEMVAR lNorton MEMVAR aWWW MEMVAR lTroff MEMVAR aResult MEMVAR theHandle - + STATIC cTitle:="" /* @@ -169,34 +169,34 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) LOCAL nItem LOCAL nHpj LOCAL cItem:="" - LOCAL cFName + LOCAL cFName LOCAL cLName - LOCAL aName - LOCAL nLen + LOCAL aName + LOCAL nLen LOCAL lDone LOCAL cMI LOCAL oHtmIndex LOCAL cFileName - + LOCAL cCompiler // Compiler type LOCAL oHtm LOCAL oHtm1 - + LOCAL nPos LOCAL ppp LOCAL aMetaContents:={} Local aTemp:={} LOCAL lAdded:=.F. Local aRtfid - + LOCAL nCount_1 := 1 - LOCAL nCount_2 := 1 + LOCAL nCount_2 := 1 PUBLIC theHandle PUBLIC aDirList PUBLIC aDocInfo := {} PUBLIC aDocWwwInfo := {} - PUBLIC aClassList := {} + PUBLIC aClassList := {} PUBLIC aLinkInfo := {} PUBLIC aAuthorList := {} PUBLIC lAscii := .F. // Create ascii output instead of NG/EH input @@ -231,7 +231,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // See if flag is there - IF .NOT. EMPTY( cFlags ) + IF .NOT. EMPTY( cFlags ) IF LEFT( cFlags, 1 ) == "-" .OR. LEFT( cFlags, 1 ) == "/" IF ( cFlags := UPPER( RIGHT( cFlags, 3 ) ) ) == "TXT" lAscii := .T. @@ -273,7 +273,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF cLinkName == NIL outstd( "Harbour Doc Extractor " + HBRawVersion() + hb_osnewline() ) - outstd( "Copyright (c) 1999-2008, http://www.harbour-project.org/"+ hb_osnewline() ) + outstd( "Copyright (c) 1999-2009, http://www.harbour-project.org/"+ hb_osnewline() ) outstd( ""+ hb_osnewline() ) outstd( "Syntax: hbdoc [options] []"+ hb_osnewline() ) outstd( ""+ hb_osnewline() ) @@ -285,10 +285,10 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) 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( " -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() ) + outstd( " (new doc model)"+ hb_osnewline() ) #ifdef HBDOC_PDF outstd( " -pdf Generate an Adobe Portable Document (.pdf)"+ hb_osnewline() ) #endif @@ -641,9 +641,9 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ohtm:=THTML():new("htm\hb"+strtran(citem," ","")+".htm",aMetaContents) ohtm:WriteText("

"+adocinfo[1,1]+"


") ohtm:WriteText("") - + for ppp:=1 to len(adocinfo) - + if citem ==adocinfo[ppp,1] oHtm:WritelinkTable(adocinfo[ppp,4],adocinfo[ppp,2],adocinfo[ppp,3]) else @@ -745,50 +745,50 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ELSEIF lWww2 cFileName := "index.htm" oHtmIndex := THTML():New("htm\" + cFileName) - + // Add title to HTML oHtmIndex:WriteText("Harbour - Reference Guide") - + // Add CSS to the HTML - oHtmIndex:WriteText("") - + oHtmIndex:WriteText("
Harbour Reference Guide
") - + ASORT(aDocInfo,,, {|x, y| UPPER(x[1]) < UPPER(y[1])}) - + oHtmIndex:WriteText("
Alphabetical list of classes
") oHtmIndex:WriteText("
") FOR i := 1 TO LEN(aDocInfo) - IF aDocInfo[i][3] = "C1" + IF aDocInfo[i][3] = "C1" oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") - END IF + END IF NEXT oHtmIndex:WriteText("
") - + oHtmIndex:WriteText("
Alphabetical list of functions
") oHtmIndex:WriteText("
") FOR i := 1 TO LEN(aDocInfo) - IF aDocInfo[i][3] = "F1" + IF aDocInfo[i][3] = "F1" oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") ENDIF NEXT - oHtmIndex:WriteText("
") + oHtmIndex:WriteText("") - oHtmIndex:WriteText("
Alphabetical list of WinAPI functions
") + oHtmIndex:WriteText("
Alphabetical list of WinAPI functions
") oHtmIndex:WriteText("
") FOR i := 1 TO LEN(aDocInfo) - IF aDocInfo[i][3] = "F2" + IF aDocInfo[i][3] = "F2" oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") - END IF + END IF NEXT oHtmIndex:WriteText("
") oHtmIndex:WriteText("") ELSEIF lChm - + nHpj := FCREATE( "chm\"+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) FWRITE( nHpj, "[OPTIONS]" + CRLF ) @@ -917,54 +917,54 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) oHtm:WriteText( "" ) ohtm:WriteText("") ohtm:close() - - ELSEIF lChm2 - cFileName := "index.htm" - oHtmIndex := THTML():New("chm\" + cFileName) - - // Add title to HTML - oHtmIndex:WriteText("Harbour - Reference Guide") - - // Add CSS to the HTML - oHtmIndex:WriteText("") - - oHtmIndex:WriteText("
Harbour Reference Guide
") - - ASORT(aDocInfo,,, {|x, y| x[1] < y[1]}) - - oHtmIndex:WriteText("
Alphabetical list of classes
") - oHtmIndex:WriteText("
") - FOR i := 1 TO LEN(aDocInfo) - IF aDocInfo[i][3] = "C1" - oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") - END IF - NEXT - oHtmIndex:WriteText("
") - oHtmIndex:WriteText("
Alphabetical list of functions
") - oHtmIndex:WriteText("
") + ELSEIF lChm2 + cFileName := "index.htm" + oHtmIndex := THTML():New("chm\" + cFileName) + + // Add title to HTML + oHtmIndex:WriteText("Harbour - Reference Guide") + + // Add CSS to the HTML + oHtmIndex:WriteText("") + + oHtmIndex:WriteText("
Harbour Reference Guide
") + + ASORT(aDocInfo,,, {|x, y| x[1] < y[1]}) + + oHtmIndex:WriteText("
Alphabetical list of classes
") + oHtmIndex:WriteText("
") FOR i := 1 TO LEN(aDocInfo) - IF aDocInfo[i][3] = "F1" - oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") - END IF - NEXT + IF aDocInfo[i][3] = "C1" + oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") + END IF + NEXT oHtmIndex:WriteText("
") - oHtmIndex:WriteText("
Alphabetical list of WinAPI functions
") - oHtmIndex:WriteText("
") + oHtmIndex:WriteText("
Alphabetical list of functions
") + oHtmIndex:WriteText("
") FOR i := 1 TO LEN(aDocInfo) - IF aDocInfo[i][3] = "F2" - oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") - END IF - NEXT - oHtmIndex:WriteText("
") - oHtmIndex:WriteText("") + IF aDocInfo[i][3] = "F1" + oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") + END IF + NEXT + oHtmIndex:WriteText("
") - nHpj := FCREATE("chm\" + LOWER(SUBSTR(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) + oHtmIndex:WriteText("
Alphabetical list of WinAPI functions
") + oHtmIndex:WriteText("
") + FOR i := 1 TO LEN(aDocInfo) + IF aDocInfo[i][3] = "F2" + oHtmIndex:WriteText("» " + aDocInfo[i][1] + "
") + END IF + NEXT + oHtmIndex:WriteText("
") + oHtmIndex:WriteText("") + + nHpj := FCREATE("chm\" + LOWER(SUBSTR(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) FWRITE( nHpj, "[OPTIONS]" + CRLF ) FWRITE( nHpj, "Compatibility=1.1 or later"+CRLF) FWRITE( nHpj, "Auto Index=Yes"+CRLF) @@ -985,163 +985,163 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) Next FCLOSE( nHpj ) - - oHtm:=THTML():NewContent("chm\"+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc") + + oHtm:=THTML():NewContent("chm\"+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc") oHtm:WriteText("") oHtm:Addobject("text/site properties") oHtm:AddParam("FrameName","Ajuda") oHtm:EndObject() oHtm:WriteText("
    ") - oHtm:ListItem() + oHtm:ListItem() oHtm:AddObject("text/sitemap") oHtm:AddParam("Name","Harbour Reference Guide") oHtm:EndObject() oHtm:WriteText("
      ") - oHtm:ListItem() + oHtm:ListItem() oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", "Alphabetical list of classes") oHtm:AddParam("Local", "index.htm") - oHtm:EndObject() - oHtm:WriteText("
        ") + oHtm:EndObject() + oHtm:WriteText("
          ") ASORT(aDocInfo,,, {|x, y| UPPER(x[1]) < UPPER(y[1])}) - nCount_1 := 1 - DO WHILE nCount_1 <= LEN(aDocInfo) - IF aDocInfo[nCount_1][3] = "C1" - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + nCount_1 := 1 + DO WHILE nCount_1 <= LEN(aDocInfo) + IF aDocInfo[nCount_1][3] = "C1" + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", aDocInfo[nCount_1][1]) oHtm:AddParam("Local", aDocInfo[nCount_1][2]) oHtm:EndObject() - oHtm:WriteText("
            ") - + oHtm:WriteText("
              ") - IF LEN(aDocInfo[nCount_1][4]) > 0 - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + + IF LEN(aDocInfo[nCount_1][4]) > 0 + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", "Methods") oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                ") - ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) - nCount_2 := 1 + ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) + nCount_2 := 1 DO WHILE nCount_2 <= LEN(aDocInfo[nCount_1][4]) - IF aDocInfo[nCount_1][4][nCount_2, 1] = "Method" - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + IF aDocInfo[nCount_1][4][nCount_2, 1] = "Method" + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() - ENDIF - - nCount_2 ++ - ENDDO - oHtm:WriteText("
              ") - ENDIF + ENDIF - IF LEN(aDocInfo[nCount_1][4]) > 0 - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + nCount_2 ++ + ENDDO + oHtm:WriteText("
            ") + ENDIF + + IF LEN(aDocInfo[nCount_1][4]) > 0 + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", "Properties") oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
              ") - ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) - nCount_2 := 1 + ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) + nCount_2 := 1 DO WHILE nCount_2 <= LEN(aDocInfo[nCount_1][4]) - IF aDocInfo[nCount_1][4][nCount_2, 1] = "Data" - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + IF aDocInfo[nCount_1][4][nCount_2, 1] = "Data" + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() - ENDIF - - nCount_2 ++ - ENDDO + ENDIF + + nCount_2 ++ + ENDDO oHtm:WriteText("
            ") - ENDIF + ENDIF oHtm:WriteText("
          ") - ENDIF - nCount_1 ++ - ENDDO + ENDIF + nCount_1 ++ + ENDDO oHtm:WriteText("
        ") - // WinAPI functions - oHtm:ListItem() + // WinAPI functions + oHtm:ListItem() oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", "Alphabetical list of WinAPI functions") oHtm:AddParam("Local", "index.htm") - oHtm:EndObject() - oHtm:WriteText("
          ") + oHtm:EndObject() + oHtm:WriteText("
            ") ASORT(aDocInfo,,, {|x, y| UPPER(x[1]) < UPPER(y[1])}) - nCount_1 := 1 - DO WHILE nCount_1 <= LEN(aDocInfo) - IF aDocInfo[nCount_1][3] = "F2" - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + nCount_1 := 1 + DO WHILE nCount_1 <= LEN(aDocInfo) + IF aDocInfo[nCount_1][3] = "F2" + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", aDocInfo[nCount_1][1]) oHtm:AddParam("Local", aDocInfo[nCount_1][2]) oHtm:EndObject() - //oHtm:WriteText("
              ") + //oHtm:WriteText("
                ") - /* - IF LEN(aDocInfo[nCount_1][4]) > 0 - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + /* + IF LEN(aDocInfo[nCount_1][4]) > 0 + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", "Methods") oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                  ") - ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) - nCount_2 := 1 + ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) + nCount_2 := 1 DO WHILE nCount_2 <= LEN(aDocInfo[nCount_1][4]) - IF aDocInfo[nCount_1][4][nCount_2, 1] = "Method" - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + IF aDocInfo[nCount_1][4][nCount_2, 1] = "Method" + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() - ENDIF - - nCount_2 ++ - ENDDO + ENDIF + + nCount_2 ++ + ENDDO oHtm:WriteText("
                ") ENDIF - IF LEN(aDocInfo[nCount_1][4]) > 0 - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + IF LEN(aDocInfo[nCount_1][4]) > 0 + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", "Properties") oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                  ") - ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) - nCount_2 := 1 + ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) + nCount_2 := 1 DO WHILE nCount_2 <= LEN(aDocInfo[nCount_1][4]) - IF aDocInfo[nCount_1][4][nCount_2, 1] = "Data" - oHtm:ListItem() - oHtm:AddObject("text/sitemap") + IF aDocInfo[nCount_1][4][nCount_2, 1] = "Data" + oHtm:ListItem() + oHtm:AddObject("text/sitemap") oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() - ENDIF - - nCount_2 ++ - ENDDO + ENDIF + + nCount_2 ++ + ENDDO oHtm:WriteText("
                ") ENDIF - */ - //oHtm:WriteText("
              ") - ENDIF - nCount_1 ++ - ENDDO - oHtm:WriteText("
            ") + */ + //oHtm:WriteText("
          ") + ENDIF + nCount_1 ++ + ENDDO + oHtm:WriteText("
        ") - oHtm:WriteText("
      ") - oHtm:WriteText("
    ") - oHtm:Close() + oHtm:WriteText("
") + oHtm:WriteText("") + oHtm:Close() ELSEIF lNgi SET ALTERNATE TO "assembl.bat" ADDITIVE @@ -1203,7 +1203,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) SET ALTERNATE ON SET CONSOLE OFF FOR i := 1 TO LEN( aDocInfo ) - ? PAD( aDocInfo[ i, 1 ], 15 ), PAD( aDocInfo[ i, 2 ], 15 ), PAD( aDocInfo[ i, 3 ], 15 ) // 4 + ? PAD( aDocInfo[ i, 1 ], 15 ), PAD( aDocInfo[ i, 2 ], 15 ), PAD( aDocInfo[ i, 3 ], 15 ) // 4 NEXT // Send out list of authors @@ -1247,7 +1247,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) UPPER( a[ 3 ] ) < UPPER( b[ 3 ] ) ) } ) @ INFILELINE, 0 CLEAR TO INFILELINE, MAXCOL() - @ INFILELINE, 30 SAY "Writing Author file" + @ INFILELINE, 30 SAY "Writing Author file" IF LEN( aAuthorList ) > 1 i := 2 @@ -1763,7 +1763,7 @@ STATIC FUNCTION ReadLinkFile( cFile ) Local cLine Local cVer:="" LOCAL aLocDoc := {} - Local nH:=FT_FUSE(cFile) + Local nH:=FT_FUSE(cFile) DO WHILE FREADline( nH, @cBuffer, 4096 ) cBuffer := TRIM( SUBSTR( cBuffer, 1 ) ) AADD( Alocdoc, CbUFFER ) @@ -1857,7 +1857,7 @@ FUNCTION TeeFiles() LOCAL i LOCAL nFiles := LEN( aDirList ) - LOCAL cFileName + LOCAL cFileName LOCAL lDoc LOCAL cBuffer LOCAL nReadHandle @@ -1872,9 +1872,9 @@ FUNCTION TeeFiles() nReadHandle := fopen( cFileName ) nSourceHandle := fcreate( "teesrcs\" + cFileName ) nDocHandle := fcreate( "teedocs\" + cFileName ) - + lDoc := .F. - + DO WHILE freadline( nReadHandle, @cBuffer, 256 ) IF AT( cDoc, cBuffer ) > 0 @@ -1886,7 +1886,7 @@ FUNCTION TeeFiles() freadline( nReadHandle, @cBuffer, 256 ) cBuffer += CRLF FWRITE( nDocHandle, cBuffer, len( cBuffer ) ) - LOOP + LOOP ENDIF cBuffer += CRLF @@ -1898,7 +1898,7 @@ FUNCTION TeeFiles() ENDIF ENDDO - + fclose( nReadHandle ) fclose( nSourceHandle ) fclose( nDocHandle ) diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 7aaaf48379..10b1d77f99 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -4651,7 +4651,7 @@ FUNCTION hbMakeID() *-------------------------- FUNCTION hbMakeCopyright() *-------------------------- - RETURN "Copyright (c) 2000-2008, http://www.harbour-project.org/" + RETURN "Copyright (c) 2000-2009, http://www.harbour-project.org/" *------------------------------------------------------------------- * Former tmake.prg diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index 9c1d8cf2fe..c47fe378c7 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -200,7 +200,7 @@ PROCEDURE _APPMAIN( cFile, ... ) STATIC PROCEDURE HB_DotUsage() OutStd( 'Harbour "DOt Prompt" Console / runner ' + HBRawVersion() + HB_OSNewLine() +; - "Copyright (c) 1999-2008, Przemyslaw Czerpak" + HB_OSNewLine() + ; + "Copyright (c) 1999-2009, Przemyslaw Czerpak" + HB_OSNewLine() + ; "http://www.harbour-project.org/" + HB_OSNewLine() +; HB_OSNewLine() +; "Syntax: hbrun [ []]" + HB_OSNewLine() ) diff --git a/harbour/utils/hbtest/hbtest.prg b/harbour/utils/hbtest/hbtest.prg index 23c95babb8..f6df9c7fa9 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 (c) 1999-2008, http://www.harbour-project.org/" + HB_OSNewLine() ) + "Copyright (c) 1999-2009, http://www.harbour-project.org/" + HB_OSNewLine() ) IF cPar1 == NIL cPar1 := "" @@ -523,7 +523,7 @@ FUNCTION XToStrX( xValue ) cRetVal += ", " ENDIF NEXT - + RETURN cRetVal + ' }' CASE cType == "M" ; RETURN 'M:' + xValue