2008-09-25 00:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* make_b32.mak * make_gcc.mak * make_vc.mak * harbour.spec * source/rtl/hbgtcore.c * source/rtl/Makefile * source/rtl/gtsys.c * config/w32/poccce.cf * config/w32/xcc.cf * config/w32/pocc.cf % Removed HB_GT_DEFAULT envvar, which was the exact synonym of HB_GT_LIB. Please use HB_GT_LIB instead, if you - by any chance - want to change the default GT at Harbour build-time. * tests/speedtst.prg ! Fixed to delete temp .dbf files before exiting.
2008-09-24 22:22:57 +00:00
parent e58b37da88
commit cd96daef69
12 changed files with 54 additions and 61 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,24 @@
   2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2008-09-25 00:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+  * make_gcc.mak
+  * make_vc.mak
+  * harbour.spec
+  * source/rtl/hbgtcore.c
+  * source/rtl/Makefile
+  * source/rtl/gtsys.c
+  * config/w32/poccce.cf
+  * config/w32/xcc.cf
+  * config/w32/pocc.cf
+    % Removed HB_GT_DEFAULT envvar, which was the exact synonym 
+      of HB_GT_LIB. Please use HB_GT_LIB instead, if you - by any 
+      chance - want to change the default GT at Harbour build-time.
+
+  * tests/speedtst.prg
+    ! Fixed to delete temp .dbf files before exiting.
+
 2008-09-24 20:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/source/vm/estack.c
    ! fixed stack preloading - it should be after checking if stack
--- a/harbour/config/w32/pocc.cf
+++ b/harbour/config/w32/pocc.cf
@@ -59,13 +59,9 @@ LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib gdi32.lib wsock32.lib ws2_32.lib
 LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \
           comctl32.lib mapi32.lib mpr.lib

-ifeq ($(HB_GT_DEFAULT),gtgui)
-LDFLAGS += /SUBSYSTEM:WINDOWS
-else
 ifeq ($(HB_GT_LIB),gtgui)
 LDFLAGS += /SUBSYSTEM:WINDOWS
 endif
-endif

 AR = polib.exe
 ARFLAGS = $(A_USR)
--- a/harbour/config/w32/poccce.cf
+++ b/harbour/config/w32/poccce.cf
@@ -55,13 +55,9 @@ endif

 LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib

-ifeq ($(HB_GT_DEFAULT),gtgui)
-LDFLAGS += /SUBSYSTEM:WINDOWS
-else
 ifeq ($(HB_GT_LIB),gtgui)
 LDFLAGS += /SUBSYSTEM:WINDOWS
 endif
-endif

 AR = polib.exe
 ARFLAGS = $(A_USR)
--- a/harbour/config/w32/xcc.cf
+++ b/harbour/config/w32/xcc.cf
@@ -49,13 +49,9 @@ LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib gdi32.lib wsock32.lib ws2_32.lib
 LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \
           comctl32.lib mapi32.lib mpr.lib

-ifeq ($(HB_GT_DEFAULT),gtgui)
-LDFLAGS += /SUBSYSTEM:WINDOWS
-else
 ifeq ($(HB_GT_LIB),gtgui)
 LDFLAGS += /SUBSYSTEM:WINDOWS
 endif
-endif

 AR = xlib.exe
 ARFLAGS = $(A_USR)
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -69,7 +69,6 @@
 %define hb_cc    export HB_COMPILER=gcc
 %define hb_cflag export C_USR="-O3 -DHB_FM_STATISTICS_OFF"
 %define hb_lflag export L_USR="${CC_L_USR} %{?_with_static:-static}"
-%define hb_defgt export HB_GT_DEFAULT="${HB_GT_DEFAULT}"
 %define hb_gpm   export HB_GPM_MOUSE=%{!?_without_gpm:yes}
 %define hb_crs   export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes}
 %define hb_sln   export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes}
@@ -79,7 +78,7 @@
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_cmrc  export HB_COMMERCE=%{?_without_gpllib:yes}
 %define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf hbziparc xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}"
