diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 042023bd23..f45a5245a2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-25 23:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/postinst.cmd + * bin/postinst.bat + * bin/postinst.sh + - Removed creation of hb*.bat files. + + * contrib/make_b32_all.bat + * contrib/make_gcc_all.sh + * contrib/make_vc_all.bat + * contrib/Makefile + * Disabled hbwhat. + + * contrib/gtwvg/wvggui.c + ! Fixed a few warnings. + 2009-02-25 21:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/memvars.c + added support for reading FoxPro .mem files - Clipper compatibility diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index bf55a9b4a3..75cdf76060 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -25,23 +25,12 @@ goto inst_%HB_ARCHITECTURE% :inst_win rem Windows post install part - if "%OS%" == "Windows_NT" if "%HB_DLL%" == "yes" call %~dp0hb-mkdyn.bat - -echo @"%%~dp0hbmk2.exe" -hbcc %%*> %HB_BIN_INSTALL%\hbcc.bat -echo @"%%~dp0hbmk2.exe" -hbcmp %%*> %HB_BIN_INSTALL%\hbcmp.bat -echo @"%%~dp0hbmk2.exe" -hblnk %%*> %HB_BIN_INSTALL%\hblnk.bat - goto end :inst_dos rem DOS post install part - -echo @hbmk2.exe -hbcc %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcc.bat -echo @hbmk2.exe -hbcmp %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcmp.bat -echo @hbmk2.exe -hblnk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hblnk.bat - goto end diff --git a/harbour/bin/postinst.cmd b/harbour/bin/postinst.cmd index b275a8de09..7b78a5cedb 100644 --- a/harbour/bin/postinst.cmd +++ b/harbour/bin/postinst.cmd @@ -25,11 +25,6 @@ goto inst_%HB_ARCHITECTURE% :inst_os2 rem OS/2 post install part - -echo @hbmk2.exe -hbcc %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcc.cmd -echo @hbmk2.exe -hbcmp %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcmp.cmd -echo @hbmk2.exe -hblnk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hblnk.cmd - goto end diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index f1e96cdcf0..5bbae1d27a 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -91,12 +91,6 @@ then ln -s "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}" fi - if [ "$HB_COMPILER" = "mingw" ]; then - echo "@\"%~dp0hbmk2.exe\"" -hbcc %*> ${HB_BIN_INSTALL}/hbcc.bat - echo "@\"%~dp0hbmk2.exe\"" -hbcmp %*> ${HB_BIN_INSTALL}/hbcmp.bat - echo "@\"%~dp0hbmk2.exe\"" -hblnk %*> ${HB_BIN_INSTALL}/hblnk.bat - fi - mk_hbtools "${HB_BIN_INSTALL}" "$@" if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \ [ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ] || \ diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 52a3e9700f..9353b5ee7f 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -26,7 +26,7 @@ DIRS=\ hbtpathy \ hbvpdf \ hbwin \ - hbwhat \ +# hbwhat \ hbziparc \ rddado \ xhb \ diff --git a/harbour/contrib/gtwvg/wvggui.c b/harbour/contrib/gtwvg/wvggui.c index 79220226f0..e221a51022 100644 --- a/harbour/contrib/gtwvg/wvggui.c +++ b/harbour/contrib/gtwvg/wvggui.c @@ -1201,8 +1201,8 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara hb_arrayNew( pEvParams, 3 ); - hb_arraySetNL( pEvParams, 1, ( HB_LONG ) LOWORD( wParam ) ); - hb_arraySetNL( pEvParams, 2, ( HB_LONG ) HIWORD( wParam ) ); + hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) ); + hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) ); hb_arraySetNInt( pEvParams, 3, ( HB_LONG ) ( HB_PTRDIFF ) lParam ); hb_gt_wvt_FireEvent( pWVT, HB_GTE_HSCROLL, pEvParams ); @@ -1214,8 +1214,8 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara hb_arrayNew( pEvParams, 3 ); - hb_arraySetNL( pEvParams, 1, ( HB_LONG ) LOWORD( wParam ) ); - hb_arraySetNL( pEvParams, 2, ( HB_LONG ) HIWORD( wParam ) ); + hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) ); + hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) ); hb_arraySetNInt( pEvParams, 3, ( HB_LONG ) ( HB_PTRDIFF ) lParam ); hb_gt_wvt_FireEvent( pWVT, HB_GTE_VSCROLL, pEvParams ); diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index cc243b4cae..8675ce072f 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -49,7 +49,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=hbtip hbtpathy hbvpdf hbwin hbwhat hbziparc +set _HB_DIRS=hbtip hbtpathy hbvpdf hbwin hbziparc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado rddsql xhb diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index 3d3c2f4ef4..2b8223aea7 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -45,7 +45,7 @@ else case "$HB_ARCHITECTURE" in win|cyg|os2) - _HB_DIRS="${_HB_DIRS} gtwvg hbole hbodbc hbwin hbwhat rddado" + _HB_DIRS="${_HB_DIRS} gtwvg hbole hbodbc hbwin rddado" ;; *) esac diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index ea07e955bf..651e2d1e5b 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -49,7 +49,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=hbtip hbtpathy hbvpdf hbwin hbwhat hbziparc +set _HB_DIRS=hbtip hbtpathy hbvpdf hbwin hbziparc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado rddsql xhb