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

2009-06-06 01:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* bin/hb-mkdyn.bat
    ! Applied version number change to this file, too.

  * contrib/xpp/xpp.ch
    + Added minor tweak to not confuse non-Harbour compilers
      if included.

  * contrib/rddsql/sddfb/fbirddd.c
  * contrib/rddsql/sddpg/pgsqldd.c
    ! Warnings fixed.

  * contrib/hbmysql/mysql.c
    ! Fixed wrong type for file handle, causing problems for x64 builds.

  * contrib/hbnf/descendn.c
    ! Removed 'auto' keyword which is no longer recognized by
      MSVC 2010.

  * bin/postinst.bat
    + Creating implibs for msvc64/mingw64 platforms where 3rd
      parties support it. (libcurl, firebird, mysql)

  * contrib/gtwvg/wvggui.h
    ! Fixed to compile with MSVS 2010. Thanks Pritpal.

  * contrib/gtwvg/wvggui.c
    * Reenabled for MSVS 2010 after applying fix.
This commit is contained in:
Viktor Szakats
2009-06-05 23:21:16 +00:00
parent 8fcec391a4
commit b16692e111
10 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -17,6 +17,35 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-06 01:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-mkdyn.bat
! Applied version number change to this file, too.
* contrib/xpp/xpp.ch
+ Added minor tweak to not confuse non-Harbour compilers
if included.
* contrib/rddsql/sddfb/fbirddd.c
* contrib/rddsql/sddpg/pgsqldd.c
! Warnings fixed.
* contrib/hbmysql/mysql.c
! Fixed wrong type for file handle, causing problems for x64 builds.
* contrib/hbnf/descendn.c
! Removed 'auto' keyword which is no longer recognized by
MSVC 2010.
* bin/postinst.bat
+ Creating implibs for msvc64/mingw64 platforms where 3rd
parties support it. (libcurl, firebird, mysql)
* contrib/gtwvg/wvggui.h
! Fixed to compile with MSVS 2010. Thanks Pritpal.
* contrib/gtwvg/wvggui.c
* Reenabled for MSVS 2010 after applying fix.
2009-06-05 23:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+ config/mingw32-make.exe
+ Added GNU Make (Windows, 32-bit) executable (size: 173KB),
@@ -161,6 +190,7 @@
* include/hbver.h
* doc/whatsnew.txt
* source/vm/maindllp.c
* bin/hb-mkdyn.bat [MISSED FILE ADDED HERE LATER]
* 1.1.0dev -> 2.0.0dev
; Preparation for next rc1.

2
harbour/bin/hb-mkdyn.bat
View File

@@ -19,7 +19,7 @@ setlocal
if "%HB_ARCHITECTURE%" == "" ( echo HB_ARCHITECTURE needs to be set. && goto END )
if "%HB_COMPILER%" == "" ( echo HB_COMPILER needs to be set. && goto END )
set HB_DLL_VERSION=11
set HB_DLL_VERSION=20
set HB_DLL_LIBS=hbcommon hbpp hbrtl hbmacro hblang hbcpage hbpcre hbzlib hbextern hbrdd rddntx rddnsx rddcdx rddfpt hbsix hbhsx hbusrrdd gtcgi gtpca gtstd gtwvt gtgui
set HB_DLL_LIBS_WIN=gtwin
set HB_DLL_LIBS_ST=hbvm

20
harbour/bin/postinst.bat
View File