-%define hb_env   %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc}
+%define hb_env   %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host  www.harbour-project.org
 %define readme   README.RPM
 ######################################################################
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -30,10 +30,8 @@
 #       PRG_USR           - Extra Harbour compiler options
 #       HARBOURFLAGSDLL   - Extra Harbour compiler options for shared libraries
 #
-#       HB_GT_DEFAULT     - The default GT driver, Choose between:
-#                           gtwin (default),gtcgi,gtwvt,gtstd
-#       HB_GT_LIB         - To override the default GT driver
-#                           (search for HB_GT_LIBS for a list of values)
+#       HB_GT_LIB         - The default GT driver, choose between:
+#                           gtwin (default), gtcgi, gtwvt, gtstd, gtpca
 #       HB_BUILD_ST       - If set to yes builds harbour in SingleThread mode
 #       HB_BUILD_DLL      - If set to yes enables building harbour VM+RTL
 #                           dll in addition to normal static build
@@ -124,10 +122,6 @@ CFLAGSMT = -tWM -DHB_MT_VM $(CFLAGSMT)
    HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(VMMT_LIB)
 !endif
 #-----------
-!if "$(HB_GT_DEFAULT)" != ""
-    CFLAGS = -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=) $(CFLAGS)
-!endif
-#-----------
 !if "$(HB_GT_LIB)" != ""
    CFLAGS = -DHB_GT_LIB=$(HB_GT_LIB:gt=) $(CFLAGS)
 !endif
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -30,11 +30,8 @@
 #       PRG_USR           - Extra Harbour compiler options
 #       HARBOURFLAGSDLL   - Extra Harbour compiler options for shared libraries
 #
-#       HB_GT_DEFAULT     - The default GT driver, Choose between :
-#                           gtstd (default),gtcgi,gtpca,gttrm,gtcrs,gtsln,gtxwc
-#       HB_GT_LIB         - Set if you want to override the default GT driver
-#                           (search for HB_GT_LIBS for a list of values)
-#
+#       HB_GT_LIB         - The default GT driver, choose between:
+#                           gttrm (default), gtcgi, gtpca, gtcrs, gtsln, gtxwc
 #       HB_GPM_MOUSE      - If set to yes enables using GPM mouse driver on console
 #       HB_WITHOUT_GTSLN  - If set to yes causes to not build gtsln
 #                           (if you don't have slang installed)
@@ -179,10 +176,6 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS         := -g $(CFLAGS)
 endif
 #-----------
-ifneq ($(HB_GT_DEFAULT),)
-CFLAGS         += -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt%=%)
-endif
-#-----------
 ifneq ($(HB_GT_LIB),)
 CFLAGS         += -DHB_GT_LIB=$(HB_GT_LIB:gt%=%)
 endif
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -30,10 +30,8 @@
 #       PRG_USR           - Extra Harbour compiler options
 #       HARBOURFLAGSDLL   - Extra Harbour compiler options for shared libraries
 #
-#       HB_GT_DEFAULT     - The default GT driver, Choose between:
-#                           gtwin (default),gtcgi,gtwvt,gtstd
-#       HB_GT_LIB         - To override the default GT driver
-#                           (search for HB_GT_LIBS for a list of values)
+#       HB_GT_LIB         - The default GT driver, choose between:
+#                           gtwin (default), gtcgi, gtwvt, gtstd, gtpca
 #       HB_BUILD_ST       - If set to yes builds harbour in SingleThread mode
 #       HB_BUILD_DLL      - If set to yes enables building harbour VM+RTL
 #                           dll in addition to normal static build
@@ -186,10 +184,6 @@ CFLAGS = $(CFLAGS) $(CFLAGSMT)
 HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(VMMT_LIB)
 !endif
 #-----------
-!if "$(HB_GT_DEFAULT)" != ""
-CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS)
-!endif
-#-----------
 !if "$(HB_GT_LIB)" != ""
 CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS)
 !endif
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -230,9 +230,6 @@ DIRS=$(HB_GT_LIBS)
 include $(TOP)$(ROOT)config/lib.cf
 include $(TOP)$(ROOT)config/dir.cf

-ifneq ($(HB_GT_DEFAULT),)
-CFLAGS += -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt%=%)
-endif
 ifneq ($(HB_GT_LIB),)
 CFLAGS += -DHB_GT_LIB=$(HB_GT_LIB:gt%=%)
 endif
