diff --git a/harbour/ChangeLog b/harbour/ChangeLog index be2369c13e..32aad5dfc9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,52 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-13 16:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/hbmk.bat + + Added autodetection of Harbour dirs. So this batch will + now work when called from any directories, and even if + '/bin' dir is added to the PATH. IOW, it's not anymore + necessary to supply these envvars in normal cases: + HB_INSTALL_PREFIX, HB_BIN_INSTALL, HB_LIB_INSTALL, + HB_INC_INSTALL. If someone moves this batch file away + from its original place, these envvars can still be used + to point to the Harbour tree, but support for this may + be removed in the future to keep things simple. + + Added support for multiple .prg files on the command line. + The first will be the main program. + + Added support to supply .c files on the command line. + [these features need Windows NT or upper] + ; TODO: Test OpenWatcom. I had to remove -fo and FILE + directives from script, if this was required we + need to find a solution to support multiple + input files. + + * bin/hbmk_b32.bat + * bin/hbmk_vc.bat + + Now these files can be called from any directories and even + when '/bin' dir is added to the PATH. + + Added support for unlimited number of command line parameters. + [these features need Windows NT or upper] + * Changed to not interfere with 'echo off' setting of the + caller. + + ; NOTE: After this change it's possible to get rid of all + non-customized version of hbmk_b32.bat/hbmk_vc.bat + files in the source tree. I plan to remove these in + the near future. The rest can be simplified in most + places. This will only cause some inconvenience + for developers still using Win95/98/ME. + + + bin/hbmk_gcc.bat + + bin/hbmk_ow.bat + + Added make batch files to MingW/GCC and OpenWatcom. + + * contrib/hbwin/win_tprn.prg + ! Fixed recent typo. + + * include/hbstdgen.ch + - Removed #undef __FILE__. I understand this isn't needed anymore. + 2009-02-13 13:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/common/hbver.c + Added Windows 7 and Windows Server 2008 R2 detection. @@ -57,7 +103,7 @@ * contrib/gtwvg/gtwvg.h * contrib/gtwvg/wvggui.h * contrib/examples/terminal/trm_client.prg - + Added HB_EXTERN_START/END. + + Added HB_EXTERN_BEGIN/END. * include/hbdefs.h + Added some comments from the original mail from Przemek. diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat index 4e93460561..7219c595a5 100644 --- a/harbour/bin/hbmk.bat +++ b/harbour/bin/hbmk.bat @@ -1,4 +1,4 @@ -@echo off +rem @echo off rem rem $Id$ rem @@ -23,10 +23,23 @@ rem --------------------------------------------------------------- rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=win rem if "%HB_COMPILER%" == "" set HB_COMPILER=mingw -if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=.. -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include +if "%OS%" == "Windows_NT" goto _S_WINNT + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=.. + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + goto _S_END + +:_S_WINNT + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=%~dp0.. + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + goto _S_END + +:_S_END set _HB_USR_C= set _HB_USR_L= @@ -63,7 +76,6 @@ if not "%1" == "-debug" goto NO_DEBUG :NO_DEBUG if not "%_HB_MT%" == "yes" set _HB_MT= -if "%_HB_MT%" == "MT" set _HB_MT=mt if "%_HB_MT%" == "yes" set _HB_MT=mt :START @@ -125,10 +137,56 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt :COMPILE - if "%OS%" == "Windows_NT" set _HB_PRG_NAME=%~n1 - if not "%OS%" == "Windows_NT" set _HB_PRG_NAME=%1 + if "%OS%" == "Windows_NT" goto _P_WINNT - %HB_BIN_INSTALL%\harbour %_HB_PRG_NAME%.prg -n -q0 -i%HB_INC_INSTALL% %2 %3 %HB_USER_PRGFLAGS% + set _HB_P_PRG_MAIN=%1 + set _HB_P_PRG=%1.prg + set _HB_P_PRG_C=%1.c + set _HB_P_C= + set _HB_P_O=%1.o + set _HB_P_OBJ=%1.obj + set _HB_P_OPT=%2 %3 + goto _P_END + + :_P_WINNT + + set _HB_P_PRG_MAIN= + set _HB_P_PRG= + set _HB_P_PRG_C= + set _HB_P_C= + set _HB_P_O= + set _HB_P_OBJ= + set _HB_P_OPT= + + :_P_SORT_R + if not "%~x1" == ".prg" goto _P_SORT_NP + if "%_HB_P_PRG_MAIN%" == "" set _HB_P_PRG_MAIN=%~dpn1 + set _HB_P_PRG=%_HB_P_PRG% %1 + set _HB_P_PRG_C=%_HB_P_PRG_C% %~dpn1.c + set _HB_P_O=%_HB_P_O% %~dpn1.o + set _HB_P_OBJ=%_HB_P_OBJ% %~dpn1.obj + shift + goto _P_SORT_R + :_P_SORT_NP + + if not "%~x1" == ".c" goto _P_SORT_NC + set _HB_P_C=%_HB_P_C% %1 + set _HB_P_O=%_HB_P_O% %~dpn1.o + set _HB_P_OBJ=%_HB_P_OBJ% %~dpn1.obj + shift + goto _P_SORT_R + :_P_SORT_NC + + if "%1" == "" goto _P_SORT_E + set _HB_P_OPT=%_HB_P_OPT% + shift + goto _P_SORT_R + :_P_SORT_E + goto _P_END + + :_P_END + + %HB_BIN_INSTALL%\harbour %_HB_P_PRG% -n -q0 -i%HB_INC_INSTALL% %HB_USER_PRGFLAGS% %_HB_P_OPT% :A_DOS @@ -136,8 +194,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT - echo %_HB_PRG_NAME%.c > _hb_mk.tmp - echo -o%_HB_PRG_NAME%.exe -O3 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> _hb_mk.tmp + echo %_HB_P_PRG_C% %_HB_P_C% > _hb_mk.tmp + echo -o%_HB_P_PRG_MAIN%.exe -O3 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> _hb_mk.tmp echo -lhbcpage >> _hb_mk.tmp echo -lhbdebug >> _hb_mk.tmp echo -lhbvm >> _hb_mk.tmp @@ -168,16 +226,15 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if not "%HB_COMPILER%" == "rsx32" goto A_DOS_RSX32_NOT - gcc %_HB_PRG_NAME%.c -O3 -Zrsx32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -lgtdos -lgtcgi -lgtstd -lgtpca -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %_HB_P_PRG_C% -O3 -Zrsx32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -lgtdos -lgtcgi -lgtstd -lgtpca -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib goto CLEANUP :A_DOS_RSX32_NOT if not "%HB_COMPILER%" == "owatcom" goto END - wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj - echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp - echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp + wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %HB_USER_CFLAGS% %_HB_P_PRG_C% %_HB_P_C% + echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %HB_USER_LDFLAGS% NAME %_HB_P_PRG_MAIN%.exe > _hb_mk.tmp echo LIB hbcpage.lib >> _hb_mk.tmp echo LIB hbdebug.lib >> _hb_mk.tmp echo LIB hbvm.lib >> _hb_mk.tmp @@ -216,8 +273,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if "%_HB_GUI%" == "yes" set _HB_USR_C=%_HB_USR_C% -tW - if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddnsx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib - if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% harbour%_HB_MT%-11-b32.lib hbmainstd.lib hbmainwin.lib hbcommon.lib + if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_P_PRG_C% %_HB_P_C% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddnsx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib + if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_P_PRG_C% %_HB_P_C% %HB_USER_LIBS% harbour%_HB_MT%-11-b32.lib hbmainstd.lib hbmainwin.lib hbcommon.lib goto CLEANUP @@ -230,8 +287,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if not "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:console if "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:windows - if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddnsx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib - if "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% harbour%_HB_MT%-11-vc.lib hbmainstd.lib hbmainwin.lib hbcommon.lib user32.lib wsock32.lib advapi32.lib gdi32.lib + if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_P_PRG_C% %_HB_P_C% /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddnsx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib + if "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_P_PRG_C% %_HB_P_C% /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% harbour%_HB_MT%-11-vc.lib hbmainstd.lib hbmainwin.lib hbcommon.lib user32.lib wsock32.lib advapi32.lib gdi32.lib goto CLEANUP :A_WIN_MSVC_NOT @@ -239,23 +296,26 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if "%HB_COMPILER%" == "gcc" set HB_COMPILER=mingw if not "%HB_COMPILER%" == "mingw" goto A_WIN_MINGW_NOT - gcc %_HB_PRG_NAME%.c -O3 -o%_HB_PRG_NAME%.exe %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %_HB_P_PRG_C% %_HB_P_C% -O3 -o%_HB_P_PRG_MAIN%.exe %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + set _HB_P_OBJ= + if not "%_HB_P_O%" == "" del %_HB_P_O% goto CLEANUP :A_WIN_MINGW_NOT if not "%HB_COMPILER%" == "rsxnt" goto A_WIN_RSXNT_NOT - gcc %_HB_PRG_NAME%.c -O3 -Zwin32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %_HB_P_PRG_C% %_HB_P_C% -O3 -Zwin32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + set _HB_P_OBJ= + if not "%_HB_P_O%" == "" del %_HB_P_O% goto CLEANUP :A_WIN_RSXNT_NOT if not "%HB_COMPILER%" == "owatcom" goto END - wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj - echo OP osn=NT OP stack=65536 OP CASEEXACT %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp - echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp + wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %HB_USER_CFLAGS% %_HB_P_PRG_C% %_HB_P_C% + echo OP osn=NT OP stack=65536 OP CASEEXACT %HB_USER_LDFLAGS% NAME %_HB_P_PRG_MAIN%.exe > _hb_mk.tmp echo LIB hbcpage.lib >> _hb_mk.tmp echo LIB hbdebug.lib >> _hb_mk.tmp echo LIB hbvm%_HB_MT%.lib >> _hb_mk.tmp @@ -288,11 +348,10 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt :CLEANUP - if exist %_HB_PRG_NAME%.c del %_HB_PRG_NAME%.c - if exist %_HB_PRG_NAME%.o del %_HB_PRG_NAME%.o - if exist %_HB_PRG_NAME%.obj del %_HB_PRG_NAME%.obj + if not "%_HB_P_PRG_C%" == "" del %_HB_P_PRG_C% + if not "%_HB_P_OBJ%" == "" del %_HB_P_OBJ% rem Borland stuff - if not "%_HB_DEBUG%" == "yes" if exist %_HB_PRG_NAME%.tds del %_HB_PRG_NAME%.tds + if not "%_HB_DEBUG%" == "yes" if exist %_HB_P_PRG_MAIN%.tds del %_HB_P_PRG_MAIN%.tds :END diff --git a/harbour/bin/hbmk_b32.bat b/harbour/bin/hbmk_b32.bat index 3e317637f7..a69ae70cdc 100644 --- a/harbour/bin/hbmk_b32.bat +++ b/harbour/bin/hbmk_b32.bat @@ -1,17 +1,17 @@ -@echo off -rem -rem $Id$ -rem +@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 --------------------------------------------------------------- +@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 --------------------------------------------------------------- -set HB_ARCHITECTURE=win -set HB_COMPILER=bcc32 +@set HB_ARCHITECTURE=win +@set HB_COMPILER=bcc32 -call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +@if "%OS%" == "Windows_NT" call "%~dp0hbmk.bat" %* +@if not "%OS%" == "Windows_NT" call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/hbmk_gcc.bat b/harbour/bin/hbmk_gcc.bat new file mode 100644 index 0000000000..add7663cc4 --- /dev/null +++ b/harbour/bin/hbmk_gcc.bat @@ -0,0 +1,17 @@ +@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 --------------------------------------------------------------- + +@set HB_ARCHITECTURE=win +@set HB_COMPILER=gcc + +@if "%OS%" == "Windows_NT" call "%~dp0hbmk.bat" %* +@if not "%OS%" == "Windows_NT" call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/hbmk_ow.bat b/harbour/bin/hbmk_ow.bat new file mode 100644 index 0000000000..d1ad064c89 --- /dev/null +++ b/harbour/bin/hbmk_ow.bat @@ -0,0 +1,17 @@ +@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 --------------------------------------------------------------- + +@set HB_ARCHITECTURE=win +@set HB_COMPILER=owatcom + +@if "%OS%" == "Windows_NT" call "%~dp0hbmk.bat" %* +@if not "%OS%" == "Windows_NT" call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/hbmk_vc.bat b/harbour/bin/hbmk_vc.bat index f8873aa275..5e9b091202 100644 --- a/harbour/bin/hbmk_vc.bat +++ b/harbour/bin/hbmk_vc.bat @@ -1,17 +1,17 @@ -@echo off -rem -rem $Id$ -rem +@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 --------------------------------------------------------------- +@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 --------------------------------------------------------------- -set HB_ARCHITECTURE=win -set HB_COMPILER=msvc +@set HB_ARCHITECTURE=win +@set HB_COMPILER=msvc -call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +@if "%OS%" == "Windows_NT" call "%~dp0hbmk.bat" %* +@if not "%OS%" == "Windows_NT" call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg index f10c79bdec..d4a07d46f6 100644 --- a/harbour/contrib/hbwin/win_tprn.prg +++ b/harbour/contrib/hbwin/win_tprn.prg @@ -351,7 +351,7 @@ METHOD EndDoc( lAbortDoc ) CLASS WIN_PRN lAbortDoc := .T. ENDIF IF lAbortDoc - win_AbordDoc( ::hPrinterDC ) + win_AbortDoc( ::hPrinterDC ) ELSE ::EndPage( .F. ) win_EndDoc( ::hPrinterDC ) diff --git a/harbour/include/hbstdgen.ch b/harbour/include/hbstdgen.ch index 1d832071fb..5d8a238468 100644 --- a/harbour/include/hbstdgen.ch +++ b/harbour/include/hbstdgen.ch @@ -66,7 +66,6 @@ #undef __DATE__ #undef __TIME__ -#undef __FILE__ #undef __HB_MAIN__ #undef __ARCH16BIT__ #undef __ARCH32BIT__