Skip to content

Commit

Permalink
v3.0.0 final
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Mar 25, 2015
1 parent ac51bbb commit 24ed33e
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 21 deletions.
19 changes: 19 additions & 0 deletions harbour/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions harbour/config/global.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions harbour/include/hbver.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
2 changes: 1 addition & 1 deletion harbour/package/harb_win.mft
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Copyright © 1999-2011 (see application banner) -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="2.1.0.0"
<assemblyIdentity version="3.0.0.0"
processorArchitecture="*"
name="Harbour Project"
type="win32"/>
Expand Down
4 changes: 2 additions & 2 deletions harbour/package/harbour-wce.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions harbour/package/harbour-win.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions harbour/package/harbour.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions harbour/package/winuni/RELNOTES
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions harbour/package/winuni/mpkg_win_uni.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%\
Expand Down

0 comments on commit 24ed33e

Please sign in to comment.