--- a/harbour/source/rtl/gtsys.c
+++ b/harbour/source/rtl/gtsys.c
@@ -59,9 +59,7 @@

 #include "hbgtcore.h"

-#if defined(HB_GT_DEFAULT)
-   HB_GT_REQUEST( HB_GT_DEFAULT )
-#elif defined(HB_GT_LIB)
+#if defined(HB_GT_LIB)
   HB_GT_REQUEST( HB_GT_LIB )
 #elif defined(HB_WINCE)
   HB_GT_REQUEST( WVT )
--- a/harbour/source/rtl/hbgtcore.c
+++ b/harbour/source/rtl/hbgtcore.c
@@ -3026,9 +3026,7 @@ static HB_GT_FUNCS s_gtCoreFunc =

 static char s_gtNameBuf[ HB_GT_NAME_MAX_ + 1 ];

-#if defined(HB_GT_DEFAULT)
-   HB_EXPORT const char * hb_gt_szNameDefault = HB_GT_DRVNAME( HB_GT_DEFAULT );
-#elif defined(HB_GT_LIB)
+#if defined(HB_GT_LIB)
   HB_EXPORT const char * hb_gt_szNameDefault = HB_GT_DRVNAME( HB_GT_LIB );
 #elif defined(HB_WINCE)
   HB_EXPORT const char * hb_gt_szNameDefault = "wvt";
--- a/harbour/tests/speedtst.prg
+++ b/harbour/tests/speedtst.prg
@@ -54,7 +54,7 @@ field F_C, F_N, F_D
 memvar M_C, M_N, M_D
 local L_C, L_N, L_D
 local i, j, t, c, c2, n, d, o, bc, tn, total, totalr, aa,;
-      a[ARR_LEN], a2[ARR_LEN], a3[ARR_LEN], aDb, cFi
+      a[ARR_LEN], a2[ARR_LEN], a3[ARR_LEN], aDb, cFi1, cFi2
 #ifdef ASSOC_ARRAY
    local aAssoc := ASSOC_ARRAY
 #endif
@@ -112,18 +112,19 @@ tn:=secondscpu()-t
 #endif
 ? ""

+#ifndef NO_DBF_TEST
+
 aDb:={ {"F_C", "C", 10, 0},;
       {"F_N", "N", 10, 2},;
       {"F_D", "D",  8, 0} }
-cFi:="tst_tmp.dbf"
-if file(cFi)
-    ferase(cFi)
-endif

-#ifndef NO_DBF_TEST
-dbcreate(cFi, aDb)
+cFi1:="tst_tmp.dbf"
+if file(cFi1)
+    ferase(cFi1)
+endif
+dbcreate(cFi1, aDb)
 select(1)
-use &cFi shared
+use &cFi1 shared
 dbappend()
 replace F_C with dtos(date())
 replace F_N with 112345.67
@@ -131,19 +132,20 @@ replace F_D with date()
 dbcommit()
 dbunlock()

-cFi:="tst_tmp2.dbf"
-if file(cFi)
-    ferase(cFi)
+cFi2:="tst_tmp2.dbf"
+if file(cFi2)
+    ferase(cFi2)
 endif
-dbcreate(cFi, aDb)
+dbcreate(cFi2, aDb)
 select(2)
-use &cFi exclusive
+use &cFi2 exclusive
 dbappend()
 replace F_C with dtos(date())
 replace F_N with 112345.67
 replace F_D with date()
 dbcommit()
 dbunlock()
+
 #endif

 L_C := dtos(date())
@@ -481,6 +483,18 @@ dsp_time( "ascan(a,{|x|x==i%ARR_LEN}) -> ", t, tn)
 dsp_time( "total application time:", total, 0)
 ? padr( "total real time:",50)+str(seconds()-totalr,8,2)
 ?
+
+#ifndef NO_DBF_TEST
+
+if file(cFi1)
+    ferase(cFi1)
+endif
+if file(cFi2)
+    ferase(cFi2)
+endif
+
+#endif
+
 return nil

 function dsp_time(s,t,tn)