From 31f9030f341f284411ff480e5d2c23a684a33cac Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 11 Nov 2007 01:42:42 +0000 Subject: [PATCH] 2007-11-11 02:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/at.c * include/hbextern.ch + Added hb_At() which is equivalent to At() with HB_EXTENSION turned on. Users are encouraged to use hb_At(), and this is also a must inside core. * include/hbextern.ch ! Added missing hb_AIns(), hb_ADel(), hb_AScan() * source/rtl/persist.prg ! Fixed hard-wired EOL length. ! Fixed to not go into an infinite loop on non EOL terminated texts. (Thanks Petr) ! Fixed to use hb_At() instead of extended At(). ! Fixed to also handle LF delimited texts. ; All this in static function ExtractLine() * contrib/rdd_ads/doc/gendoc.bat ! Added version header. * contrib/hgf/tests/bld_b32.bat ! Some more minor cleanups. * contrib/pgsql/make_vc.bat * contrib/apollo/make_vc.bat * contrib/gd/make_vc.bat * contrib/adordd/make_vc.bat * contrib/pdflib/make_b32.bat * contrib/pdflib/make_vc.bat * contrib/btree/make_vc.bat * contrib/samples/make_vc.bat * contrib/mysql/make_vc.bat * contrib/odbc/make_vc.bat * contrib/bmdbfcdx/make_vc.bat ! Fixed EOL-style. + contrib/libmisc/test - contrib/libmisc/tests * Dir rename. --- harbour/ChangeLog | 41 +++++ harbour/contrib/adordd/make_vc.bat | 132 ++++++++-------- harbour/contrib/apollo/make_vc.bat | 132 ++++++++-------- harbour/contrib/bmdbfcdx/make_vc.bat | 132 ++++++++-------- harbour/contrib/btree/make_vc.bat | 132 ++++++++-------- harbour/contrib/gd/make_vc.bat | 144 ++++++++--------- harbour/contrib/hgf/tests/bld_b32.bat | 4 +- .../contrib/libmisc/{tests => test}/Makefile | 0 .../libmisc/{tests => test}/readfile.prg | 0 harbour/contrib/mysql/make_vc.bat | 148 +++++++++--------- harbour/contrib/odbc/make_vc.bat | 140 ++++++++--------- harbour/contrib/pdflib/make_b32.bat | 144 ++++++++--------- harbour/contrib/pdflib/make_vc.bat | 144 ++++++++--------- harbour/contrib/pgsql/make_vc.bat | 148 +++++++++--------- harbour/contrib/rdd_ads/doc/gendoc.bat | 6 +- harbour/contrib/samples/make_vc.bat | 132 ++++++++-------- harbour/include/hbextern.ch | 6 +- harbour/source/rtl/at.c | 11 +- harbour/source/rtl/persist.prg | 16 +- 19 files changed, 836 insertions(+), 776 deletions(-) rename harbour/contrib/libmisc/{tests => test}/Makefile (100%) rename harbour/contrib/libmisc/{tests => test}/readfile.prg (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 74733f65f1..512fa70fa0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,47 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-11 02:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/at.c + * include/hbextern.ch + + Added hb_At() which is equivalent to At() with + HB_EXTENSION turned on. Users are encouraged to + use hb_At(), and this is also a must inside core. + + * include/hbextern.ch + ! Added missing hb_AIns(), hb_ADel(), hb_AScan() + + * source/rtl/persist.prg + ! Fixed hard-wired EOL length. + ! Fixed to not go into an infinite loop on + non EOL terminated texts. (Thanks Petr) + ! Fixed to use hb_At() instead of extended At(). + ! Fixed to also handle LF delimited texts. + ; All this in static function ExtractLine() + + * contrib/rdd_ads/doc/gendoc.bat + ! Added version header. + + * contrib/hgf/tests/bld_b32.bat + ! Some more minor cleanups. + + * contrib/pgsql/make_vc.bat + * contrib/apollo/make_vc.bat + * contrib/gd/make_vc.bat + * contrib/adordd/make_vc.bat + * contrib/pdflib/make_b32.bat + * contrib/pdflib/make_vc.bat + * contrib/btree/make_vc.bat + * contrib/samples/make_vc.bat + * contrib/mysql/make_vc.bat + * contrib/odbc/make_vc.bat + * contrib/bmdbfcdx/make_vc.bat + ! Fixed EOL-style. + + + contrib/libmisc/test + - contrib/libmisc/tests + * Dir rename. + 2007-11-11 01:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/tpopup.prg ! Fixed a few problems regarding HB_EXTENSION guards. diff --git a/harbour/contrib/adordd/make_vc.bat b/harbour/contrib/adordd/make_vc.bat index 0709c7b924..2ab08989e6 100644 --- a/harbour/contrib/adordd/make_vc.bat +++ b/harbour/contrib/adordd/make_vc.bat @@ -1,66 +1,66 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat index 0709c7b924..2ab08989e6 100644 --- a/harbour/contrib/apollo/make_vc.bat +++ b/harbour/contrib/apollo/make_vc.bat @@ -1,66 +1,66 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/bmdbfcdx/make_vc.bat b/harbour/contrib/bmdbfcdx/make_vc.bat index 0709c7b924..2ab08989e6 100644 --- a/harbour/contrib/bmdbfcdx/make_vc.bat +++ b/harbour/contrib/bmdbfcdx/make_vc.bat @@ -1,66 +1,66 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/btree/make_vc.bat b/harbour/contrib/btree/make_vc.bat index 0709c7b924..2ab08989e6 100644 --- a/harbour/contrib/btree/make_vc.bat +++ b/harbour/contrib/btree/make_vc.bat @@ -1,66 +1,66 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat index c12b61bb2c..410f261f5f 100644 --- a/harbour/contrib/gd/make_vc.bat +++ b/harbour/contrib/gd/make_vc.bat @@ -1,72 +1,72 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need GD lib sources from www.libgd.org and this envvar -rem to be set to successfully build this library: -rem set C_USR=-IC:\gd-2.0.35 -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need GD lib sources from www.libgd.org and this envvar +rem to be set to successfully build this library: +rem set C_USR=-IC:\gd-2.0.35 +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hgf/tests/bld_b32.bat b/harbour/contrib/hgf/tests/bld_b32.bat index 3f144e458f..e29c3baee6 100644 --- a/harbour/contrib/hgf/tests/bld_b32.bat +++ b/harbour/contrib/hgf/tests/bld_b32.bat @@ -52,9 +52,9 @@ ilink32 -Gn -Tpe -s @bld_b32.mak rem delete temporary files del %1.c -del %1.map del %1.obj -del %1.tds +if exist %1.map del %1.map +if exist %1.tds del %1.tds del bld_b32.mak del bld_b32.log diff --git a/harbour/contrib/libmisc/tests/Makefile b/harbour/contrib/libmisc/test/Makefile similarity index 100% rename from harbour/contrib/libmisc/tests/Makefile rename to harbour/contrib/libmisc/test/Makefile diff --git a/harbour/contrib/libmisc/tests/readfile.prg b/harbour/contrib/libmisc/test/readfile.prg similarity index 100% rename from harbour/contrib/libmisc/tests/readfile.prg rename to harbour/contrib/libmisc/test/readfile.prg diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat index 24e00c7070..90b7043644 100644 --- a/harbour/contrib/mysql/make_vc.bat +++ b/harbour/contrib/mysql/make_vc.bat @@ -1,74 +1,74 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need MySQL sources and this envvar -rem to be set to successfully build this library: -rem set C_USR=-IC:\mysql-5.0.45\include -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -set C_USR=%C_USR% -DHB_OS_WIN_32_USED - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need MySQL sources and this envvar +rem to be set to successfully build this library: +rem set C_USR=-IC:\mysql-5.0.45\include +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +set C_USR=%C_USR% -DHB_OS_WIN_32_USED + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/odbc/make_vc.bat b/harbour/contrib/odbc/make_vc.bat index bec8f73542..fb51e1e2aa 100644 --- a/harbour/contrib/odbc/make_vc.bat +++ b/harbour/contrib/odbc/make_vc.bat @@ -1,70 +1,70 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - LIB /MACHINE:X86 /DEF:odbc32.def /OUT:..\..\lib\%HB_CC_NAME%\odbc32.lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - copy ..\..\lib\%HB_CC_NAME%\odbc32.lib ..\..\lib\ - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + LIB /MACHINE:X86 /DEF:odbc32.def /OUT:..\..\lib\%HB_CC_NAME%\odbc32.lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + copy ..\..\lib\%HB_CC_NAME%\odbc32.lib ..\..\lib\ + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat index 4dbb1d5c18..643fde4b7e 100644 --- a/harbour/contrib/pdflib/make_b32.bat +++ b/harbour/contrib/pdflib/make_b32.bat @@ -1,72 +1,72 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need PDFLIB lib sources this envvar -rem to be set to successfully build this library: -rem set C_USR=-IC:\pdflib\src\pdflib -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need PDFLIB lib sources this envvar +rem to be set to successfully build this library: +rem set C_USR=-IC:\pdflib\src\pdflib +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat index febd20012d..ad1a0124f8 100644 --- a/harbour/contrib/pdflib/make_vc.bat +++ b/harbour/contrib/pdflib/make_vc.bat @@ -1,72 +1,72 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need PDFLIB lib sources this envvar -rem to be set to successfully build this library: -rem set C_USR=-IC:\pdflib\src\pdflib -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need PDFLIB lib sources this envvar +rem to be set to successfully build this library: +rem set C_USR=-IC:\pdflib\src\pdflib +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat index 06e62bced1..2f8c4c1bf7 100644 --- a/harbour/contrib/pgsql/make_vc.bat +++ b/harbour/contrib/pgsql/make_vc.bat @@ -1,74 +1,74 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need PostreSQL sources and this envvar -rem to be set to successfully build this library: -rem set C_USR=-IC:\postgresql-8.2.5\src\include -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -set C_USR=%C_USR% -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need PostreSQL sources and this envvar +rem to be set to successfully build this library: +rem set C_USR=-IC:\postgresql-8.2.5\src\include +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +set C_USR=%C_USR% -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/rdd_ads/doc/gendoc.bat b/harbour/contrib/rdd_ads/doc/gendoc.bat index ab487efe6e..05a8f106f2 100644 --- a/harbour/contrib/rdd_ads/doc/gendoc.bat +++ b/harbour/contrib/rdd_ads/doc/gendoc.bat @@ -1,3 +1,8 @@ +@echo off +rem +rem $Id$ +rem + if "%1" =="/OS2" goto OS2 if "%1" =="/NGI" goto NG if "%1" =="/RTF" goto RTF @@ -30,4 +35,3 @@ GOTO END GOTO END :END del ass*.bat - diff --git a/harbour/contrib/samples/make_vc.bat b/harbour/contrib/samples/make_vc.bat index 0709c7b924..2ab08989e6 100644 --- a/harbour/contrib/samples/make_vc.bat +++ b/harbour/contrib/samples/make_vc.bat @@ -1,66 +1,66 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak - -rem --------------------------------------------------------------- - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log - goto EXIT - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log - if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul - if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul - goto EXIT - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul - goto EXIT - -:EXIT - -rem --------------------------------------------------------------- - -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + if errorlevel 1 notepad make_%HB_CC_NAME%.log + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul + if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul + goto EXIT + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index c3a2785bd4..376b57230a 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -1002,6 +1002,11 @@ EXTERNAL HB_LANG_TRWIN EXTERNAL HB_LANG_ZHB5 EXTERNAL HB_LANG_ZHGB +EXTERNAL HB_AT +EXTERNAL HB_AINS +EXTERNAL HB_ADEL +EXTERNAL HB_ASCAN +EXTERNAL HB_RASCAN EXTERNAL HB_ANSITOOEM EXTERNAL HB_CLRAREA EXTERNAL HB_COLORTON @@ -1037,7 +1042,6 @@ EXTERNAL HB_TOKENCOUNT EXTERNAL HB_TOKENGET EXTERNAL HB_TOKENPTR EXTERNAL HB_ATOKENS -EXTERNAL HB_RASCAN EXTERNAL HB_HASH EXTERNAL HB_HHASKEY diff --git a/harbour/source/rtl/at.c b/harbour/source/rtl/at.c index 32ecd22a50..a227c6ab3b 100644 --- a/harbour/source/rtl/at.c +++ b/harbour/source/rtl/at.c @@ -56,9 +56,7 @@ /* locates a substring in a string */ -#if defined( HB_EXTENSION ) - -HB_FUNC( AT ) +HB_FUNC( HB_AT ) { PHB_ITEM pSub = hb_param( 1, HB_IT_STRING ); PHB_ITEM pText = hb_param( 2, HB_IT_STRING ); @@ -87,6 +85,13 @@ HB_FUNC( AT ) hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, "AT", HB_ERR_ARGS_BASEPARAMS ); } +#if defined( HB_EXTENSION ) + +HB_FUNC( AT ) +{ + HB_FUNC_EXEC( HB_AT ); +} + #else HB_FUNC( AT ) diff --git a/harbour/source/rtl/persist.prg b/harbour/source/rtl/persist.prg index f304573d31..5da9dccd7a 100644 --- a/harbour/source/rtl/persist.prg +++ b/harbour/source/rtl/persist.prg @@ -229,14 +229,20 @@ return cText static function ExtractLine( cText, nFrom ) - local nAt := At( hb_OSNewLine(), cText, nFrom ) + local nAt := hb_At( Chr( 10 ), cText, nFrom ) if nAt > 0 - cText := Substr( cText, nFrom, nAt - nFrom ) - nFrom := nAt + 2 + cText := SubStr( cText, nFrom, nAt - nFrom ) + if Right( cText, 1 ) == Chr( 13 ) + cText := Left( cText, Len( cText ) - 1 ) + endif + nFrom := nAt + 1 else - cText := Substr( cText, nFrom ) - nFrom := Len( cText ) + 1 + cText := SubStr( cText, nFrom ) + if Right( cText, 1 ) == Chr( 13 ) + cText := Left( cText, Len( cText ) - 1 ) + endif + nFrom += Len( cText ) + 1 endif return cText