diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8e76955b34..bedcf6633b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,25 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-07 22:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * bin/hb-mkimp.bat + + Added support for Apollo 7. + + * utils/hbmk2/hbmk2.prg + + Accepting '&&' and '||' as 'and' and 'or' operators. + + * examples/hbsqlit2/hbsqlit2.hbp + * examples/hbapollo/hbapollo.hbp + + HB_INC_* -> HB_WITH_* + + * examples/hbapollo/apollo.c + * examples/hbapollo/hbapollo.hbc + + Added support for Apollo 7. + + Version 6.1 can now be selected by defining HB_WITH_APOLLO_VER61 envvar. + + * examples/gtwvw/gtwvw.c + * HB_LONG -> HB_MAXINT + 2010-02-07 21:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * include/clipdefs.h + Added Clipper compatible legacy types to Clipper compatibility diff --git a/harbour/bin/hb-mkimp.bat b/harbour/bin/hb-mkimp.bat index 8a5d655d99..1ca5f85e6e 100644 --- a/harbour/bin/hb-mkimp.bat +++ b/harbour/bin/hb-mkimp.bat @@ -32,6 +32,7 @@ if not "%HB_LIB_INSTALL%" == "" ( if exist "%HB_WITH_ADS%\32bit\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\32bit\ace32.dll" if exist "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" implib -a "%HB_LIB_INSTALL%\alleg.lib" "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" if exist "%HB_WITH_APOLLO%\..\sde61.dll" implib "%HB_LIB_INSTALL%\sde61.lib" "%HB_WITH_APOLLO%\..\sde61.dll" + if exist "%HB_WITH_APOLLO%\..\sde7.dll" implib "%HB_LIB_INSTALL%\sde7.lib" "%HB_WITH_APOLLO%\..\sde7.dll" if exist "%HB_WITH_BLAT%\..\blat.dll" implib -a "%HB_LIB_INSTALL%\blat.lib" "%HB_WITH_BLAT%\..\blat.dll" if exist "%HB_WITH_CAIRO%\..\..\bin\libcairo-2.dll" implib -a "%HB_LIB_INSTALL%\cairo.lib" "%HB_WITH_CAIRO%\..\..\bin\libcairo-2.dll" if exist "%HB_WITH_CURL%\..\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_WITH_CURL%\..\libcurl.dll" @@ -60,6 +61,7 @@ if not "%HB_LIB_INSTALL%" == "" ( if exist "%HB_WITH_ADS%\32bit\ace32.lib" copy /b /y "%HB_WITH_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" if exist "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" copy /b /y "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" if exist "%HB_WITH_APOLLO%\..\sde61.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_APOLLO%\..\sde61.dll" "%HB_LIB_INSTALL%\sde61.lib" + if exist "%HB_WITH_APOLLO%\..\sde7.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_APOLLO%\..\sde7.dll" "%HB_LIB_INSTALL%\sde7.lib" if exist "%HB_WITH_BLAT%\..\blat.lib" copy /b /y "%HB_WITH_BLAT%\..\blat.lib" "%HB_LIB_INSTALL%\blat.lib" if exist "%HB_WITH_CAIRO%\..\..\lib\cairo.lib" copy /b /y "%HB_WITH_CAIRO%\..\..\lib\cairo.lib" "%HB_LIB_INSTALL%\cairo.lib" if exist "%HB_WITH_CURL%\..\libcurl.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_CURL%\..\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" @@ -140,6 +142,7 @@ if not "%HB_LIB_INSTALL%" == "" ( if exist "%HB_WITH_ADS%\32bit\ace32.lib" copy /b /y "%HB_WITH_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" if exist "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" copy /b /y "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" if exist "%HB_WITH_APOLLO%\..\sde61.dll" polib "%HB_WITH_APOLLO%\..\sde61.dll" /out:"%HB_LIB_INSTALL%\sde61.lib" + if exist "%HB_WITH_APOLLO%\..\sde7.dll" polib "%HB_WITH_APOLLO%\..\sde7.dll" /out:"%HB_LIB_INSTALL%\sde7.lib" if exist "%HB_WITH_BLAT%\..\blat.lib" copy /b /y "%HB_WITH_BLAT%\..\blat.lib" "%HB_LIB_INSTALL%\blat.lib" if exist "%HB_WITH_CAIRO%\..\..\lib\cairo.lib" copy /b /y "%HB_WITH_CAIRO%\..\..\lib\cairo.lib" "%HB_LIB_INSTALL%\cairo.lib" if exist "%HB_WITH_CURL%\..\libcurl.dll" polib "%HB_WITH_CURL%\..\libcurl.dll" /out:"%HB_LIB_INSTALL%\libcurl.lib" @@ -170,6 +173,7 @@ if not "%HB_LIB_INSTALL%" == "" ( if exist "%HB_WITH_ADS%\32bit\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\32bit\ace32.dll" if exist "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\alleg.lib" "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" if exist "%HB_WITH_APOLLO%\..\sde61.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\sde61.lib" "%HB_WITH_APOLLO%\..\sde61.dll" + if exist "%HB_WITH_APOLLO%\..\sde7.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\sde7.lib" "%HB_WITH_APOLLO%\..\sde7.dll" if exist "%HB_WITH_BLAT%\..\blat.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\blat.lib" "%HB_WITH_BLAT%\..\blat.dll" if exist "%HB_WITH_CAIRO%\..\..\bin\libcairo-2.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\cairo.lib" "%HB_WITH_CAIRO%\..\..\bin\libcairo-2.dll" if exist "%HB_WITH_CURL%\..\libcurl.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libcurl.lib" "%HB_WITH_CURL%\..\libcurl.dll" diff --git a/harbour/examples/gtwvw/gtwvw.c b/harbour/examples/gtwvw/gtwvw.c index 9cef37ac41..a2a4c1713c 100644 --- a/harbour/examples/gtwvw/gtwvw.c +++ b/harbour/examples/gtwvw/gtwvw.c @@ -2333,7 +2333,7 @@ HB_EXPORT BOOL CALLBACK hb_gt_wvwDlgProcMLess( HWND hDlg, UINT message, WPARAM w { hb_vmPushDynSym( ( PHB_DYNS ) pFunc ); hb_vmPushNil(); - hb_vmPushNumInt(( HB_LONG ) ( HB_PTRDIFF ) hDlg ); + hb_vmPushNumInt(( HB_MAXINT ) ( HB_PTRDIFF ) hDlg ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -2382,7 +2382,7 @@ HB_EXPORT BOOL CALLBACK hb_gt_wvwDlgProcMLess( HWND hDlg, UINT message, WPARAM w { hb_vmPushEvalSym(); hb_vmPush( s_pWvwData->s_sApp->pFunc[ iIndex ] ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hDlg ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -2494,7 +2494,7 @@ HB_EXPORT BOOL CALLBACK hb_gt_wvwDlgProcModal( HWND hDlg, UINT message, WPARAM w hb_vmPushDynSym( ( PHB_DYNS ) pFunc ); hb_vmPushNil(); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hDlg ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -2538,7 +2538,7 @@ HB_EXPORT BOOL CALLBACK hb_gt_wvwDlgProcModal( HWND hDlg, UINT message, WPARAM w { hb_vmPushEvalSym(); hb_vmPush( pFunc ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hDlg ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -3100,7 +3100,7 @@ static void xUserTimerNow( UINT usWinNum, HWND hWnd, UINT message, WPARAM wParam hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_TIMER); hb_vmPushNil(); hb_vmPushInteger( ( int ) (usWinNum) ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hWnd ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -3333,7 +3333,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_MENUSELECT ); hb_vmPushNil(); hb_vmPushInteger( ( int ) (usWinNum) ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hWnd ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -3666,7 +3666,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_SETFOCUS); hb_vmPushNil(); hb_vmPushInteger( ( int ) (usWinNum) ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hWnd ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd ); hb_vmDo( 2 ); hb_vmRequestRestore(); } @@ -3699,7 +3699,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_KILLFOCUS ) ; hb_vmPushNil(); hb_vmPushInteger( ( int ) (usWinNum) ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hWnd ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd ); hb_vmDo( 2 ); hb_vmRequestRestore(); } @@ -4226,7 +4226,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_SIZE ); hb_vmPushNil(); hb_vmPushInteger( ( int ) (usWinNum) ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF )hWnd ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF )hWnd ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); @@ -6196,7 +6196,7 @@ static void hb_gt_wvwInputNotAllowed( UINT usWinNum, UINT message, WPARAM wParam hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_INPUTFOCUS ); hb_vmPushNil(); hb_vmPushInteger( ( int ) (usWinNum) ); - hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) s_pWvwData->s_pWindows[ usWinNum ]->hWnd ); + hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) s_pWvwData->s_pWindows[ usWinNum ]->hWnd ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam ); hb_vmPushNumInt( lParam ); diff --git a/harbour/examples/hbapollo/apollo.c b/harbour/examples/hbapollo/apollo.c index 43347c733a..a76cde78f4 100644 --- a/harbour/examples/hbapollo/apollo.c +++ b/harbour/examples/hbapollo/apollo.c @@ -65,7 +65,15 @@ #define MAX_STR_LEN 255 #include "hbapi.h" -#include "Sde61.h" + +#if defined( HB_WITH_APOLLO_VER61 ) + #include "Sde61.h" +#else + #include "sde7.h" +#endif + +/* Uncomment for previous version */ +/* */ HB_FUNC( SX_APPENDBLANK ) { diff --git a/harbour/examples/hbapollo/hbapollo.hbc b/harbour/examples/hbapollo/hbapollo.hbc index fc9260a09e..e983cd2271 100644 --- a/harbour/examples/hbapollo/hbapollo.hbc +++ b/harbour/examples/hbapollo/hbapollo.hbc @@ -8,4 +8,6 @@ incpaths=. libpaths=lib/${hb_plat}/${hb_comp} libs=hbapollo -libs={win}sde61 + +libs={win&&HB_WITH_APOLLO_VER61}sde61 +libs={win&&!HB_WITH_APOLLO_VER61}sde7 diff --git a/harbour/examples/hbapollo/hbapollo.hbp b/harbour/examples/hbapollo/hbapollo.hbp index 9b736aab02..8fee77b415 100644 --- a/harbour/examples/hbapollo/hbapollo.hbp +++ b/harbour/examples/hbapollo/hbapollo.hbp @@ -6,7 +6,7 @@ -olib/${hb_plat}/${hb_comp}/hbapollo -inc -q0 -w3 -es2 -l --i${HB_INC_APOLLO} +-i${HB_WITH_APOLLO} apollo.c apollo1.prg diff --git a/harbour/examples/hbsqlit2/hbsqlit2.hbp b/harbour/examples/hbsqlit2/hbsqlit2.hbp index 08f3b23297..46a5c972ff 100644 --- a/harbour/examples/hbsqlit2/hbsqlit2.hbp +++ b/harbour/examples/hbsqlit2/hbsqlit2.hbp @@ -6,7 +6,7 @@ -olib/${hb_plat}/${hb_comp}/hbsqlit2 -inc -q0 -w3 -es2 -l --i${HB_INC_SQLITE2} +-i${HB_WITH_SQLITE2} "-echo={dos}This library doesn't build on DOS." -stop{dos} diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a6cea5128a..2de34836a5 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -6703,6 +6703,9 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem ) cFilterHarb += StrTran( cExpr, "%1", cValue ) ENDIF + cFilterHarb := StrTran( cFilterHarb, "&&", "&" ) + cFilterHarb := StrTran( cFilterHarb, "||", "|" ) + cFilterHarb := StrTran( cFilterHarb, "&", ".AND." ) cFilterHarb := StrTran( cFilterHarb, "|", ".OR." )