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

2010-11-07 15:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/version.c
    + HB_VERSION( HB_VERSION_PLATFORM ) changed to use hb_verPlatformMacro().
      This means it will now supported recently added platforms.
    ; NOTE: For consistency, __PLATFORM__WINDOWS should pbly be changed to __PLATFORM__WIN,
            and __PLATFORM__WINCE to __PLATFORM__WCE.

  * utils/hbmk2/hbmk2.prg
    + Added HB_HOST_PLAT macro, returning: hb_Version( HB_VERSION_PLATFORM )
    + Added HB_HOST_PLAT_UNIX macro.
    ! Fixed cygwin to be detected as cross target platform.
    ! Few cygwin related TOFIX-es cleared.

  * external/Makefile
  - external/sqlite3
  + contrib/3rd
  + contrib/3rd/sqlite3
  * contrib/3rd/sqlite3/sqlite3.hbc
  + contrib/3rd/sqlite3/sqlite3.hbp
  - contrib/3rd/sqlite3/Makefile
    * Moved sqlite3 foreign code to contrib/3rd dir from
      global 3rd party code dir.
    + Migrated remaining platform tweaks from Makefile to sqlite3.hbp
      Bumps are expected, pls test.

  * contrib/hbsqlit3/hbsqlit3.hbp
  * contrib/sddsqlt3/sddsqlt3.hbp
    * Changed sqlite3 position.
    + Added sqlite3 reference.
    ; Please note that after above changes sqlite3 will only be built
      if required.

  * src/common/hbver.c
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-11-07 15:02:55 +00:00
parent 58de824eb2
commit 575b574c53
15 changed files with 119 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
harbour/ChangeLog
View File

@@ -16,6 +16,41 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-11-07 15:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/version.c
+ HB_VERSION( HB_VERSION_PLATFORM ) changed to use hb_verPlatformMacro().
This means it will now supported recently added platforms.
; NOTE: For consistency, __PLATFORM__WINDOWS should pbly be changed to __PLATFORM__WIN,
and __PLATFORM__WINCE to __PLATFORM__WCE.
* utils/hbmk2/hbmk2.prg
+ Added HB_HOST_PLAT macro, returning: hb_Version( HB_VERSION_PLATFORM )
+ Added HB_HOST_PLAT_UNIX macro.
! Fixed cygwin to be detected as cross target platform.
! Few cygwin related TOFIX-es cleared.
* external/Makefile
- external/sqlite3
+ contrib/3rd
+ contrib/3rd/sqlite3
* contrib/3rd/sqlite3/sqlite3.hbc
+ contrib/3rd/sqlite3/sqlite3.hbp
- contrib/3rd/sqlite3/Makefile
* Moved sqlite3 foreign code to contrib/3rd dir from
global 3rd party code dir.
+ Migrated remaining platform tweaks from Makefile to sqlite3.hbp
Bumps are expected, pls test.
* contrib/hbsqlit3/hbsqlit3.hbp
* contrib/sddsqlt3/sddsqlt3.hbp
* Changed sqlite3 position.
+ Added sqlite3 reference.
; Please note that after above changes sqlite3 will only be built
if required.
* src/common/hbver.c
* Formatting.
2010-11-07 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* Changed the way target selection (-hblib, -hbdyn*, -hbexe, etc)

0
harbour/external/sqlite3/sqlite3.c → harbour/contrib/3rd/sqlite3/sqlite3.c
View File

0
harbour/external/sqlite3/sqlite3.dif → harbour/contrib/3rd/sqlite3/sqlite3.dif
View File

0
harbour/external/sqlite3/sqlite3.h → harbour/contrib/3rd/sqlite3/sqlite3.h
View File

5
harbour/contrib/3rd/sqlite3/sqlite3.hbc Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
libs=${hb_name}${__HB_DYN__}

39
harbour/contrib/3rd/sqlite3/sqlite3.hbp Normal file
View File

@@ -0,0 +1,39 @@
#
# $Id$
#
-stop{poccarm}
# NOTE: old msvcarm can't cope with some PP directives. [vszakats]
-stop{msvcarm&HB_COMP_VER!='1200'&HB_COMP_VER!='1300'&HB_COMP_VER!='1310')}
# NOTE: dos based watcom runs out of memory. [vszakats]
-stop{HB_HOST_PLAT='dos'&watcom}
# NOTE: disable *nix builds on non-*nix platforms; [vszakats]
# except for cygwin-on-win
-stop{!(HB_HOST_PLAT='win'&cygwin)&HB_HOST_PLAT_UNIX=''&unix}
-hblib
-inc
-o${hb_targetname}
-warn=no
-cpp=no
-cflag=-DSQLITE_OMIT_DEPRECATED
-cflag=-D_WIN32_WCE{wce}
# DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
# so we're forcing the next best available option. This will cause missing
# externals though. [vszakats]
-cflag=-DSQLITE_OS_OTHER{dos}
# Watcom Linux builds cannot use system header files
-cflag=-DSQLITE_OS_OTHER{linux&watcom}
sqlite3.c
# ORIGIN http://www.sqlite.org/
# VER 3.7.3
# URL http://www.sqlite.org/sqlite-amalgamation-3_7_3.zip
# DIFF sqlite3.dif
#
# MAP sqlite3.c
# MAP sqlite3.h

