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

2007-11-26 14:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/bin/hb-mkslib.sh
  * harbour/bin/postinst.sh
    * set predefined CCPREFIX in cross build hb*-mkslib

  * harbour/make_xmingw.sh
    ! fixed BSD build cross build - problem noticed by Phil Krylov
      in xHarbour

  * harbour/source/rdd/dbffpt/dbffpt1.c
    * casting

  * harbour/config/darwin/gcc.cf
  * harbour/config/hpux/gcc.cf
  * harbour/config/linux/gcc.cf
  * harbour/config/sunos/gcc.cf
  * harbour/config/bsd/gcc.cf
    * added support for HB_CRS_LIB envvar which allow to overload platform
      default [n]curses library name
This commit is contained in:
Przemyslaw Czerpak
2007-11-26 13:51:21 +00:00
parent 0003311ead
commit 41520feb08
10 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -8,6 +8,26 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-26 14:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/hb-mkslib.sh
* harbour/bin/postinst.sh
* set predefined CCPREFIX in cross build hb*-mkslib
* harbour/make_xmingw.sh
! fixed BSD build cross build - problem noticed by Phil Krylov
in xHarbour
* harbour/source/rdd/dbffpt/dbffpt1.c
* casting
* harbour/config/darwin/gcc.cf
* harbour/config/hpux/gcc.cf
* harbour/config/linux/gcc.cf
* harbour/config/sunos/gcc.cf
* harbour/config/bsd/gcc.cf
* added support for HB_CRS_LIB envvar which allow to overload platform
default [n]curses library name
2007-11-26 14:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/what32/wintabs.prg
* contrib/what32/wintbar.prg

1
harbour/bin/hb-mkslib.sh
View File

@@ -13,6 +13,7 @@
# ---------------------------------------------------------------
# HB_ARCHITECTURE=""
# CCPREFIX=""
if [ -n "${HB_ARCHITECTURE}" ]
then

1
harbour/bin/postinst.sh
View File

@@ -55,6 +55,7 @@ then
hb_mkslib="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkslib"
rm -f "${hb_mkslib}"
sed -e "s/^# HB_ARCHITECTURE=\"\"\$/HB_ARCHITECTURE=\"${HB_ARCHITECTURE}\"/g" \
-e "s/^# CCPREFIX=\"\"\$/[ -n \"\${CCPREFIX}\" ] || CCPREFIX=\"${CCPREFIX}\"/g" \
"${hb_root}/bin/hb-mkslib.sh" > "${hb_mkslib}" && \
chmod 755 "${hb_mkslib}"
elif [ "${HB_ARCHITECTURE}" = "sunos" ]; then

8
harbour/config/bsd/gcc.cf
View File

@@ -44,15 +44,19 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
# screen driver libraries
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB=ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lncurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
LINKLIBS += -lslang
# In BSD, slang still needs curses :(
ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lncurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
endif

8
harbour/config/darwin/gcc.cf
View File

@@ -58,15 +58,19 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
# screen driver libraries
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB=ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lncurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
LINKLIBS += -lslang
# In BSD, slang still needs curses :(
ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lncurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
endif

5
harbour/config/hpux/gcc.cf
View File

@@ -47,8 +47,11 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
# screen driver libraries
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB=ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lncurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
LINKLIBS += -lslang

5
harbour/config/linux/gcc.cf
View File

@@ -58,8 +58,11 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
# screen driver libraries
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB=ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lncurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
LINKLIBS += -lslang

5
harbour/config/sunos/gcc.cf
View File

@@ -47,8 +47,11 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
# screen driver libraries
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB=curses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
LINKLIBS += -lcurses
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
LINKLIBS += -lslang

1
harbour/make_xmingw.sh
View File

@@ -37,6 +37,7 @@ elif [ "$UNAME" = "FreeBSD" ]; then
MINGW_PREFIX=/usr/local/mingw32
TARGET="."
CCPREFIX=""
UNAMEL=bsd
elif find /usr/local/bin -name "i[3456]86-mingw*-gcc" -maxdepth 1 &>/dev/null; then
MINGW_PREFIX=/usr/local
TARGET=`find /usr/local/bin -name "i[3456]86-mingw*-gcc" -maxdepth 1|sed -e '1 !d' -e 's/.*\(i[3456]86-mingw[^-]*\).*/\1/g'`

4
harbour/source/rdd/dbffpt/dbffpt1.c
View File

@@ -2417,8 +2417,8 @@ static ERRCODE hb_fptCopyToFile( FHANDLE hSrc, FHANDLE hDst, HB_FOFFSET size )
do
{
ulRead = hb_fsReadLarge( hSrc, pBuffer,
( ULONG ) HB_MIN( ulBufSize, size - written ) );
ulRead = hb_fsReadLarge( hSrc, pBuffer, ( ULONG )
HB_MIN( ( HB_FOFFSET ) ulBufSize, size - written ) );
if( ulRead <= 0 )
errCode = EDBF_READ;
else if( hb_fsWriteLarge( hDst, pBuffer, ulRead ) != ulRead )