From 24ed33e7e93c266a125edf3ea51189ddac1ab982 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Mar 2015 10:54:11 +0100 Subject: [PATCH] v3.0.0 final --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/config/global.mk | 8 ++++---- harbour/include/hbver.h | 8 ++++---- harbour/package/harb_win.mft | 2 +- harbour/package/harbour-wce.spec.in | 4 ++-- harbour/package/harbour-win.spec.in | 4 ++-- harbour/package/harbour.spec | 4 ++-- harbour/package/winuni/RELNOTES | 4 ++-- harbour/package/winuni/mpkg_win_uni.bat | 8 ++++---- 9 files changed, 40 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5f1a789ff9..d3d6206df9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2011-07-17 19:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/RELNOTES + * final update for installed size + +2011-07-17 16:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + * package/winuni/RELNOTES + * version bump in global.mk + +2011-07-17 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/hbver.h + * package/harbour-win.spec.in + * package/harbour.spec + * package/winuni/RELNOTES + * package/winuni/mpkg_win_uni.bat + * package/harbour-wce.spec.in + * package/harb_win.mft + * branch 3.0 version bump 2.1.0rc2 -> 3.0.0 + 2011-07-17 14:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * ChangeLog ! typo diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 822f02d619..f6624daeb7 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -32,13 +32,13 @@ GLOBAL_MK_ := yes -include $(TOP)$(ROOT)user.mk -HB_VER_MAJOR := 2 -HB_VER_MINOR := 1 +HB_VER_MAJOR := 3 +HB_VER_MINOR := 0 HB_VER_RELEASE := 0 # Status (dev, alpha1, alpha2, beta1, beta2, rc1, rc2, empty for final) -HB_VER_STATUS := rc2 +HB_VER_STATUS := # Short status (d, a1, a2, b1, b2, r1, r2, empty for final) -HB_VER_STATUS_SH := r2 +HB_VER_STATUS_SH := ifeq ($(HB_VER_STATUS_SH),) HB_VER_STATUS_SH := $(HB_VER_MINOR)$(HB_VER_RELEASE) diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index 66078b3781..9eaa8f5930 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -59,10 +59,10 @@ #undef __HARBOUR__ #endif -#define HB_VER_MAJOR 2 /* Major version number */ -#define HB_VER_MINOR 1 /* Minor version number */ +#define HB_VER_MAJOR 3 /* Major version number */ +#define HB_VER_MINOR 0 /* Minor version number */ #define HB_VER_RELEASE 0 /* Release number */ -#define HB_VER_STATUS "rc2" /* Build status (all lowercase) */ -#define __HARBOUR__ 0x020100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */ +#define HB_VER_STATUS "" /* Build status (all lowercase) */ +#define __HARBOUR__ 0x030000 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */ #endif /* HB_VER_H_ */ diff --git a/harbour/package/harb_win.mft b/harbour/package/harb_win.mft index d4eeee95e4..a75dcb9676 100644 --- a/harbour/package/harb_win.mft +++ b/harbour/package/harb_win.mft @@ -1,7 +1,7 @@  - diff --git a/harbour/package/harbour-wce.spec.in b/harbour/package/harbour-wce.spec.in index 2d8d0e2d84..24941532e6 100644 --- a/harbour/package/harbour-wce.spec.in +++ b/harbour/package/harbour-wce.spec.in @@ -14,8 +14,8 @@ ###################################################################### %define name harbour-wce -%define version 2.1.0 -%define releasen rc2 +%define version 3.0.0 +%define releasen 0 # Workaround for the problem of /usr/bin/strip not handling PE binaries. %define hb_ccpath /opt/mingw32ce/bin diff --git a/harbour/package/harbour-win.spec.in b/harbour/package/harbour-win.spec.in index e686dcb043..88c216d44e 100644 --- a/harbour/package/harbour-win.spec.in +++ b/harbour/package/harbour-win.spec.in @@ -14,8 +14,8 @@ ###################################################################### %define name harbour-win -%define version 2.1.0 -%define releasen rc2 +%define version 3.0.0 +%define releasen 0 # Workaround for the problem of /usr/bin/strip not handling PE binaries. %define hb_ccpath /opt/xmingw/bin diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index 4223eb5b19..489d8768fd 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -53,8 +53,8 @@ %define name harbour %define dname Harbour -%define version 2.1.0 -%define releasen rc2 +%define version 3.0.0 +%define releasen 0 %define hb_etcdir /etc/%{name} %define hb_plat export HB_PLATFORM=linux %define hb_cc export HB_COMPILER=gcc diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 6d7f41e5ae..057a180a9f 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -1,6 +1,6 @@ Hi All, -Harbour 3.0.0 (r?????) source archives and Windows binary +Harbour 3.0.0 (r16952) source archives and Windows binary releases are available for download on sourceforge.net: http://sourceforge.net/projects/harbour-project/files/ @@ -15,7 +15,7 @@ Release notes: Unified Windows release for mainstream compilers and x86, x64, WinCE/ARM platforms. -Installed size: 233MB (78MB - 322MB) +Installed size: 231MB (76MB - 317MB) The default installation will install MinGW compiler + x86 static and shared libs, MSVC and BCC x86 libs and examples. diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 9a528d1f81..38fab3a84b 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -16,10 +16,10 @@ rem - Run this from vanilla official source tree only. echo ! Self: %0 -if "%HB_VS%" == "" set HB_VS=21 -if "%HB_VL%" == "" set HB_VL=210 -if "%HB_VM%" == "" set HB_VM=2.1 -if "%HB_VF%" == "" set HB_VF=2.1.0rc2 +if "%HB_VS%" == "" set HB_VS=30 +if "%HB_VL%" == "" set HB_VL=300 +if "%HB_VM%" == "" set HB_VM=3.0 +if "%HB_VF%" == "" set HB_VF=3.0.0 if "%HB_RT%" == "" set HB_RT=C:\hb\ set HB_DR=hb%HB_VS%\