4
harbour/contrib/hbsqlit3/hbsqlit3.hbp
View File

@@ -14,8 +14,10 @@
-depcontrol=sqlite3:${HB_WITH_SQLITE3}
-depincpath=sqlite3:/usr/include
-depincpath=sqlite3:/boot/common/include
-depincpathlocal=sqlite3:../../external/sqlite3
-depincpathlocal=sqlite3:../3rd/sqlite3
-instfile=inc:hbsqlit3.ch
hbsqlit3.c
../3rd/sqlite3/sqlite3.hbc

4
harbour/contrib/sddsqlt3/sddsqlt3.hbp
View File

@@ -16,6 +16,8 @@
-depcontrol=sqlite3:${HB_WITH_SQLITE3}
-depincpath=sqlite3:/usr/include
-depincpath=sqlite3:/boot/common/include
-depincpathlocal=sqlite3:../../external/sqlite3
-depincpathlocal=sqlite3:../3rd/sqlite3
sddsqlt3.c
../3rd/sqlite3/sqlite3.hbc

2
harbour/external/Makefile vendored
View File

@@ -5,7 +5,6 @@
ROOT := ../
DIRS := \
sqlite3 \
bzip2 \
libhpdf \
hbpmcom \
@@ -13,6 +12,5 @@ DIRS := \
jpeg \
pcre \
zlib \
minizip \
include $(TOP)$(ROOT)config/dir.mk

87
harbour/external/sqlite3/Makefile vendored
View File

@@ -1,87 +0,0 @@
#
# $Id$
#
ROOT := ../../
include $(TOP)$(ROOT)config/global.mk
LIBNAME := sqlite3
HB_BUILD_WARN := no
HB_BUILD_MODE := c
C_SOURCES := \
sqlite3.c \
# decide if it's supported at all
HB_SUPPORTED := yes
ifeq ($(HB_COMPILER),poccarm)
HB_SUPPORTED := no
endif
# NOTE: old msvcarm can't cope with some PP directives. [vszakats]
ifeq ($(HB_COMPILER),msvcarm)
ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),)
HB_SUPPORTED := no
endif
endif
# NOTE: dos based watcom runs out of memory. [vszakats]
ifeq ($(HB_HOST_PLAT)-$(HB_COMPILER),dos-watcom)
HB_SUPPORTED := no
endif
# NOTE: disable *nix builds on non-*nix platforms; [vszakats]
# except for cygwin-on-win
ifneq ($(HB_HOST_PLAT)-$(HB_PLATFORM),win-cygwin)
ifeq ($(HB_HOST_PLAT_UNIX),)
ifneq ($(HB_PLATFORM_UNIX),)
HB_SUPPORTED := no
endif
endif
endif
ifeq ($(HB_SUPPORTED),yes)
_DET_DSP_NAME := sqlite3
_DET_VAR_INC_ := HB_INC_SQLITE3
_DET_VAR_HAS_ := HB_HAS_SQLITE3
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include
_DET_INC_LOCL := external/sqlite3
_DET_INC_HEAD := /sqlite3.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_SQLITE3_LOCAL),)
HB_CFLAGS += -DSQLITE_OMIT_DEPRECATED
ifeq ($(HB_PLATFORM),wce)
HB_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_PLATFORM),dos)
# DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
# so we're forcing the next best available option. This will cause missing
# externals though. [vszakats]
HB_CFLAGS += -DSQLITE_OS_OTHER
endif
ifeq ($(HB_PLATFORM)-$(HB_COMPILER),linux-watcom)
# Watcom Linux builds cannot use system header files
HB_CFLAGS += -DSQLITE_OS_OTHER
endif
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := unused
include $(TOP)$(ROOT)config/none.mk
endif
else
HB_SKIP_REASON := platform or compiler not supported
include $(TOP)$(ROOT)config/none.mk
endif
# ORIGIN http://www.sqlite.org/
# VER 3.7.3
# URL http://www.sqlite.org/sqlite-amalgamation-3_7_3.zip
# DIFF sqlite3.dif
#
# MAP sqlite3.c
# MAP sqlite3.h