@@ -113,6 +113,16 @@ if "%HB_BUILD_IMPLIB%" == "yes" (
goto END
)
if "%HB_COMPILER%" == "msvc64" (
if exist "%HB_DIR_CURL%\libcurl.dll" call :P_MSVC_IMPLIB "%HB_DIR_CURL%\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib"
if exist "%HB_DIR_CURL%\bin\libcurl.dll" call :P_MSVC_IMPLIB "%HB_DIR_CURL%\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib"
if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib"
if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib"
goto END
)
if "%HB_COMPILER%" == "mingw" (
if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\libace32.a"
@@ -143,6 +153,16 @@ if "%HB_BUILD_IMPLIB%" == "yes" (
goto END
)
if "%HB_COMPILER%" == "mingw64" (
if exist "%HB_DIR_CURL%\lib\libcurl.a" copy /b /y "%HB_DIR_CURL%\lib\libcurl.a" "%HB_LIB_INSTALL%\libcurl.a"
if exist "%HB_DIR_CURL%\lib\libcurldll.a" copy /b /y "%HB_DIR_CURL%\lib\libcurldll.a" "%HB_LIB_INSTALL%\libcurldll.a"
if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\libfbclient.a"
if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a"
goto END
)
if "%HB_COMPILER%" == "pocc" (
if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib"

5
harbour/contrib/gtwvg/wvggui.c
View File

@@ -82,9 +82,6 @@
*
*/
/* TOFIX: ? Several errors when using MSVS 2010 Beta 1 */
#if ! defined(_MSC_VER) || _MSC_VER < 1600
#define HB_OS_WIN_USED
#include "wvggui.h"
@@ -2279,5 +2276,3 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ )
static HB_$INITSYM hb_vm_auto__hb_startup_gt_Init_ = _hb_startup_gt_Init_;
#pragma data_seg()
#endif
#endif

12
harbour/contrib/gtwvg/wvggui.h
View File

@@ -62,6 +62,12 @@
#define CINTERFACE 1
#endif
#ifndef _WIN32_IE
#ifndef __MINGW64__
#define _WIN32_IE 0x0400
#endif
#endif
/*----------------------------------------------------------------------*/
#include <windows.h>
@@ -91,12 +97,6 @@
#include "hbgtwvg.ch"
#ifndef _WIN32_IE
#ifndef __MINGW64__
#define _WIN32_IE 0x0400
#endif
#endif
HB_EXTERN_BEGIN
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbmysql/mysql.c
View File

@@ -320,7 +320,7 @@ HB_FUNC( MYSQL_ESCAPE_STRING )
static char * filetoBuff( char * fname, int * size )
{
char * buffer = NULL;
int handle = hb_fsOpen( ( BYTE * ) fname, FO_READWRITE );
HB_FHANDLE handle = hb_fsOpen( ( BYTE * ) fname, FO_READWRITE );
if( handle != FS_ERROR )
{

11
harbour/contrib/hbnf/descendn.c
View File

@@ -52,13 +52,12 @@ HB_FUNC( FT_DESCEND )
{
#if defined(HB_OS_DOS) || defined(HB_OS_WIN)
{
PHB_ITEM iP = hb_itemParam( 1 );
HB_TYPE uiType = hb_itemType( iP );
auto PHB_ITEM iP = hb_itemParam( 1 );
auto HB_TYPE uiType = hb_itemType( iP );
auto PHB_ITEM iR = NULL;
auto USHORT uiLen, n;
auto char * pDescend;
PHB_ITEM iR = NULL;
USHORT uiLen, n;
char * pDescend;
if ( ( uiType & HB_IT_NUMERIC ) && ( uiType & HB_IT_DOUBLE ) )
iR = hb_itemPutND( 0, 0 - hb_itemGetND( iP ) );

2
harbour/contrib/rddsql/sddfb/fbirddd.c
View File

@@ -466,7 +466,7 @@ static HB_ERRCODE fbGoTo( SQLBASEAREAP pArea, ULONG ulRecNo )
XSQLVAR* pVar;
PHB_ITEM pItem, pArray;
USHORT ui;
long lErr;
ISC_STATUS lErr;
short iType;
while ( ulRecNo > pArea->ulRecCount && ! pArea->fFetched )

2
harbour/contrib/rddsql/sddpg/pgsqldd.c
View File

@@ -261,7 +261,7 @@ static HB_ERRCODE pgsqlOpen( SQLBASEAREAP pArea )
status = PQresultStatus( pResult );
if ( status != PGRES_TUPLES_OK && status != PGRES_COMMAND_OK )
{
hb_errRT_PostgreSQLDD( EG_OPEN, ESQLDD_INVALIDQUERY, PQresultErrorMessage( pResult ), pArea->szQuery, status );
hb_errRT_PostgreSQLDD( EG_OPEN, ESQLDD_INVALIDQUERY, PQresultErrorMessage( pResult ), pArea->szQuery, ( USHORT ) status );
return HB_FAILURE;
}

2
harbour/contrib/xpp/xpp.ch
View File

@@ -55,6 +55,7 @@
/* Translations for Harbour programs compiled with Xbase++ compiler */
#else
#ifdef __HARBOUR__
/* Translations for Xbase++ programs compiled with Harbour compiler */
@@ -71,3 +72,4 @@
original Xbase++ names. */
#endif
#endif