From 8fc1cbd0c36d62054a45fb4775c1a53e51228b98 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Aug 2008 21:36:00 +0000 Subject: [PATCH] 2008-08-25 23:30 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * doc/cmdline.txt * doc/hrb_faq.txt * doc/en/cmdline.txt * doc/en/dir.txt * doc/en/file.txt * doc/en/set.txt * doc/es/cmdline.txt * doc/es/dir.txt * doc/es/file.txt * doc/whatsnew.txt * contrib/hbct/disk.c * contrib/hbodbc/odbc.txt * contrib/hbwhat32/whtmapi.c * contrib/hbwhat32/whtsys.c * contrib/hbwhat32/whtinet.c * contrib/hbziparch/hbziparc.c * contrib/hbnf/chdir.c * contrib/hbnf/tempfile.prg * contrib/hbnf/ftisprn.c * contrib/hbnf/getenvrn.c * contrib/hbnf/mkdir.c * contrib/hbnf/rmdir.c * contrib/hbpgsql/readme.txt * contrib/hbclipsm/environ.c * contrib/hbclipsm/tests/testenv.prg * contrib/hbgd/tests/gdtest.prg * contrib/hbgd/tests/test_out.prg * contrib/hbgd/tests/gdtestcl.prg * contrib/hbgd/tests/testdpi.prg * contrib/hbgd/tests/counter.prg * contrib/hbtip/thtml.prg * contrib/hbvpdf/hbvpdf.prg * contrib/hbvpdf/tests/pdf_demo.prg * contrib/hbvpdf/hbvpdft.prg * contrib/examples/guestbk/guestbk.prg * contrib/examples/pe/editorlo.c * utils/hbdoc/genos2.prg * utils/hbdoc/hbdoc.prg * utils/hbmake/hbmake.prg ! Filename casing fixes. (nothing critical) --- harbour/ChangeLog | 42 ++++++++++++++++++++ harbour/contrib/examples/guestbk/guestbk.prg | 4 +- harbour/contrib/examples/pe/editorlo.c | 2 +- harbour/contrib/hbclipsm/environ.c | 2 +- harbour/contrib/hbclipsm/tests/testenv.prg | 2 +- harbour/contrib/hbct/disk.c | 12 +++--- harbour/contrib/hbgd/tests/counter.prg | 6 +-- harbour/contrib/hbgd/tests/gdtest.prg | 4 +- harbour/contrib/hbgd/tests/gdtestcl.prg | 6 +-- harbour/contrib/hbgd/tests/test_out.prg | 4 +- harbour/contrib/hbgd/tests/testdpi.prg | 2 +- harbour/contrib/hbnf/chdir.c | 4 +- harbour/contrib/hbnf/ftisprn.c | 2 +- harbour/contrib/hbnf/getenvrn.c | 4 +- harbour/contrib/hbnf/mkdir.c | 6 +-- harbour/contrib/hbnf/rmdir.c | 6 +-- harbour/contrib/hbnf/tempfile.prg | 2 +- harbour/contrib/hbodbc/odbc.txt | 2 +- harbour/contrib/hbpgsql/readme.txt | 4 +- harbour/contrib/hbtip/thtml.prg | 2 +- harbour/contrib/hbvpdf/hbvpdf.prg | 2 +- harbour/contrib/hbvpdf/hbvpdft.prg | 4 +- harbour/contrib/hbvpdf/tests/pdf_demo.prg | 2 +- harbour/contrib/hbwhat32/whtinet.c | 4 +- harbour/contrib/hbwhat32/whtmapi.c | 2 +- harbour/contrib/hbwhat32/whtsys.c | 4 +- harbour/contrib/hbziparch/hbziparc.c | 22 +++++----- harbour/doc/cmdline.txt | 6 +-- harbour/doc/en/cmdline.txt | 14 +++---- harbour/doc/en/dir.txt | 4 +- harbour/doc/en/file.txt | 4 +- harbour/doc/en/set.txt | 4 +- harbour/doc/es/cmdline.txt | 14 +++---- harbour/doc/es/dir.txt | 4 +- harbour/doc/es/file.txt | 12 +++--- harbour/doc/hrb_faq.txt | 12 +++--- harbour/doc/whatsnew.txt | 2 +- harbour/utils/hbdoc/genos2.prg | 2 +- harbour/utils/hbdoc/hbdoc.prg | 4 +- harbour/utils/hbmake/hbmake.prg | 34 ++++++++-------- 40 files changed, 158 insertions(+), 116 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 079660e953..95fb6b2514 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,48 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-25 23:30 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * doc/cmdline.txt + * doc/hrb_faq.txt + * doc/en/cmdline.txt + * doc/en/dir.txt + * doc/en/file.txt + * doc/en/set.txt + * doc/es/cmdline.txt + * doc/es/dir.txt + * doc/es/file.txt + * doc/whatsnew.txt + * contrib/hbct/disk.c + * contrib/hbodbc/odbc.txt + * contrib/hbwhat32/whtmapi.c + * contrib/hbwhat32/whtsys.c + * contrib/hbwhat32/whtinet.c + * contrib/hbziparch/hbziparc.c + * contrib/hbnf/chdir.c + * contrib/hbnf/tempfile.prg + * contrib/hbnf/ftisprn.c + * contrib/hbnf/getenvrn.c + * contrib/hbnf/mkdir.c + * contrib/hbnf/rmdir.c + * contrib/hbpgsql/readme.txt + * contrib/hbclipsm/environ.c + * contrib/hbclipsm/tests/testenv.prg + * contrib/hbgd/tests/gdtest.prg + * contrib/hbgd/tests/test_out.prg + * contrib/hbgd/tests/gdtestcl.prg + * contrib/hbgd/tests/testdpi.prg + * contrib/hbgd/tests/counter.prg + * contrib/hbtip/thtml.prg + * contrib/hbvpdf/hbvpdf.prg + * contrib/hbvpdf/tests/pdf_demo.prg + * contrib/hbvpdf/hbvpdft.prg + * contrib/examples/guestbk/guestbk.prg + * contrib/examples/pe/editorlo.c + * utils/hbdoc/genos2.prg + * utils/hbdoc/hbdoc.prg + * utils/hbmake/hbmake.prg + ! Filename casing fixes. (nothing critical) + 2008-08-25 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbsetup.h ! Fixed OS_UNIX_COMPATIBLE diff --git a/harbour/contrib/examples/guestbk/guestbk.prg b/harbour/contrib/examples/guestbk/guestbk.prg index deb8b1acb0..a39e941bb7 100644 --- a/harbour/contrib/examples/guestbk/guestbk.prg +++ b/harbour/contrib/examples/guestbk/guestbk.prg @@ -53,7 +53,7 @@ FUNCTION Main() - LOCAL oIni := TIniFile():New( "c:\inetpub\wwwroot\guestbk.ini" ) + LOCAL oIni := TIniFile():New( "C:\inetpub\wwwroot\guestbk.ini" ) LOCAL oHTML := THTML():New() LOCAL aEntr := {} LOCAL cOddColor, cEvenColor @@ -92,7 +92,7 @@ FUNCTION Main() ELSE // Sets the metahtml file - oHTML:SetHTMLFile( "c:\inetpub\wwwroot\guestbk.htm" ) + oHTML:SetHTMLFile( "C:\inetpub\wwwroot\guestbk.htm" ) // Retrieves odd and even entries color cOddColor := oIni:ReadString( "Header", "OddColor", "#FFFFFF" ) diff --git a/harbour/contrib/examples/pe/editorlo.c b/harbour/contrib/examples/pe/editorlo.c index f8bada12c4..2e2aac7e95 100644 --- a/harbour/contrib/examples/pe/editorlo.c +++ b/harbour/contrib/examples/pe/editorlo.c @@ -898,7 +898,7 @@ char *HB_ED_GETTEXT(int nEdit, int Case, int mietka ) #else bufor = calloc((unsigned int) dl,1); - strcpy(name,"c:\\out.txt"); + strcpy(name,"C:\\out.txt"); p = open(name,O_CREAT+O_WRONLY+O_BINARY); #endif diff --git a/harbour/contrib/hbclipsm/environ.c b/harbour/contrib/hbclipsm/environ.c index 04165418ac..f5ddcf9668 100644 --- a/harbour/contrib/hbclipsm/environ.c +++ b/harbour/contrib/hbclipsm/environ.c @@ -55,7 +55,7 @@ /* FilePath( ) --> cFilePath Extract the full path name from a complete file name - * FilePath( "c:\harbour\bin\harbour.exe" ) --> "c:\harbour\bin\" + * FilePath( "C:\harbour\bin\harbour.exe" ) --> "C:\harbour\bin\" */ HB_FUNC( FILEPATH ) { diff --git a/harbour/contrib/hbclipsm/tests/testenv.prg b/harbour/contrib/hbclipsm/tests/testenv.prg index d131d3f340..41e59bd80f 100644 --- a/harbour/contrib/hbclipsm/tests/testenv.prg +++ b/harbour/contrib/hbclipsm/tests/testenv.prg @@ -6,7 +6,7 @@ function Test( cParam ) - LOCAL cFile := "c:\harbour\bin\harbour.exe" + LOCAL cFile := "C:\harbour\bin\harbour.exe" DEFAULT cParam TO cFile diff --git a/harbour/contrib/hbct/disk.c b/harbour/contrib/hbct/disk.c index bcf29c35d4..006973b551 100644 --- a/harbour/contrib/hbct/disk.c +++ b/harbour/contrib/hbct/disk.c @@ -184,14 +184,14 @@ HB_FUNC( NUMDISKL ) * Volume() depends of the CSETSAFETY() setting and, if is true, does not * overwrite an existing label. * - * Syntax is: Volume("x:test") or Volume("x:\test"), where "x" is the + * Syntax is: Volume("X:test") or Volume("X:\test"), where "x" is the * any drive letter and "test" will be the new volume name. * * Notes: * 1) if the drive letter is not suplied, then the current drive will * be used to change voloume name. - * 2) if Volume("x:") or Volume("x:\") then the volume name of the drive - * "x:" will be erased. + * 2) if Volume("X:") or Volume("X:\") then the volume name of the drive + * "X:" will be erased. * 3) if Volume("") or Volume() then the volume name of the current drive * will be erased. */ @@ -255,7 +255,7 @@ HB_FUNC( VOLUME ) /* * GetVolInfo() is a new function. It returns the volume name of a Floppy, CD, * Hard-disk or mapped network drive. - * Syntax is: GetVolInfo("x:\") + * Syntax is: GetVolInfo("X:\") * Note that the trailing backslash is required. */ HB_FUNC( GETVOLINFO ) @@ -287,11 +287,11 @@ HB_FUNC( GETVOLINFO ) * floppy, Hard-disk, CD or mapped network drive. The return value is a dword * type. If the drive is not available, volserial() returns -1. * - * Sintax is: VolSerial("x:\") + * Sintax is: VolSerial("X:\") * Note that the trailing backslash is required. * * To convert in the hex format, call numtohex() function. - * Example: numtohex( volserial("c:\")). + * Example: numtohex( volserial("C:\")). * See volser.prg in xharbour\tests\cttest folder. */ diff --git a/harbour/contrib/hbgd/tests/counter.prg b/harbour/contrib/hbgd/tests/counter.prg index 8f96c4e8a7..3da98dbc6d 100644 --- a/harbour/contrib/hbgd/tests/counter.prg +++ b/harbour/contrib/hbgd/tests/counter.prg @@ -48,13 +48,13 @@ PROCEDURE Main( cValue, cBaseImage ) ? "Value = ", cValue // To set fonts run this command: - // for windows: SET GDFONTPATH=c:\windows\fonts + // for windows: SET GDFONTPATH=C:\windows\fonts // per linux : export GDFONTPATH=/usr/share/fonts/default/TrueType - // SET GDFONTPATH=c:\windows\fonts + // SET GDFONTPATH=C:\windows\fonts //IF GetEnv( "GDFONTPATH" ) == "" // ? "Please set GDFONTPATH" - // ? "On Windows: SET GDFONTPATH=c:\windows\fonts" + // ? "On Windows: SET GDFONTPATH=C:\windows\fonts" // ? "On Linux : export GDFONTPATH=/usr/share/fonts/default/TrueType" // ? //ENDIF diff --git a/harbour/contrib/hbgd/tests/gdtest.prg b/harbour/contrib/hbgd/tests/gdtest.prg index 2d8366f13c..b2dad838a4 100644 --- a/harbour/contrib/hbgd/tests/gdtest.prg +++ b/harbour/contrib/hbgd/tests/gdtest.prg @@ -20,10 +20,10 @@ PROCEDURE Main() LOCAL black, white, blue, red, green, cyan LOCAL aClip, color, font, aRect - // SET GDFONTPATH=c:\windows\fonts + // SET GDFONTPATH=C:\windows\fonts IF GetEnv( "GDFONTPATH" ) == "" ? "Please set GDFONTPATH" - ? "On Windows: SET GDFONTPATH=c:\windows\fonts" + ? "On Windows: SET GDFONTPATH=C:\windows\fonts" ? "On Linux : export GDFONTPATH=/usr/share/fonts/default/TrueType" ? ENDIF diff --git a/harbour/contrib/hbgd/tests/gdtestcl.prg b/harbour/contrib/hbgd/tests/gdtestcl.prg index db628e73f0..6543888063 100644 --- a/harbour/contrib/hbgd/tests/gdtestcl.prg +++ b/harbour/contrib/hbgd/tests/gdtestcl.prg @@ -24,13 +24,13 @@ PROCEDURE Main() LOCAL oB // To set fonts run this command: - // for windows: SET GDFONTPATH=c:\windows\fonts + // for windows: SET GDFONTPATH=C:\windows\fonts // per linux : export GDFONTPATH=/usr/share/fonts/default/TrueType - // SET GDFONTPATH=c:\windows\fonts + // SET GDFONTPATH=C:\windows\fonts IF GetEnv( "GDFONTPATH" ) == "" ? "Please set GDFONTPATH" - ? "On Windows: SET GDFONTPATH=c:\windows\fonts" + ? "On Windows: SET GDFONTPATH=C:\windows\fonts" ? "On Linux : export GDFONTPATH=/usr/share/fonts/default/TrueType" ? ENDIF diff --git a/harbour/contrib/hbgd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg index 14090d4951..04eece36aa 100644 --- a/harbour/contrib/hbgd/tests/test_out.prg +++ b/harbour/contrib/hbgd/tests/test_out.prg @@ -121,7 +121,7 @@ PROCEDURE EndHTML( cTitle ) WRITE "" RETURN - // per windows: SET GDFONTPATH=c:\windows\fonts + // per windows: SET GDFONTPATH=C:\windows\fonts // per linux : export GDFONTPATH=/usr/share/fonts/default/TrueType PROCEDURE OutPhoto( cPhoto, nWidth, nHeight ) @@ -158,7 +158,7 @@ RETURN PROCEDURE OutJpg( cText, nPitch ) LOCAL cOS := OS() - LOCAL cPath := IIF( Left( cOS, 10 ) == "Windows NT", "c:\winnt\fonts\", "c:\windows\fonts\" ) + LOCAL cPath := IIF( Left( cOS, 10 ) == "Windows NT", "C:\winnt\fonts\", "C:\windows\fonts\" ) LOCAL oI, cyan, blue LOCAL aSize, nWidth, nHeight, nX, nY LOCAL cFont := cPath + "verdana.ttf" diff --git a/harbour/contrib/hbgd/tests/testdpi.prg b/harbour/contrib/hbgd/tests/testdpi.prg index 80fb1d7f2d..82ca2ffd95 100644 --- a/harbour/contrib/hbgd/tests/testdpi.prg +++ b/harbour/contrib/hbgd/tests/testdpi.prg @@ -23,7 +23,7 @@ PROCEDURE Main() black := oI:SetColor( 0, 0, 0 ) oI:SetColor( black ) - oI:SetFontName("c:\windows\fonts\arial.ttf") + oI:SetFontName("C:\windows\fonts\arial.ttf") oI:SetFontPitch( 10 ) // Resolution = 96 dpi, default diff --git a/harbour/contrib/hbnf/chdir.c b/harbour/contrib/hbnf/chdir.c index d5bab63280..bc222050d3 100644 --- a/harbour/contrib/hbnf/chdir.c +++ b/harbour/contrib/hbnf/chdir.c @@ -48,9 +48,9 @@ * SEGMENT directives, and also the ENDP and ENDS directives (a very * minor task). * $EXAMPLES$ -* FT_CHDIR( "C:\CLIPPER" ) +* FT_CHDIR( "C:\clipper" ) * FT_CHDIR( "\" ) -* FT_CHDIR( "..\SOURCE" ) +* FT_CHDIR( "..\source" ) * $END$ */ diff --git a/harbour/contrib/hbnf/ftisprn.c b/harbour/contrib/hbnf/ftisprn.c index 9185ab3372..cbb63dee80 100644 --- a/harbour/contrib/hbnf/ftisprn.c +++ b/harbour/contrib/hbnf/ftisprn.c @@ -133,7 +133,7 @@ * Qout( "Check the device on COM2. Something is wrong." ) * ENDIF * -* IF ! FT_ISPRINT( "A:\NUL" ) +* IF ! FT_ISPRINT( "A:\nul" ) * Qout( "Oops, better check drive A!" ) * ENDIF * $END$ diff --git a/harbour/contrib/hbnf/getenvrn.c b/harbour/contrib/hbnf/getenvrn.c index de6551cb48..0f6070e4f4 100644 --- a/harbour/contrib/hbnf/getenvrn.c +++ b/harbour/contrib/hbnf/getenvrn.c @@ -89,8 +89,8 @@ * * aEnvArray := ARRAY(FT_GETE()) * FT_GETE(aEnvArray) - * ? aEnvArray[1] // "COMSPEC=C:\COMMAND.COM" - * ? aEnvArray[2] // "PATH=C:\;C:\DOS;C:\UTIL;C:\CLIP50\BIN" + * ? aEnvArray[1] // "COMSPEC=C:\command.com" + * ? aEnvArray[2] // "PATH=C:\;C:\windows;C:\util;C:\harbour" * ... etc ... * $END$ */ diff --git a/harbour/contrib/hbnf/mkdir.c b/harbour/contrib/hbnf/mkdir.c index 65494c81ae..5542c83b19 100644 --- a/harbour/contrib/hbnf/mkdir.c +++ b/harbour/contrib/hbnf/mkdir.c @@ -51,9 +51,9 @@ * SEGMENT directives, and also the ENDP and ENDS directives (a very * minor task). * $EXAMPLES$ -* FT_MKDIR( "C:\CLIPPER" ) -* FT_MKDIR( "\EXAMPLE" ) -* FT_MKDIR( "..\SOURCE" ) +* FT_MKDIR( "C:\clipper" ) +* FT_MKDIR( "\example" ) +* FT_MKDIR( "..\source" ) * $END$ */ diff --git a/harbour/contrib/hbnf/rmdir.c b/harbour/contrib/hbnf/rmdir.c index edcbc26009..9bb3a0b877 100644 --- a/harbour/contrib/hbnf/rmdir.c +++ b/harbour/contrib/hbnf/rmdir.c @@ -51,9 +51,9 @@ * SEGMENT directives, and also the ENDP and ENDS directives (a very * minor task). * $EXAMPLES$ -* FT_RMDIR( "C:\CLIPPER" ) -* FT_RMDIR( "\EXAMPLE" ) -* FT_RMDIR( "..\SOURCE" ) +* FT_RMDIR( "C:\clipper" ) +* FT_RMDIR( "\example" ) +* FT_RMDIR( "..\source" ) * $END$ */ /*This is the Original FT_RMDIR() code diff --git a/harbour/contrib/hbnf/tempfile.prg b/harbour/contrib/hbnf/tempfile.prg index 1a66097107..8566981dbc 100644 --- a/harbour/contrib/hbnf/tempfile.prg +++ b/harbour/contrib/hbnf/tempfile.prg @@ -84,7 +84,7 @@ * * Create a unique file on another drive, but do not hide it: * - * myFile := FT_TEMPFIL("e:\nanfor\src\") + * myFile := FT_TEMPFIL("E:\nanfor\src\") * $END$ */ diff --git a/harbour/contrib/hbodbc/odbc.txt b/harbour/contrib/hbodbc/odbc.txt index ab772ebb20..c12adccc0c 100644 --- a/harbour/contrib/hbodbc/odbc.txt +++ b/harbour/contrib/hbodbc/odbc.txt @@ -24,5 +24,5 @@ correct, you'll have harbour\libs\odbc32.lib and hbodbc.lib. To build the sample program, go to harbour\source\odbc and run hb32 testodbc. Then set your Harbour root directory into HARBOUR_DIR environmental variable (ie, -SET HARBOUR_DIR=c:\harbour) and run testodbc. If everything +SET HARBOUR_DIR=C:\harbour) and run testodbc. If everything goes ok, you'll see a list of functions. diff --git a/harbour/contrib/hbpgsql/readme.txt b/harbour/contrib/hbpgsql/readme.txt index ba5181f398..50bc4acb83 100644 --- a/harbour/contrib/hbpgsql/readme.txt +++ b/harbour/contrib/hbpgsql/readme.txt @@ -19,7 +19,7 @@ Postgres Library. Go to postgres directory \postgresql-7.4.5\src\interfaces\libpq -Edit bcc32.mak and change the default borland directory for your needs. Example: BCB=c:\Borland\Bcc55 +Edit bcc32.mak and change the default borland directory for your needs. Example: BCB=C:\borland\bcc55 change postgresql-7.4.5\src\include\pg_config.h.win32 to pg_config.h @@ -27,7 +27,7 @@ after this make -f bcc32.mak -Now look at \postgresql-7.4.5\src\interfaces\libpq\Release, you will find the all .libs and .dlls +Now look at \postgresql-7.4.5\src\interfaces\libpq\release, you will find the all .libs and .dlls If want use the dll, link in your aplication blibpqdll.lib and send blibpq.dll together with your aplication diff --git a/harbour/contrib/hbtip/thtml.prg b/harbour/contrib/hbtip/thtml.prg index 43878a73b4..75b450bcf6 100644 --- a/harbour/contrib/hbtip/thtml.prg +++ b/harbour/contrib/hbtip/thtml.prg @@ -313,7 +313,7 @@ RETURN ::oIterator:Find( cName, cAttrib, cValue, cData ) /* * Abstract super class for THtmlIteratorScan and THtmlIteratorScanRegEx * - * (Adopted from TXMLIterator -> source\rtl\TXml.prg) + * (Adopted from TXMLIterator -> source\rtl\txml.prg) */ CLASS THtmlIterator MODULE FRIENDLY METHOD New( oNodeTop ) CONSTRUCTOR diff --git a/harbour/contrib/hbvpdf/hbvpdf.prg b/harbour/contrib/hbvpdf/hbvpdf.prg index c4d968a95c..2144544718 100644 --- a/harbour/contrib/hbvpdf/hbvpdf.prg +++ b/harbour/contrib/hbvpdf/hbvpdf.prg @@ -2551,7 +2551,7 @@ FUNCTION FilePos( nHandle ) RETURN ( FSEEK( nHandle, 0, FS_RELATIVE ) ) FUNCTION pdfFilePrint( cFile ) -LOCAL cRun := "d:\progra~2\Adobe\Acroba~2.0\Reader\AcroRd32.exe /t " + cFile + " " + chr(34) + "HP LaserJet 5/5M PostScript" + chr(34) + " " + chr(34) + "LPT1" + chr(34) +LOCAL cRun := "D:\progra~2\Adobe\Acroba~2.0\Reader\AcroRd32.exe /t " + cFile + " " + chr(34) + "HP LaserJet 5/5M PostScript" + chr(34) + " " + chr(34) + "LPT1" + chr(34) IF (!SWPRUNCMD( cRun, 0, "", "")) alert("Error printing to PDF reader.") diff --git a/harbour/contrib/hbvpdf/hbvpdft.prg b/harbour/contrib/hbvpdf/hbvpdft.prg index ff3d394d00..968237c026 100644 --- a/harbour/contrib/hbvpdf/hbvpdft.prg +++ b/harbour/contrib/hbvpdf/hbvpdft.prg @@ -2362,7 +2362,7 @@ METHOD tPdf:FilePrint( cFile ) #else METHOD FilePrint( cFile ) #endif -local cPathAcro := "c:\progra~1\Adobe\Acroba~1.0\Reader" +local cPathAcro := "C:\progra~1\Adobe\Acroba~1.0\Reader" local cRun := cPathAcro + "\AcroRd32.exe /t " + cFile + " " + ; chr(34) + "HP LaserJet 5/5M PostScript" + chr(34) + " " + ; chr(34) + "LPT1" + chr(34) @@ -2382,7 +2382,7 @@ METHOD tPdf:Execute( cFile ) METHOD Execute( cFile ) #endif // Replace cPathAcro with the path at your system -local cPathAcro := "c:\progra~1\Adobe\Acroba~1.0\Reader" +local cPathAcro := "C:\progra~1\Adobe\Acroba~1.0\Reader" local cRun := cPathAcro + "\AcroRd32.exe /t " + cFile + " " + chr(34) + "HP LaserJet 5/5M PostScript" + chr(34) + " " + chr(34) + "LPT1" + chr(34) IF (! RunExternal( cRun, "open", cFile ) ) diff --git a/harbour/contrib/hbvpdf/tests/pdf_demo.prg b/harbour/contrib/hbvpdf/tests/pdf_demo.prg index 8cb982dfa0..d78f41a08f 100644 --- a/harbour/contrib/hbvpdf/tests/pdf_demo.prg +++ b/harbour/contrib/hbvpdf/tests/pdf_demo.prg @@ -193,7 +193,7 @@ procedure main() // pdfFilePrint( "test.pdf" ) // print .pdf file WITHOUT opening acrobat /* - cRun := "d:\progra~2\Adobe\Acroba~2.0\Reader\AcroRd32.exe " + "test.pdf" + cRun := "D:\progra~2\Adobe\Acroba~2.0\Reader\AcroRd32.exe " + "test.pdf" IF (!SWPRUNCMD( cRun, 0, "", "")) alert(" Error running Acrobat Reader.") diff --git a/harbour/contrib/hbwhat32/whtinet.c b/harbour/contrib/hbwhat32/whtinet.c index 96e8d7aa19..bcba687eca 100644 --- a/harbour/contrib/hbwhat32/whtinet.c +++ b/harbour/contrib/hbwhat32/whtinet.c @@ -161,7 +161,7 @@ HB_FUNC( INTERNETCONNECT ) ); */ // -// if FtpOpenFile( hInternet, 'Temp/Config.sys', GENERIC_WRITE ) +// if FtpOpenFile( hInternet, 'temp/config.sys', GENERIC_WRITE ) // // take next step // endif // @@ -497,7 +497,7 @@ HB_FUNC( FTPREMOVEDIRECTORY ) ); */ // -// if FtpDeleteFile( hInternet, 'Temp\Config.sys' ) +// if FtpDeleteFile( hInternet, 'temp\config.sys' ) // ? 'Sucess' // endif // diff --git a/harbour/contrib/hbwhat32/whtmapi.c b/harbour/contrib/hbwhat32/whtmapi.c index 0f5aeb5a01..07b4eb7afe 100644 --- a/harbour/contrib/hbwhat32/whtmapi.c +++ b/harbour/contrib/hbwhat32/whtmapi.c @@ -14,7 +14,7 @@ 'vouchcac@hotmail.com', ; // Sender's Address 'Pritpal', ; // Recipient's Name 'info@vouchcac.com', ; // Recipient's Address - 'c:\autoexec.bat' ) // File attached + 'C:\autoexec.bat' ) // File attached */ diff --git a/harbour/contrib/hbwhat32/whtsys.c b/harbour/contrib/hbwhat32/whtsys.c index 806e3fbdf1..6c2a76a060 100644 --- a/harbour/contrib/hbwhat32/whtsys.c +++ b/harbour/contrib/hbwhat32/whtsys.c @@ -894,10 +894,10 @@ HB_FUNC( WINHELP ) // // // HtmlHelp( hWndCaller, ; // Handle of caller window, can be GetDeskTopWindow() -// cFullPathAndTopic ) // C:\Creative.acp\Help\VVouch.htm::default.htm +// cFullPathAndTopic ) // C:\creative.acp\help\vvouch.htm::default.htm // // If topic is not given, default topic will appear // -// HtmlHelp( GetDeskTopWindow(), 'c:\help\vvouch.chm::de_windo.htm' ) +// HtmlHelp( GetDeskTopWindow(), 'C:\help\vvouch.chm::de_windo.htm' ) // // To create a .chm file, you need to work with Microsoft's // free HtmlHelp Workshop doanloadable from MSDN diff --git a/harbour/contrib/hbziparch/hbziparc.c b/harbour/contrib/hbziparch/hbziparc.c index d0e139c551..91f92d8a5d 100644 --- a/harbour/contrib/hbziparch/hbziparc.c +++ b/harbour/contrib/hbziparch/hbziparc.c @@ -493,15 +493,15 @@ static void ZipCreateArray( PHB_ITEM pParam, BYTE *pCurDir, BOOL bFullPath ) * qout( "File was successfully created" ) * ENDIF * - * IF HB_ZIPFILE( "test1.zip", { "test.prg", "c:\windows\win.ini" } ) + * IF HB_ZIPFILE( "test1.zip", { "test.prg", "C:\windows\win.ini" } ) * qout( "File was successfully created" ) * ENDIF * - * IF HB_ZIPFILE( "test2.zip", { "test.prg", "c:\windows\win.ini" }, 9, {|cFile,nPos,| qout(cFile) } ) + * IF HB_ZIPFILE( "test2.zip", { "test.prg", "C:\windows\win.ini" }, 9, {|cFile,nPos,| qout(cFile) } ) * qout( "File was successfully created" ) * ENDIF * - * aFiles := { "test.prg", "c:\windows\win.ini" } + * aFiles := { "test.prg", "C:\windows\win.ini" } * nLen := Len( aFiles ) * aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B" , "²" ) * GaugeDisplay( aGauge ) @@ -715,15 +715,15 @@ HB_FUNC( HB_GETFILECOUNT ) * qout( "File was successfully created" ) * ENDIF * - * IF HB_ZIPFILEBYTDSPAN( "test1.zip", { "test.prg", "c:\windows\win.ini" } ) + * IF HB_ZIPFILEBYTDSPAN( "test1.zip", { "test.prg", "C:\windows\win.ini" } ) * qout( "File was successfully created" ) * ENDIF * - * IF HB_ZIPFILEBYTDSPAN( "test2.zip", { "test.prg", "c:\windows\win.ini" }, 9, {|nPos,cFile| qout(cFile) }, "hello",, 521421 ) + * IF HB_ZIPFILEBYTDSPAN( "test2.zip", { "test.prg", "C:\windows\win.ini" }, 9, {|nPos,cFile| qout(cFile) }, "hello",, 521421 ) * qout("File was successfully created" ) * ENDIF * - * aFiles := { "test.prg", "c:\windows\win.ini" } + * aFiles := { "test.prg", "C:\windows\win.ini" } * nLen := Len( aFiles ) * aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B", "²" ) * GaugeDisplay( aGauge ) @@ -890,20 +890,20 @@ HB_FUNC( HB_ZIPFILEBYTDSPAN ) * qout( "File was successfully created" ) * ENDIF * - * IF HB_ZIPFILEBYPKSPAN( "A:\test1.zip", { "test.prg", "c:\windows\win.ini" } ) + * IF HB_ZIPFILEBYPKSPAN( "A:\test1.zip", { "test.prg", "C:\windows\win.ini" } ) * qout( "File was successfully created" ) * ENDIF * - * IF HB_ZIPFILEBYPKSPAN( "test2.zip", { "test.prg", "c:\windows\win.ini"}, 9, {|nPos,cFile| qout(cFile) } ) + * IF HB_ZIPFILEBYPKSPAN( "test2.zip", { "test.prg", "C:\windows\win.ini"}, 9, {|nPos,cFile| qout(cFile) } ) * qout( "File was successfully created" ) * ENDIF * - * aFiles := { "test.prg", "c:\windows\win.ini" } + * aFiles := { "test.prg", "C:\windows\win.ini" } * nLen := Len( aFiles ) * aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B", "²" ) * GaugeDisplay( aGauge ) - * HB_ZIPFILEBYPKSPAN( "f:\test33.zip", aFiles, 9, {|cFile,nPos| GaugeUpdate( aGauge, nPos/nLen ) },, "hello" ) - * // assuming f:\ is a Zip Drive + * HB_ZIPFILEBYPKSPAN( "F:\test33.zip", aFiles, 9, {|cFile,nPos| GaugeUpdate( aGauge, nPos/nLen ) },, "hello" ) + * // assuming F:\ is a Zip Drive * Return NIL * $STATUS$ * R diff --git a/harbour/doc/cmdline.txt b/harbour/doc/cmdline.txt index 33e3cc3461..f091d34237 100644 --- a/harbour/doc/cmdline.txt +++ b/harbour/doc/cmdline.txt @@ -70,7 +70,7 @@ whitespace. (or just walk through all argv[]) The Harbour switches are always case insensitive. In the Harbour commandline the two style can be used together: -HARBOUR -wnes2 /gc0/q0 -ic:\hello +harbour -wnes2 /gc0/q0 -iC:\hello Exceptions: @@ -84,8 +84,8 @@ Exceptions: Just some examples for the various accepted forms: //F20 == /F20 == F20 == F:20 == F20X - //TMPPATH:C:\HELLO - F20//TMPPATH:/TEMP///F:30000000 NOIDLE + //TMPPATH:C:\hello + F20//TMPPATH:/temp///F:30000000 NOIDLE F0NOIDLEX10 SQUAWKNOIDLE diff --git a/harbour/doc/en/cmdline.txt b/harbour/doc/en/cmdline.txt index d948c8c5fa..21b86b8591 100644 --- a/harbour/doc/en/cmdline.txt +++ b/harbour/doc/en/cmdline.txt @@ -79,7 +79,7 @@ * The Harbour switches are always case insensitive. * * In the Harbour commandline the two style can be used together: - * HARBOUR -wnes2 /gc0/q0 -ic:\hello + * harbour -wnes2 /gc0/q0 -iC:\hello * * Exceptions: * @@ -95,16 +95,16 @@ * quote char to specify path containing space, negative sign, slash, * or any other chars with special meaning. * - * /i"c:/hello/" - * -i"c:/hello-n" - * /i"c:/program files/" - * -i"c:/program files/" + * /i"C:/hello/" + * -i"C:/hello-n" + * /i"C:/Program Files/" + * -i"C:/Program Files/" * * * Just some examples for the various accepted forms: * //F20 == /F20 == F20 == F:20 == F20X - * //TMPPATH:C:\HELLO - * F20//TMPPATH:/TEMP///F:30000000 NOIDLE + * //TMPPATH:C:\hello + * F20//TMPPATH:/temp///F:30000000 NOIDLE * F0NOIDLEX10 * SQUAWKNOIDLE * diff --git a/harbour/doc/en/dir.txt b/harbour/doc/en/dir.txt index 52fe7b8255..ad2b5e39d8 100644 --- a/harbour/doc/en/dir.txt +++ b/harbour/doc/en/dir.txt @@ -50,7 +50,7 @@ * * // list all PRG files in Harbour Run-Time library * // for DOS compatible operating systems - * __Dir( "c:\harbour\source\rtl\*.prg" ) + * __Dir( "C:\harbour\source\rtl\*.prg" ) * * // list all files in the public section on a Unix like machine * __Dir( "/pub" ) @@ -107,7 +107,7 @@ * * // list all PRG files in Harbour Run-Time library * // for DOS compatible operating systems - * Dir "c:\harbour\source\rtl\*.prg" + * Dir "C:\harbour\source\rtl\*.prg" * * // list all files in the public section on a Unix like machine * Dir "/pub" diff --git a/harbour/doc/en/file.txt b/harbour/doc/en/file.txt index 40daf946a9..9385f38e21 100644 --- a/harbour/doc/en/file.txt +++ b/harbour/doc/en/file.txt @@ -546,8 +546,8 @@ * no more paths to search. The DOS PATH is never searched and the * current drive/directory is only searched if SET DEFAULT is blank. * $EXAMPLES$ - * ? file('c:\harbour\doc\compiler.txt") - * ? file('c:/harbour/doc/subcodes.txt") + * ? file('C:\harbour\doc\compiler.txt") + * ? file('C:/harbour/doc/subcodes.txt") * * $STATUS$ * S (wild card support is missing) diff --git a/harbour/doc/en/set.txt b/harbour/doc/en/set.txt index 42b5a29bcd..9ac7aea45e 100644 --- a/harbour/doc/en/set.txt +++ b/harbour/doc/en/set.txt @@ -354,7 +354,7 @@ * Specifies a path of directories to search through to * locate a file that can't be located in the DEFAULT * directory. Defaults to no path (""). Directories must - * be separated by a semicolon (e.g., "C:\DATA;C:\MORE"). + * be separated by a semicolon (e.g., "C:\data;C:\more"). * * _SET_PRINTER | * @@ -845,7 +845,7 @@ * parameters with this command will default the operation to the * current logged drive and directory. * $EXAMPLES$ - * SET DEFAULT to c:\TEMP + * SET DEFAULT to C:\temp * * $STATUS$ * R diff --git a/harbour/doc/es/cmdline.txt b/harbour/doc/es/cmdline.txt index b6318341e1..156d9eda5e 100644 --- a/harbour/doc/es/cmdline.txt +++ b/harbour/doc/es/cmdline.txt @@ -102,7 +102,7 @@ * En la l¡nea de comandos de Harbour los dos estilos pueden ser usados * conjuntamente: * - * HARBOUR -wnes2 /gc0/q0 -ic:\hello + * harbour -wnes2 /gc0/q0 -iC:\hello * * Excepciones: * @@ -120,16 +120,16 @@ * conteniendo espacios, signo negativo, barras u otros caracteres * con un significado especial. * - * /i"c:/hello/" - * -i"c:/hello-n" - * /i"c:/program files/" - * -i"c:/program files/" + * /i"C:/hello/" + * -i"C:/hello-n" + * /i"C:/Program Files/" + * -i"C:/Program Files/" * * * S¢lo algunos ejemplos para las varias formas aceptadas: * //F20 == /F20 == F20 == F:20 == F20X - * //TMPPATH:C:\HELLO - * F20//TMPPATH:/TEMP///F:30000000 NOIDLE + * //TMPPATH:C:\hello + * F20//TMPPATH:/temp///F:30000000 NOIDLE * F0NOIDLEX10 * SQUAWKNOIDLE * diff --git a/harbour/doc/es/dir.txt b/harbour/doc/es/dir.txt index 949592990c..33f1158c9e 100644 --- a/harbour/doc/es/dir.txt +++ b/harbour/doc/es/dir.txt @@ -59,7 +59,7 @@ * * // Lista todos los PRG de la librer¡a de ejecuci¢n (RTL) de Harbour * // para sistemas operativos compatibles con DOS - * __Dir( "c:\harbour\source\rtl\*.prg" ) + * __Dir( "C:\harbour\source\rtl\*.prg" ) * * // Lista todos los archivos de la secci¢n p£blica sobre una m quina * // tipo Unix @@ -125,7 +125,7 @@ * * // Lista todos los PRG de la librer¡a de ejecuci¢n (RTL) de Harbour * // para sistemas operativos compatibles con DOS - * __Dir( "c:\harbour\source\rtl\*.prg" ) + * __Dir( "C:\harbour\source\rtl\*.prg" ) * * // Lista todos los archivos de la secci¢n p£blica sobre una m quina * // tipo Unix diff --git a/harbour/doc/es/file.txt b/harbour/doc/es/file.txt index 3ba09e62ff..d102cff8f5 100644 --- a/harbour/doc/es/file.txt +++ b/harbour/doc/es/file.txt @@ -745,7 +745,7 @@ * Si ocurre un error, consulte el valor que devuelve la funci¢n * FERROR(), por las causas posibles del error. * $EXAMPLES$ - * RENAME c:\autoexec.bat TO c:\autoexec.old + * RENAME C:\autoexec.bat TO C:\autoexec.old * * $STATUS$ * R @@ -782,8 +782,8 @@ * El archivo debe ser considerado cerrado por el sistema operativo, * antes de que ‚ste pueda ser borrado. * $EXAMPLES$ - * ERASE c:\autoexec.bat // s¢lo es una broma, no lo intente! - * ERASE c:/temp/read.txt + * ERASE C:\autoexec.bat // s¢lo es una broma, no lo intente! + * ERASE C:/temp/read.txt * * $STATUS$ * R @@ -818,8 +818,8 @@ * El archivo debe ser considerado cerrado por el sistema operativo, * antes de que ‚ste pueda ser borrado. * $EXAMPLES$ - * ERASE c:\autoexec.bat // s¢lo es una broma, no lo intente! - * ERASE c:/temp/read.txt + * ERASE C:\autoexec.bat // s¢lo es una broma, no lo intente! + * ERASE C:/temp/read.txt * * $STATUS$ * R @@ -1130,7 +1130,7 @@ * ocurrido. * Consulte la funci¢n FERROR() por una descripci¢n del error. * $EXAMPLES$ - * cDir := ".\Backup" + * cDir := ".\backup" * nError := DIRREMOVE( cDir ) * * IF nError == 0 diff --git a/harbour/doc/hrb_faq.txt b/harbour/doc/hrb_faq.txt index 215904065b..d3f38e4edc 100644 --- a/harbour/doc/hrb_faq.txt +++ b/harbour/doc/hrb_faq.txt @@ -11,17 +11,17 @@ Runner (also known as TugBoat, Stubbing Executables (not yet) ) To create a runner : - c:..> bld32exe runner + C:..> bld32exe runner Once the runner is created, To create a .hrb and run it : - c:..> hbrun + C:..> hbrun If you just want to run a .hrb file : - c:..> runner + C:..> runner If you just want to create a .hrb file : @@ -29,9 +29,9 @@ If you just want to create a .hrb file : To see the contents of a .hrb file : - c:...> clipper readhrb /n/a/w {I am sorry} - c:...> blinker @readhrb - c:...> readhrb {What do mean consistent} + C:..> clipper readhrb /n/a/w {I am sorry} + C:..> blinker @readhrb + C:..> readhrb {What do mean consistent} If it goes too fast a readhrb.out is created containing the screen output. diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index 448c55c8dd..a397f8250b 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -1020,7 +1020,7 @@ The runtime modules will change Alt-c into Alt-b for cancelling (Alt-c is used to insert polish diactric letter) - Fixed to release PUBLIC variables correctly -- Fixed bug in Directory( "c:\*.*" ) that returned 0 when hidden files +- Fixed bug in Directory( "C:\*.*" ) that returned 0 when hidden files were present. - Alert() Fixed bug with messages longer than 60 bytes. - TGet:display() fixed to always evaluate the get block before diff --git a/harbour/utils/hbdoc/genos2.prg b/harbour/utils/hbdoc/genos2.prg index 4b6bc44b42..b6e9f0ba80 100644 --- a/harbour/utils/hbdoc/genos2.prg +++ b/harbour/utils/hbdoc/genos2.prg @@ -180,7 +180,7 @@ FUNCTION ProcessOs2() @ INFILELINE, 20 SAY "Extracting: " @ MODULELINE, 20 SAY "Documenting: " // loop through all of the files - oOs2 := tOS2():new( "ipf\Harbour.ipf" ) + oOs2 := tOS2():new( "ipf\harbour.ipf" ) FOR i := 1 TO nFiles // Open file for input diff --git a/harbour/utils/hbdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg index 6c729669d6..28dccd3e60 100644 --- a/harbour/utils/hbdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -1181,8 +1181,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) SET ALTERNATE ON SET CONSOLE OFF ? "Copy ngi\overview.ngi ." - ? "Copy ngi\License.ngi ." - ? "Copy ngi\Funcam.txt ." + ? "Copy ngi\license.ngi ." + ? "Copy ngi\funcam.txt ." ? "Copy ngi\funcn_.txt ." ? "copy ngi\comm.txt ." ? "Compiling Sources" diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 0a92c281c5..fe2bfa6967 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -2344,8 +2344,8 @@ Endif // Create and compile IF s_lBcc - AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\BIN\bcc32 $(CFLAG1) $(CFLAG2) -o$* $**" } ) - AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) + AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\bin\bcc32 $(CFLAG1) $(CFLAG2) -o$* $**" } ) + AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) IF s_lExtended AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+iif(s_lasdll,"1","")+" -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$* $**" } ) @@ -2353,7 +2353,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) )) + " -o$* $**" } ) ENDIF - AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\BIN\brcc32 $(RFLAGS) $<" } ) + AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\bin\brcc32 $(RFLAGS) $<" } ) ELSEIF s_lGcc @@ -2395,8 +2395,8 @@ Endif // Create and compile ELSEIF s_lPocc - AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\BIN\pocc $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) - AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) + AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\bin\pocc $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) + AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+iif(s_lasdll,"1","")+" -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$** $**" } ) @@ -2404,7 +2404,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) )) + " -o$** $**" } ) ENDIF - AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\BIN\porc $(RFLAGS) $<" } ) + AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\bin\porc $(RFLAGS) $<" } ) ENDIF @@ -3110,7 +3110,7 @@ Endif // Create and compile FWrite( s_nMakeFileHandle, "CFLAG1 = $(SHELL) /Ze /Go /Ot /Tx86-coff /I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)" +IIF( s_lMt, ' /D"HB_THREAD_SUPPORT" /MT' , "" ) + s_cEOL ) FWrite( s_nMakeFileHandle, "CFLAG2 = " + s_cEOL ) FWrite( s_nMakeFileHandle, "RFLAGS = " + s_cEOL ) - FWrite( s_nMakeFileHandle, "LFLAGS = /LIBPATH:$(CC_DIR)\LIB /LIBPATH:$(CC_DIR)\LIB\WIN /LIBPATH:$(HB_DIR)\LIB /MACHINE:IX86"+IIF(!s_lGui," /SUBSYSTEM:CONSOLE"," /SUBSYSTEM:WINDOWS") + s_cEOL ) + FWrite( s_nMakeFileHandle, "LFLAGS = /LIBPATH:$(CC_DIR)\lib /LIBPATH:$(CC_DIR)\lib\win /LIBPATH:$(HB_DIR)\lib /MACHINE:IX86"+IIF(!s_lGui," /SUBSYSTEM:CONSOLE"," /SUBSYSTEM:WINDOWS") + s_cEOL ) FWrite( s_nMakeFileHandle, "IFLAGS = " + s_cEOL ) FWrite( s_nMakeFileHandle, "LINKER = polink" + s_cEOL ) FWrite( s_nMakeFileHandle, " " + s_cEOL ) @@ -3180,7 +3180,7 @@ Endif // Create and compile FWrite( s_nMakeFileHandle, "#BUILD" + s_cEOL ) FWrite( s_nMakeFileHandle, " " + s_cEOL ) FWrite( s_nMakeFileHandle, "$(PROJECT): $(CFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)" + s_cEOL ) - FWrite( s_nMakeFileHandle, " $(CC_DIR)\BIN\$(LINKER) @&&! " + s_cEOL ) + FWrite( s_nMakeFileHandle, " $(CC_DIR)\bin\$(LINKER) @&&! " + s_cEOL ) FWrite( s_nMakeFileHandle, " $(LFLAGS) +" + s_cEOL ) FWrite( s_nMakeFileHandle, " $(ALLOBJ), +" + s_cEOL ) FWrite( s_nMakeFileHandle, " $(PROJECT),, +" + s_cEOL ) @@ -4266,8 +4266,8 @@ FUNCTION CreateLibMakeFile( cFile ) ENDIF IF s_lBcc - AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\BIN\bcc32 $(CFLAG1) $(CFLAG2) -o$* $**" } ) - AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) + AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\bin\bcc32 $(CFLAG1) $(CFLAG2) -o$* $**" } ) + AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) IF s_lExtended AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$* $**" } ) @@ -4275,7 +4275,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$* $**" } ) ENDIF - AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\BIN\brcc32 $(RFLAGS) $<" } ) + AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\bin\brcc32 $(RFLAGS) $<" } ) ELSEIF s_lGcc @@ -4311,11 +4311,11 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(C4W)\include -o$* $**" } ) ENDIF - AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\BIN\rc $(RFLAGS) $<" } ) + AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\bin\rc $(RFLAGS) $<" } ) ELSEIF s_lPocc - AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\BIN\pocc $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) - AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) + AAdd( s_aCommands, { ".cpp.obj:", "$(CC_DIR)\bin\pocc $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) + AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$** $**" } ) @@ -4323,7 +4323,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$** $**" } ) ENDIF - AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\BIN\porc $(RFLAGS) $<" } ) + AAdd( s_aCommands, { ".rc.res:", "$(CC_DIR)\bin\porc $(RFLAGS) $<" } ) ENDIF @@ -4594,7 +4594,7 @@ FUNCTION CreateLibMakeFile( cFile ) FWrite( s_nMakeFileHandle, "#BUILD" + s_cEOL ) FWrite( s_nMakeFileHandle, " " + s_cEOL ) FWrite( s_nMakeFileHandle, "$(PROJECT): $(CFILES) $(OBJFILES)" + s_cEOL ) - FWrite( s_nMakeFileHandle, " $(CC_DIR)\BIN\$(LINKER) @&&!" + s_cEOL ) + FWrite( s_nMakeFileHandle, " $(CC_DIR)\bin\$(LINKER) @&&!" + s_cEOL ) FWrite( s_nMakeFileHandle, " $(ALLOBJ)" + s_cEOL ) FWrite( s_nMakeFileHandle, "!" + s_cEOL ) @@ -4603,7 +4603,7 @@ FUNCTION CreateLibMakeFile( cFile ) FWrite( s_nMakeFileHandle, "#BUILD" + s_cEOL ) FWrite( s_nMakeFileHandle, " " + s_cEOL ) FWrite( s_nMakeFileHandle, "$(PROJECT): $(CFILES) $(OBJFILES)" + s_cEOL ) - FWrite( s_nMakeFileHandle, " $(CC_DIR)\BIN\$(LINKER) @&&!" + s_cEOL ) + FWrite( s_nMakeFileHandle, " $(CC_DIR)\bin\$(LINKER) @&&!" + s_cEOL ) FWrite( s_nMakeFileHandle, " $(PROJECT)" + s_cEOL ) FWrite( s_nMakeFileHandle, " $(ALLOBJ)" + s_cEOL ) FWrite( s_nMakeFileHandle, "!" + s_cEOL )