5
harbour/external/sqlite3/sqlite3.hbc vendored
View File

@@ -1,5 +0,0 @@
#
# $Id$
#
libs=${hb_name}

29
harbour/external/sqlite3/sqlite3.hbp vendored
View File

@@ -1,29 +0,0 @@
#
# $Id$
#
-stop{poccarm}
# NOTE: old msvcarm can't cope with some PP directives. [vszakats]
-stop{msvcarm&HB_COMP_VER!='1200'&HB_COMP_VER!='1300'&HB_COMP_VER!='1310')}
# TODO: Some restrictions were not migrated from Makefile
-hblib
-inc
-o${hb_targetname}
-warn=no
-cpp=no
-cflag=-DSQLITE_OMIT_DEPRECATED
sqlite3.c
# ORIGIN http://www.sqlite.org/
# VER 3.7.3
# URL http://www.sqlite.org/sqlite-amalgamation-3_7_3.zip
# DIFF sqlite3.dif
#
# MAP sqlite3.c
# MAP sqlite3.h

30
harbour/src/common/hbver.c
View File

@@ -165,35 +165,35 @@ const char * hb_verHostCPU( void )
const char * hb_verPlatformMacro( void )
{
#if defined( HB_OS_WIN_CE ) /* Must precede HB_OS_WIN */
return "WINCE"; /* TODO: Change this to WCE for consistency? */
return "WINCE"; /* TODO: Change this to WCE for consistency? */
#elif defined( HB_OS_WIN )
return "WINDOWS"; /* TODO: Change this to WIN for consistency? */
return "WINDOWS"; /* TODO: Change this to WIN for consistency? */
#elif defined( HB_OS_DOS )
return "DOS";
return "DOS";
#elif defined( HB_OS_OS2 )
return "OS2";
return "OS2";
#elif defined( HB_OS_LINUX )
return "LINUX";
return "LINUX";
#elif defined( HB_OS_DARWIN )
return "DARWIN";
return "DARWIN";
#elif defined( HB_OS_BSD )
return "BSD";
return "BSD";
#elif defined( HB_OS_SUNOS )
return "SUNOS";
return "SUNOS";
#elif defined( HB_OS_HPUX )
return "HPUX";
return "HPUX";
#elif defined( HB_OS_BEOS )
return "BEOS";
return "BEOS";
#elif defined( HB_OS_QNX )
return "QNX";
return "QNX";
#elif defined( HB_OS_VXWORKS )
return "VXWORKS";
return "VXWORKS";
#elif defined( HB_OS_SYMBIAN )
return "SYMBIAN";
return "SYMBIAN";
#elif defined( HB_OS_CYGWIN )
return "CYGWIN";
return "CYGWIN";
#else
return NULL;
return NULL;
#endif
}

20
harbour/src/rtl/version.c
View File

@@ -147,24 +147,12 @@ HB_FUNC( HB_VERSION )
break;
case HB_VERSION_PLATFORM:
#if defined( HB_OS_DOS )
hb_retc_const( "DOS" );
#elif defined( HB_OS_OS2 )
hb_retc_const( "OS2" );
#if defined( HB_OS_WIN_CE ) /* NOTE: Must precede HB_OS_WIN */
hb_retc_const( "WCE" );
#elif defined( HB_OS_WIN )
hb_retc_const( "WINDOWS" );
#elif defined( HB_OS_LINUX )
hb_retc_const( "LINUX" );
#elif defined( HB_OS_SUNOS )
hb_retc_const( "SUNOS" );
#elif defined( HB_OS_HPUX )
hb_retc_const( "HPUX" );
#elif defined( HB_OS_DARWIN )
hb_retc_const( "DARWIN" );
#elif defined( HB_OS_BSD )
hb_retc_const( "BSD" );
hb_retc_const( "WIN" );
#else
hb_retc_null();
hb_retc_const( hb_verPlatformMacro() );
#endif
break;

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

