From 5fafefc19c018e34d32c25b685000f8d81460957 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 16 Dec 2009 17:38:13 +0000 Subject: [PATCH] 2009-12-16 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * harbour-win-spec * harbour-wce-spec * include/hbver.h * package/winuni/RELNOTES * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi * harbour.spec * config/global.mk * Changed version to 2.0.0rc1 (from 2.0.0beta3) ; TODO: Please also change debian/changelog. ; Rehearsing version change, I don't plan to make binary release of this interim version. * doc/codestyl.txt * Minor update. I don't plan a full update this time, as we have a huge amount of well formatted source code, and it's pretty consistent too, so it's enough to peek into any one of them for a perfect example. So if someone needs and example, just look under src/* for both .c and .prg. --- harbour/ChangeLog | 22 ++++++++++++++++++++++ harbour/config/global.mk | 4 ++-- harbour/doc/codestyl.txt | 5 +++-- harbour/harbour-wce-spec | 2 +- harbour/harbour-win-spec | 2 +- harbour/harbour.spec | 2 +- harbour/include/hbver.h | 2 +- harbour/package/winuni/RELNOTES | 2 +- harbour/package/winuni/mpkg_win_uni.bat | 4 ++-- harbour/package/winuni/mpkg_win_uni.nsi | 6 +++--- 10 files changed, 37 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8b19c348a8..b0b9a87956 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,28 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-16 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * harbour-win-spec + * harbour-wce-spec + * include/hbver.h + * package/winuni/RELNOTES + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * harbour.spec + * config/global.mk + * Changed version to 2.0.0rc1 (from 2.0.0beta3) + ; TODO: Please also change debian/changelog. + ; Rehearsing version change, I don't plan to make binary + release of this interim version. + + * doc/codestyl.txt + * Minor update. + I don't plan a full update this time, as we have a huge + amount of well formatted source code, and it's pretty + consistent too, so it's enough to peek into any one of + them for a perfect example. So if someone needs and + example, just look under src/* for both .c and .prg. + 2009-12-16 09:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/common/hbdate.c * casting for some more pedantic C/C++ compilers diff --git a/harbour/config/global.mk b/harbour/config/global.mk index d710bbab3d..742996b20e 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -35,8 +35,8 @@ GLOBAL_MK_ := yes HB_VER_MAJOR := 2 HB_VER_MINOR := 0 HB_VER_RELEASE := 0 -HB_VER_STATUS := beta3 -HB_VER_STATUS_SH := b3 +HB_VER_STATUS := rc1 +HB_VER_STATUS_SH := r1 # Arbitrary pattern which we do not expect to occur in real-world path names substpat := !@!@ diff --git a/harbour/doc/codestyl.txt b/harbour/doc/codestyl.txt index 4290a8350d..20916e063d 100644 --- a/harbour/doc/codestyl.txt +++ b/harbour/doc/codestyl.txt @@ -147,13 +147,14 @@ Syntax and indentation and to: - if( foo ) + if( foo ){ bar; + } Keep one empty line between the variable declaration section and the statements in a block, as well as between logical statement groups in a block. Maintain at least one empty line between - two functions, preferably two. + two functions. [4] When indenting, use three spaces. It is important to maintain consistency in indenture so that definitions, comments, and diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index 1b3359ec25..66aa1be841 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -15,7 +15,7 @@ %define name harbour-wce %define version 2.0.0 -%define releasen beta3 +%define releasen rc1 %define hb_pref hbce %define hb_host www.harbour-project.org %define readme README.RPM diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index 05509d16ce..5d544432aa 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -15,7 +15,7 @@ %define name harbour-win %define version 2.0.0 -%define releasen beta3 +%define releasen rc1 %define hb_pref hbw %define hb_host www.harbour-project.org %define readme README.RPM diff --git a/harbour/harbour.spec b/harbour/harbour.spec index d4c06c693d..e5653418b2 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -47,7 +47,7 @@ %define name harbour %define dname Harbour %define version 2.0.0 -%define releasen beta3 +%define releasen rc1 %define hb_pref hb %define hb_etcdir /etc/%{name} %define hb_plat export HB_PLATFORM=linux diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index f145d706b5..d596a2fd58 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -62,7 +62,7 @@ #define HB_VER_MAJOR 2 /* Major version number */ #define HB_VER_MINOR 0 /* Minor version number */ #define HB_VER_RELEASE 0 /* Release number */ -#define HB_VER_STATUS "beta3" /* Build status */ +#define HB_VER_STATUS "rc1" /* Build status (all lowercase) */ #define __HARBOUR__ 0x020000 /* 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/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index bd95a95f1e..7d39a999fb 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -1,6 +1,6 @@ Hi All, -Harbour 2.0.0beta3 (r12422) source archives and Windows binary +Harbour 2.0.0rc1 (r13???) source archives and Windows binary releases are available for download on sourceforge.net. Make sure to check INSTALL doc "QUICK START" section and visit diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 2ae60b907e..3d6a22e47f 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -72,7 +72,7 @@ echo "hb20\comp\mingw\*" >> _hbfiles echo "hb20\examples\*.*" >> _hbfiles echo "hb20\contrib\*.*" >> _hbfiles -if exist harbour-2.0.0beta3-win-20090905.7z del harbour-2.0.0beta3-win-20090905.7z -7za a -r harbour-2.0.0beta3-win-20090905.7z @_hbfiles +if exist harbour-2.0.0rc1-win-20090905.7z del harbour-2.0.0rc1-win-20090905.7z +7za a -r harbour-2.0.0rc1-win-20090905.7z @_hbfiles del _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index b26eaa9a08..d98df3a7aa 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -31,14 +31,14 @@ CRCCheck on ; The name of the installer Name "Harbour Project 2.0 (full)" ; The file to write - OutFile "harbour-2.0.0beta3-win-full.exe" + OutFile "harbour-2.0.0rc1-win-full.exe" !else !ifdef PKG_MINI Name "Harbour Project 2.0 (minimal)" - OutFile "harbour-2.0.0beta3-win-mini.exe" + OutFile "harbour-2.0.0rc1-win-mini.exe" !else Name "Harbour Project 2.0" - OutFile "harbour-2.0.0beta3-win-20090905.exe" + OutFile "harbour-2.0.0rc1-win-20090905.exe" !endif !endif