From dd31acbb20e1dea660101243fa6bcd6cb4177e2e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 14 Sep 2008 10:36:50 +0000 Subject: [PATCH] 2008-09-14 12:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * harbour-ce-spec * harbour-w32-spec * harbour.spec * common.mak * include/hbver.h * Changed version number to 1.1.0 * include/hbextern.ch + Added new thread functions. * harbour-ce-spec * harbour-w32-spec * contrib/Makefile * contrib/make_b32_all.bat * contrib/make_gcc_all.sh * contrib/make_vc_all.bat - contrib/hbw32 + contrib/hbwin * contrib/hbwin/win_reg.prg * contrib/hbwin/win_os.prg * contrib/hbwin/win_tprt.prg * contrib/hbwin/common.mak - contrib/hbwin/hbw32.ch + contrib/hbwin/hbwin.ch - contrib/hbwin/tests/testw32p.prg + contrib/hbwin/tests/testprn.prg * contrib/hbwin/tests/testreg.prg * contrib/hbwin/tests/bld_b32.bat * contrib/hbwin/tests/testprt1.prg * contrib/hbwin/tests/bld_vc.bat * contrib/hbwin/tests/testprt2.prg * contrib/hbwin/Makefile * Renamed hbw32 to hbwin. * Renamed hbw32.ch to hbwin.ch. ; INCOMPATIBLE. --- harbour/ChangeLog | 37 ++++++++++++++++++ harbour/common.mak | 2 +- harbour/contrib/Makefile | 2 +- harbour/contrib/{hbw32 => hbwin}/Makefile | 4 +- harbour/contrib/{hbw32 => hbwin}/common.mak | 4 +- .../{hbw32/hbw32.ch => hbwin/hbwin.ch} | 8 ++-- harbour/contrib/{hbw32 => hbwin}/hbwin.h | 0 harbour/contrib/{hbw32 => hbwin}/make_b32.bat | 0 harbour/contrib/{hbw32 => hbwin}/make_gcc.sh | 0 harbour/contrib/{hbw32 => hbwin}/make_vc.bat | 0 .../{hbw32 => hbwin}/tests/bld_b32.bat | 2 +- .../contrib/{hbw32 => hbwin}/tests/bld_vc.bat | 2 +- .../contrib/{hbw32 => hbwin}/tests/sample.odt | Bin .../{hbw32 => hbwin}/tests/testdll.prg | 0 .../{hbw32 => hbwin}/tests/testole.prg | 0 .../testw32p.prg => hbwin/tests/testprn.prg} | 0 .../{hbw32 => hbwin}/tests/testprt1.prg | 2 +- .../{hbw32 => hbwin}/tests/testprt2.prg | 2 +- .../{hbw32 => hbwin}/tests/testreg.prg | 2 +- harbour/contrib/{hbw32 => hbwin}/win_dll.c | 0 harbour/contrib/{hbw32 => hbwin}/win_ole.c | 0 harbour/contrib/{hbw32 => hbwin}/win_os.prg | 2 +- harbour/contrib/{hbw32 => hbwin}/win_osc.c | 0 harbour/contrib/{hbw32 => hbwin}/win_prn1.c | 0 harbour/contrib/{hbw32 => hbwin}/win_prn2.c | 0 harbour/contrib/{hbw32 => hbwin}/win_prt.c | 0 harbour/contrib/{hbw32 => hbwin}/win_reg.prg | 2 +- harbour/contrib/{hbw32 => hbwin}/win_regc.c | 0 harbour/contrib/{hbw32 => hbwin}/win_tole.prg | 0 harbour/contrib/{hbw32 => hbwin}/win_tprn.prg | 0 harbour/contrib/{hbw32 => hbwin}/win_tprt.prg | 2 +- harbour/contrib/make_b32_all.bat | 2 +- harbour/contrib/make_gcc_all.sh | 2 +- harbour/contrib/make_vc_all.bat | 2 +- harbour/harbour-ce-spec | 4 +- harbour/harbour-w32-spec | 4 +- harbour/harbour.spec | 2 +- harbour/include/hbextern.ch | 16 ++++++++ harbour/include/hbver.h | 6 +-- 39 files changed, 82 insertions(+), 29 deletions(-) rename harbour/contrib/{hbw32 => hbwin}/Makefile (95%) rename harbour/contrib/{hbw32 => hbwin}/common.mak (93%) rename harbour/contrib/{hbw32/hbw32.ch => hbwin/hbwin.ch} (98%) rename harbour/contrib/{hbw32 => hbwin}/hbwin.h (100%) rename harbour/contrib/{hbw32 => hbwin}/make_b32.bat (100%) rename harbour/contrib/{hbw32 => hbwin}/make_gcc.sh (100%) rename harbour/contrib/{hbw32 => hbwin}/make_vc.bat (100%) rename harbour/contrib/{hbw32 => hbwin}/tests/bld_b32.bat (88%) rename harbour/contrib/{hbw32 => hbwin}/tests/bld_vc.bat (80%) rename harbour/contrib/{hbw32 => hbwin}/tests/sample.odt (100%) rename harbour/contrib/{hbw32 => hbwin}/tests/testdll.prg (100%) rename harbour/contrib/{hbw32 => hbwin}/tests/testole.prg (100%) rename harbour/contrib/{hbw32/tests/testw32p.prg => hbwin/tests/testprn.prg} (100%) rename harbour/contrib/{hbw32 => hbwin}/tests/testprt1.prg (99%) rename harbour/contrib/{hbw32 => hbwin}/tests/testprt2.prg (99%) rename harbour/contrib/{hbw32 => hbwin}/tests/testreg.prg (95%) rename harbour/contrib/{hbw32 => hbwin}/win_dll.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_ole.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_os.prg (99%) rename harbour/contrib/{hbw32 => hbwin}/win_osc.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_prn1.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_prn2.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_prt.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_reg.prg (99%) rename harbour/contrib/{hbw32 => hbwin}/win_regc.c (100%) rename harbour/contrib/{hbw32 => hbwin}/win_tole.prg (100%) rename harbour/contrib/{hbw32 => hbwin}/win_tprn.prg (100%) rename harbour/contrib/{hbw32 => hbwin}/win_tprt.prg (99%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c505127fd9..580c64ae77 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,43 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-14 12:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * harbour-ce-spec + * harbour-w32-spec + * harbour.spec + * common.mak + * include/hbver.h + * Changed version number to 1.1.0 + + * include/hbextern.ch + + Added new thread functions. + + * harbour-ce-spec + * harbour-w32-spec + * contrib/Makefile + * contrib/make_b32_all.bat + * contrib/make_gcc_all.sh + * contrib/make_vc_all.bat + - contrib/hbw32 + + contrib/hbwin + * contrib/hbwin/win_reg.prg + * contrib/hbwin/win_os.prg + * contrib/hbwin/win_tprt.prg + * contrib/hbwin/common.mak + - contrib/hbwin/hbw32.ch + + contrib/hbwin/hbwin.ch + - contrib/hbwin/tests/testw32p.prg + + contrib/hbwin/tests/testprn.prg + * contrib/hbwin/tests/testreg.prg + * contrib/hbwin/tests/bld_b32.bat + * contrib/hbwin/tests/testprt1.prg + * contrib/hbwin/tests/bld_vc.bat + * contrib/hbwin/tests/testprt2.prg + * contrib/hbwin/Makefile + * Renamed hbw32 to hbwin. + * Renamed hbw32.ch to hbwin.ch. + ; INCOMPATIBLE. + 2008-09-14 11:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/gtalleg/ssf.h ! Fixed to compile with Cygwin. diff --git a/harbour/common.mak b/harbour/common.mak index 08428718f7..9b78a15f4f 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -251,7 +251,7 @@ HBTEST_EXE = $(BIN_DIR)\hbtest$(EXEEXT) HBDOC_EXE = $(BIN_DIR)\hbdoc$(EXEEXT) HBMAKE_EXE = $(BIN_DIR)\hbmake$(EXEEXT) -HB_DLLVER = 10 +HB_DLLVER = 11 HARBOUR_DLL = $(BIN_DIR)\$(LIBPREF)harbour-$(HB_DLLVER)-$(HB_CC_NAME)$(DLLEXT) HBTESTDLL_EXE= $(BIN_DIR)\hbtest-dll$(EXEEXT) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 359b62d3a2..23868ae75e 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -24,7 +24,7 @@ DIRS=\ hbtip \ hbtpathy \ hbvpdf \ - hbw32 \ + hbwin \ hbwhat \ hbziparc \ rddado \ diff --git a/harbour/contrib/hbw32/Makefile b/harbour/contrib/hbwin/Makefile similarity index 95% rename from harbour/contrib/hbw32/Makefile rename to harbour/contrib/hbwin/Makefile index dd7bf05a2b..5b9407464b 100644 --- a/harbour/contrib/hbw32/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -4,7 +4,7 @@ ROOT = ../../ -LIBNAME=hbw32 +LIBNAME=hbwin ifeq ($(HB_ARCHITECTURE),w32) @@ -28,7 +28,7 @@ C_HEADERS = \ hbwin.h \ PRG_HEADERS = \ - hbw32.ch \ + hbwin.ch \ include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) diff --git a/harbour/contrib/hbw32/common.mak b/harbour/contrib/hbwin/common.mak similarity index 93% rename from harbour/contrib/hbw32/common.mak rename to harbour/contrib/hbwin/common.mak index 38f5f8545c..cf20065648 100644 --- a/harbour/contrib/hbw32/common.mak +++ b/harbour/contrib/hbwin/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = $(LIBPREF)hbw32 +LIBNAME = $(LIBPREF)hbwin LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT) @@ -10,7 +10,7 @@ C_HEADERS = \ hbwin.h \ PRG_HEADERS = \ - hbw32.ch \ + hbwin.ch \ LIB_OBJS = \ $(OBJ_DIR)win_dll$(OBJEXT) \ diff --git a/harbour/contrib/hbw32/hbw32.ch b/harbour/contrib/hbwin/hbwin.ch similarity index 98% rename from harbour/contrib/hbw32/hbw32.ch rename to harbour/contrib/hbwin/hbwin.ch index 802bbe5ec4..60bf50aa5f 100644 --- a/harbour/contrib/hbw32/hbw32.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * hbw32 header + * hbwin header * * Copyright 2008 Viktor Szakats * www - http://www.harbour-project.org @@ -50,8 +50,8 @@ * */ -#ifndef HBW32_CH_ -#define HBW32_CH_ +#ifndef HBWIN_CH_ +#define HBWIN_CH_ #define HKEY_CLASSES_ROOT 0x80000000 #define HKEY_CURRENT_USER 0x80000001 @@ -104,4 +104,4 @@ #define INVALID_HANDLE_VALUE -1 #endif -#endif /* HBW32_CH_ */ +#endif /* HBWIN_CH_ */ diff --git a/harbour/contrib/hbw32/hbwin.h b/harbour/contrib/hbwin/hbwin.h similarity index 100% rename from harbour/contrib/hbw32/hbwin.h rename to harbour/contrib/hbwin/hbwin.h diff --git a/harbour/contrib/hbw32/make_b32.bat b/harbour/contrib/hbwin/make_b32.bat similarity index 100% rename from harbour/contrib/hbw32/make_b32.bat rename to harbour/contrib/hbwin/make_b32.bat diff --git a/harbour/contrib/hbw32/make_gcc.sh b/harbour/contrib/hbwin/make_gcc.sh similarity index 100% rename from harbour/contrib/hbw32/make_gcc.sh rename to harbour/contrib/hbwin/make_gcc.sh diff --git a/harbour/contrib/hbw32/make_vc.bat b/harbour/contrib/hbwin/make_vc.bat similarity index 100% rename from harbour/contrib/hbw32/make_vc.bat rename to harbour/contrib/hbwin/make_vc.bat diff --git a/harbour/contrib/hbw32/tests/bld_b32.bat b/harbour/contrib/hbwin/tests/bld_b32.bat similarity index 88% rename from harbour/contrib/hbw32/tests/bld_b32.bat rename to harbour/contrib/hbwin/tests/bld_b32.bat index 7b5a435668..0437cec067 100644 --- a/harbour/contrib/hbw32/tests/bld_b32.bat +++ b/harbour/contrib/hbwin/tests/bld_b32.bat @@ -9,6 +9,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 -set HB_USER_LIBS=hbw32.lib +set HB_USER_LIBS=hbwin.lib call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32/tests/bld_vc.bat b/harbour/contrib/hbwin/tests/bld_vc.bat similarity index 80% rename from harbour/contrib/hbw32/tests/bld_vc.bat rename to harbour/contrib/hbwin/tests/bld_vc.bat index d1d8f24259..b503b112ab 100644 --- a/harbour/contrib/hbw32/tests/bld_vc.bat +++ b/harbour/contrib/hbwin/tests/bld_vc.bat @@ -9,6 +9,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc -set HB_USER_LIBS=hbw32.lib ole32.lib oleaut32.lib winspool.lib +set HB_USER_LIBS=hbwin.lib ole32.lib oleaut32.lib winspool.lib call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32/tests/sample.odt b/harbour/contrib/hbwin/tests/sample.odt similarity index 100% rename from harbour/contrib/hbw32/tests/sample.odt rename to harbour/contrib/hbwin/tests/sample.odt diff --git a/harbour/contrib/hbw32/tests/testdll.prg b/harbour/contrib/hbwin/tests/testdll.prg similarity index 100% rename from harbour/contrib/hbw32/tests/testdll.prg rename to harbour/contrib/hbwin/tests/testdll.prg diff --git a/harbour/contrib/hbw32/tests/testole.prg b/harbour/contrib/hbwin/tests/testole.prg similarity index 100% rename from harbour/contrib/hbw32/tests/testole.prg rename to harbour/contrib/hbwin/tests/testole.prg diff --git a/harbour/contrib/hbw32/tests/testw32p.prg b/harbour/contrib/hbwin/tests/testprn.prg similarity index 100% rename from harbour/contrib/hbw32/tests/testw32p.prg rename to harbour/contrib/hbwin/tests/testprn.prg diff --git a/harbour/contrib/hbw32/tests/testprt1.prg b/harbour/contrib/hbwin/tests/testprt1.prg similarity index 99% rename from harbour/contrib/hbw32/tests/testprt1.prg rename to harbour/contrib/hbwin/tests/testprt1.prg index c4a0b84443..ed0ee513ed 100644 --- a/harbour/contrib/hbw32/tests/testprt1.prg +++ b/harbour/contrib/hbwin/tests/testprt1.prg @@ -50,7 +50,7 @@ * */ -#include "hbw32.ch" +#include "hbwin.ch" procedure main(cPortName) diff --git a/harbour/contrib/hbw32/tests/testprt2.prg b/harbour/contrib/hbwin/tests/testprt2.prg similarity index 99% rename from harbour/contrib/hbw32/tests/testprt2.prg rename to harbour/contrib/hbwin/tests/testprt2.prg index f2c4cd92b5..d7de255fb9 100644 --- a/harbour/contrib/hbw32/tests/testprt2.prg +++ b/harbour/contrib/hbwin/tests/testprt2.prg @@ -50,7 +50,7 @@ * */ -#include "hbw32.ch" +#include "hbwin.ch" procedure main(cPortName) diff --git a/harbour/contrib/hbw32/tests/testreg.prg b/harbour/contrib/hbwin/tests/testreg.prg similarity index 95% rename from harbour/contrib/hbw32/tests/testreg.prg rename to harbour/contrib/hbwin/tests/testreg.prg index acb2967034..ac1437c5c2 100644 --- a/harbour/contrib/hbw32/tests/testreg.prg +++ b/harbour/contrib/hbwin/tests/testreg.prg @@ -2,7 +2,7 @@ * $Id$ */ -#include "hbw32.ch" +#include "hbwin.ch" PROCEDURE Main() diff --git a/harbour/contrib/hbw32/win_dll.c b/harbour/contrib/hbwin/win_dll.c similarity index 100% rename from harbour/contrib/hbw32/win_dll.c rename to harbour/contrib/hbwin/win_dll.c diff --git a/harbour/contrib/hbw32/win_ole.c b/harbour/contrib/hbwin/win_ole.c similarity index 100% rename from harbour/contrib/hbw32/win_ole.c rename to harbour/contrib/hbwin/win_ole.c diff --git a/harbour/contrib/hbw32/win_os.prg b/harbour/contrib/hbwin/win_os.prg similarity index 99% rename from harbour/contrib/hbw32/win_os.prg rename to harbour/contrib/hbwin/win_os.prg index 294258f36b..9ccade5c92 100644 --- a/harbour/contrib/hbw32/win_os.prg +++ b/harbour/contrib/hbwin/win_os.prg @@ -63,7 +63,7 @@ #include "common.ch" #include "directry.ch" -#include "hbw32.ch" +#include "hbwin.ch" /* NOTE: To change any of these registry settings Administrator rights are required by default in Windows. [vszakats] */ diff --git a/harbour/contrib/hbw32/win_osc.c b/harbour/contrib/hbwin/win_osc.c similarity index 100% rename from harbour/contrib/hbw32/win_osc.c rename to harbour/contrib/hbwin/win_osc.c diff --git a/harbour/contrib/hbw32/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c similarity index 100% rename from harbour/contrib/hbw32/win_prn1.c rename to harbour/contrib/hbwin/win_prn1.c diff --git a/harbour/contrib/hbw32/win_prn2.c b/harbour/contrib/hbwin/win_prn2.c similarity index 100% rename from harbour/contrib/hbw32/win_prn2.c rename to harbour/contrib/hbwin/win_prn2.c diff --git a/harbour/contrib/hbw32/win_prt.c b/harbour/contrib/hbwin/win_prt.c similarity index 100% rename from harbour/contrib/hbw32/win_prt.c rename to harbour/contrib/hbwin/win_prt.c diff --git a/harbour/contrib/hbw32/win_reg.prg b/harbour/contrib/hbwin/win_reg.prg similarity index 99% rename from harbour/contrib/hbw32/win_reg.prg rename to harbour/contrib/hbwin/win_reg.prg index 14c05dbef1..3a52fbcd9f 100644 --- a/harbour/contrib/hbw32/win_reg.prg +++ b/harbour/contrib/hbwin/win_reg.prg @@ -52,7 +52,7 @@ */ #include "common.ch" -#include "hbw32.ch" +#include "hbwin.ch" /* ------------------------------------------------------------------- */ diff --git a/harbour/contrib/hbw32/win_regc.c b/harbour/contrib/hbwin/win_regc.c similarity index 100% rename from harbour/contrib/hbw32/win_regc.c rename to harbour/contrib/hbwin/win_regc.c diff --git a/harbour/contrib/hbw32/win_tole.prg b/harbour/contrib/hbwin/win_tole.prg similarity index 100% rename from harbour/contrib/hbw32/win_tole.prg rename to harbour/contrib/hbwin/win_tole.prg diff --git a/harbour/contrib/hbw32/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg similarity index 100% rename from harbour/contrib/hbw32/win_tprn.prg rename to harbour/contrib/hbwin/win_tprn.prg diff --git a/harbour/contrib/hbw32/win_tprt.prg b/harbour/contrib/hbwin/win_tprt.prg similarity index 99% rename from harbour/contrib/hbw32/win_tprt.prg rename to harbour/contrib/hbwin/win_tprt.prg index fb3ee1bf53..9619bb9eea 100644 --- a/harbour/contrib/hbw32/win_tprt.prg +++ b/harbour/contrib/hbwin/win_tprt.prg @@ -53,7 +53,7 @@ #include "hbclass.ch" #include "common.ch" -#include "hbw32.ch" +#include "hbwin.ch" #define MAXSERIAL 16 diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 27c9d8f62e..28c333be4c 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -45,7 +45,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbwhat hbziparc +set _HB_DIRS=hbtip hbtpathy hbvpdf hbwin hbwhat hbziparc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado xhb diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index 3379a671b7..eb5302b4c3 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -43,7 +43,7 @@ _HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbs case "$HB_ARCHITECTURE" in w32|cyg|os2) - _HB_DIRS_ADD="gtwvg hbole hbodbc hbw32 hbwhat rddado" + _HB_DIRS_ADD="gtwvg hbole hbodbc hbwin hbwhat rddado" ;; *) _HB_DIRS_ADD=;; diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 41364b751d..40a32d9820 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -45,7 +45,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbwhat hbziparc +set _HB_DIRS=hbtip hbtpathy hbvpdf hbwin hbwhat hbziparc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado xhb diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 9046eefb51..cb7454ac48 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -25,7 +25,7 @@ ###################################################################### %define name harbour-ce -%define version 1.0.1 +%define version 1.1.0 %define releasen dev %define hb_pref hbce %define hb_ccpath /opt/mingw32ce/bin @@ -116,7 +116,7 @@ export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbw32 hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" make -r diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 133467b13d..0dac17a8d3 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -25,7 +25,7 @@ ###################################################################### %define name harbour-w32 -%define version 1.0.1 +%define version 1.1.0 %define releasen dev %define hb_pref hbw %define hb_ccpath /opt/xmingw/bin @@ -116,7 +116,7 @@ export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbw32 hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" make -r diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 5ef5cd2c1c..b5f96a1210 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -62,7 +62,7 @@ %define name harbour %define dname Harbour -%define version 1.0.1 +%define version 1.1.0 %define releasen dev %define hb_pref hb %define hb_arch export HB_ARCHITECTURE=linux diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 63833a7666..8dba4398ec 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -925,6 +925,22 @@ EXTERNAL HB_FIELDTYPE EXTERNAL HB_SCRMAXROW EXTERNAL HB_SCRMAXCOL +EXTERNAL HB_MTVM + +EXTERNAL HB_THREADSTART +EXTERNAL HB_THREADJOIN +EXTERNAL HB_THREADDETACH +EXTERNAL HB_THREADQUITREQUEST +EXTERNAL HB_THREADWAITFORALL + +EXTERNAL HB_MUTEXCREATE +EXTERNAL HB_MUTEXLOCK +EXTERNAL HB_MUTEXUNLOCK +EXTERNAL HB_MUTEXNOTIFY +EXTERNAL HB_MUTEXNOTIFYALL +EXTERNAL HB_MUTEXSUBSCRIBE +EXTERNAL HB_MUTEXSUBSCRIBENOW + /* Codepage support */ EXTERNAL HB_CODEPAGE_BG866 EXTERNAL HB_CODEPAGE_BGISO diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index 1538e804d5..2a063f3c70 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -60,9 +60,9 @@ #endif #define HB_VER_MAJOR 1 /* Major version number */ -#define HB_VER_MINOR 0 /* Minor version number */ -#define HB_VER_REVISION 1 /* Revision number */ +#define HB_VER_MINOR 1 /* Minor version number */ +#define HB_VER_REVISION 0 /* Revision number */ #define HB_VER_STATUS "dev" /* Build status */ -#define __HARBOUR__ 0x010001 /* Three bytes: Major + Minor + Revision. This is recommented for 3rd party .c and .prg level code. */ +#define __HARBOUR__ 0x010100 /* Three bytes: Major + Minor + Revision. This is recommented for 3rd party .c and .prg level code. */ #endif /* HB_VER_H_ */