@@ -188,6 +188,7 @@ REQUEST hbmk_KEYW
#define _COMPDET_cCOMP 2
#define _COMPDET_cCCPREFIX 3 /* optional */
#define _COMPDET_cCCPOSTFIX 4 /* optional */
#define _COMPDET_cPLAT 5 /* optional */
#define _COMPDETE_bBlock 1
#define _COMPDETE_cPLAT 2
@@ -1358,7 +1359,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
/* Order is significant.
watcom also keeps a cl.exe in its binary dir. */
#if ! defined( __PLATFORM__UNIX )
aCOMPDET := { { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "cygwin" },; /* TOFIX: cygwin is now a platform */
aCOMPDET := { { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "gcc",,, "cygwin" },;
{ {|| FindInPath( "gcc-dw2" ) }, "mingw", "", "-dw2" },; /* tdragon DWARF-2 build */
{ {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64" },; /* Equation Solution build */
{ {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingw" },;
@@ -1606,12 +1607,15 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
hb_ps() + aCOMPDET[ tmp ][ _COMPDET_cCOMP ] +;
PathSepToSelf( hbmk[ _HBMK_cBUILD ] ) )
hbmk[ _HBMK_cCOMP ] := aCOMPDET[ tmp ][ _COMPDET_cCOMP ]
IF Len( aCOMPDET[ tmp ] ) >= _COMPDET_cCCPREFIX
IF Len( aCOMPDET[ tmp ] ) >= _COMPDET_cCCPREFIX .AND. aCOMPDET[ tmp ][ _COMPDET_cCCPREFIX ] != NIL
hbmk[ _HBMK_cCCPREFIX ] := aCOMPDET[ tmp ][ _COMPDET_cCCPREFIX ]
ENDIF
IF Len( aCOMPDET[ tmp ] ) >= _COMPDET_cCCPOSTFIX
IF Len( aCOMPDET[ tmp ] ) >= _COMPDET_cCCPOSTFIX .AND. aCOMPDET[ tmp ][ _COMPDET_cCCPOSTFIX ] != NIL
hbmk[ _HBMK_cCCPOSTFIX ] := aCOMPDET[ tmp ][ _COMPDET_cCCPOSTFIX ]
ENDIF
IF Len( aCOMPDET[ tmp ] ) >= _COMPDET_cPLAT .AND. aCOMPDET[ tmp ][ _COMPDET_cPLAT ] != NIL
hbmk[ _HBMK_cPLAT ] := aCOMPDET[ tmp ][ _COMPDET_cPLAT ]
ENDIF
/* Hack autodetect watcom platform by looking at the header path config. TODO: Do it properly */
IF hbmk[ _HBMK_cCOMP ] == "watcom"
DO CASE
@@ -8171,7 +8175,7 @@ STATIC FUNCTION ListCookLib( hbmk, aLIB, aLIBA, array, cPrefix, cExtNew )
LOCAL cLibNameCooked
LOCAL cName, cExt
IF HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|djgpp|cygwin|gccomf|clang|open64" ) /* TOFIX: cygwin is now a platform */
IF HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|djgpp|gccomf|clang|open64" )
FOR EACH cLibName IN array
hb_FNameSplit( cLibName, @cDir )
IF Empty( cDir )
@@ -9568,7 +9572,7 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName )
CASE "HB_TARGETTYPE"
cMacro := hbmk_TARGETTYPE( hbmk ) ; EXIT
CASE "HB_PLAT"
CASE "HB_PLATFORM"
CASE "HB_PLATFORM" /* Compatibility */
CASE "HB_ARCH" /* Compatibility */
cMacro := hbmk[ _HBMK_cPLAT ] ; EXIT
CASE "HB_COMP"
@@ -9600,6 +9604,10 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName )
cMacro := hb_Version( HB_VERSION_STATUS ) ; EXIT
CASE "HB_REVISION"
cMacro := hb_ntos( hb_Version( HB_VERSION_REVISION ) ) ; EXIT
CASE "HB_HOST_PLAT"
cMacro := hb_Version( HB_VERSION_PLATFORM ) ; EXIT
CASE "HB_HOST_PLAT_UNIX"
cMacro := iif( hb_Version( HB_VERSION_UNIX_COMPAT ), "1", "" ) ; EXIT
CASE "HB_BIN"
cMacro := hbmk[ _HBMK_cHB_INSTALL_BIN ] ; EXIT
CASE "HB_LIB"
@@ -10787,8 +10795,8 @@ STATIC FUNCTION hbmk_TARGETTYPE( hbmk )
STATIC FUNCTION hbmk_CPU( hbmk )
DO CASE
CASE HBMK_ISPLAT( "dos|os2" ) .OR. ;
HBMK_ISCOMP( "mingw|cygwin|msvc|pocc|watcom|bcc|xcc" ) .OR. ; /* TOFIX: cygwin is now a platform */
CASE HBMK_ISPLAT( "dos|os2|cygwin" ) .OR. ;
HBMK_ISCOMP( "mingw|msvc|pocc|watcom|bcc|xcc" ) .OR. ;
( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "icc" )
RETURN "x86"
CASE HBMK_ISCOMP( "gcc|icc|clang|sunpro|diab|pcc" )