fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-02-07 22:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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
This commit is contained in:
Viktor Szakats
2010-02-07 21:36:26 +00:00
parent 59604ddfbf
commit 9528be4a18
8 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -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

4
harbour/bin/hb-mkimp.bat
View File

@@ -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"

20
harbour/examples/gtwvw/gtwvw.c
View File

@@ -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 );

10
harbour/examples/hbapollo/apollo.c
View File

@@ -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 )
{

4
harbour/examples/hbapollo/hbapollo.hbc
View File

@@ -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

2
harbour/examples/hbapollo/hbapollo.hbp
View File

@@ -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

2
harbour/examples/hbsqlit2/hbsqlit2.hbp
View File

@@ -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}

3
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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." )