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

2009-01-29 19:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/bin/postinst.sh
    ! added missing export in envvar setting.

  * harbour/config/linux/install.cf
    * added error message when install directory is not set.

  * harbour/config/lib.cf
  * harbour/config/bin.cf
  * harbour/config/dir.cf
    + added explicit support for make recursive calls.
      Question: why we use $(MK) instead of $(MAKE) so it necessary
      to mark recursive make calls manually?

  * harbour/config/dir.cf
    * rewritten DIR_RUL to use only GNU make commands instead of
      OS scripts. Now config/<arch>/dir.cf files are not longer used.
      Please make build tests on different platforms. If all will
      be correct then we remove these files.

  * harbour/source/common/Makefile
  * harbour/source/vm/Makefile
  * harbour/source/vm/vmmt/Makefile
    * moved biggest files to begin of file list for better parallel
      compilation utilization.

  * harbour/source/rdd/dbfcdx/dbfcdx1.c
    * accept invalid string key expression if codeblock key expression
      is given.
This commit is contained in:
Przemyslaw Czerpak
2009-01-29 18:45:09 +00:00
parent ef3da0603c
commit 818977af2b
10 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -8,6 +8,36 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-01-29 19:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/postinst.sh
! added missing export in envvar setting.
* harbour/config/linux/install.cf
* added error message when install directory is not set.
* harbour/config/lib.cf
* harbour/config/bin.cf
* harbour/config/dir.cf
+ added explicit support for make recursive calls.
Question: why we use $(MK) instead of $(MAKE) so it necessary
to mark recursive make calls manually?
* harbour/config/dir.cf
* rewritten DIR_RUL to use only GNU make commands instead of
OS scripts. Now config/<arch>/dir.cf files are not longer used.
Please make build tests on different platforms. If all will
be correct then we remove these files.
* harbour/source/common/Makefile
* harbour/source/vm/Makefile
* harbour/source/vm/vmmt/Makefile
* moved biggest files to begin of file list for better parallel
compilation utilization.
* harbour/source/rdd/dbfcdx/dbfcdx1.c
* accept invalid string key expression if codeblock key expression
is given.
2009-01-29 14:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/gtwvt/gtwvt.c
! Fixed to #undef _WIN32_WINNT before setting it.

2
harbour/bin/postinst.sh
View File

@@ -83,7 +83,7 @@ then
fi
# build hbfm lib with memory statistic
(cd ${hb_root}/source/vm
C_USR="${C_USR//-DHB_FM_STATISTICS_OFF/} -DHB_FM_STATISTICS"
export C_USR="${C_USR//-DHB_FM_STATISTICS_OFF/} -DHB_FM_STATISTICS"
rm -f fm.o
${MAKE} -r fm.o
${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfm.a fm.o

4
harbour/config/bin.cf
View File

@@ -30,8 +30,8 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first:: dirbase descend
descend :
@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(EXE_NAME) $(MK_USR)
descend:: dirbase
+@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(EXE_NAME) $(MK_USR)
$(EXE_NAME) : $(ALL_OBJS)
$(LD_RULE)

16
harbour/config/dir.cf
View File

@@ -6,16 +6,26 @@ ifneq ($(HB_ARCHITECTURE),)
ifneq ($(HB_COMPILER),)
include $(TOP)$(ROOT)config/global.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/dir.cf
#include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/dir.cf
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# It causes that every commands will be separated by LF
define dir_mk
$(MK) -C $(dir) $@
endef
DIRS_MK = $(foreach d, $(DIRS), $(if $(wildcard $(d)/Makefile),$(d),))
DIR_RULE = $(foreach dir, $(DIRS_MK), $(dir_mk))
all : first
first clean install::
$(DIR_RULE)
+$(DIR_RULE)
ifneq ($(HB_POSTINST),)
install::
$(HB_POSTINST)
+$(HB_POSTINST)
endif
endif

4
harbour/config/lib.cf
View File

@@ -22,8 +22,8 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first:: dirbase descend
descend :
@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME) $(MK_USR)
descend:: dirbase
+@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME) $(MK_USR)
vpath $(LIB_NAME) $(LIB_DIR)
$(LIB_NAME) : $(ALL_OBJS)

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

@@ -3,9 +3,10 @@
#
INSTALL_RULE =\
@if [ ! -d $(INSTALL_DIR) ]; \
@if [ -z $(INSTALL_DIR) ] || [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_OBJS); \
do \

4
harbour/source/common/Makefile
View File

@@ -5,6 +5,8 @@
ROOT = ../../
C_SOURCES=\
expropt1.c \
expropt2.c \
hbfsapi.c \
hbfopen.c \
hbgete.c \
@@ -19,8 +21,6 @@ C_SOURCES=\
hbverdsp.c \
hbarch.c \
reserved.c \
expropt1.c \
expropt2.c \
PRG_SOURCES=\

27
harbour/source/rdd/dbfcdx/dbfcdx1.c
View File

@@ -7458,17 +7458,26 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
if( SELF_COMPILE( (AREAP) pArea, ( BYTE * ) hb_itemGetCPtr( pOrderInfo->abExpr ) ) == FAILURE )
{
hb_cdxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDKEY, NULL, 0, 0, NULL );
return FAILURE;
if( pOrderInfo->itmCobExpr )
{
pKeyExp = hb_itemNew( pOrderInfo->itmCobExpr );
}
else
{
hb_cdxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDKEY, NULL, 0, 0, NULL );
return FAILURE;
}
}
pKeyExp = pArea->valResult;
pArea->valResult = NULL;
/* If we have a codeblock for the expression, use it */
if( pOrderInfo->itmCobExpr )
else
{
hb_vmDestroyBlockOrMacro( pKeyExp );
pKeyExp = hb_itemNew( pOrderInfo->itmCobExpr );
pKeyExp = pArea->valResult;
pArea->valResult = NULL;
/* If we have a codeblock for the expression, use it */
if( pOrderInfo->itmCobExpr )
{
hb_vmDestroyBlockOrMacro( pKeyExp );
pKeyExp = hb_itemNew( pOrderInfo->itmCobExpr );
}
}
/* Get a blank record before testing expression */

2
harbour/source/vm/Makefile
View File

@@ -25,6 +25,7 @@ else
endif
C_SOURCES=\
hvm.c \
arrays.c \
arrayshb.c \
asort.c \
@@ -45,7 +46,6 @@ C_SOURCES=\
garbage.c \
hashes.c \
hashfunc.c \
hvm.c \
initexit.c \
initsymb.c \
itemapi.c \

2
harbour/source/vm/vmmt/Makefile
View File

@@ -26,6 +26,7 @@ else
endif
C_SOURCES=\
hvm.c \
arrays.c \
arrayshb.c \
asort.c \
@@ -46,7 +47,6 @@ C_SOURCES=\
garbage.c \
hashes.c \
hashfunc.c \
hvm.c \
initexit.c \
initsymb.c \
itemapi.c \