From 5cf8db7936a7642f139199778e94baa22bb5728e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Apr 2012 12:12:03 +0000 Subject: [PATCH] 2012-04-25 14:11 UTC+0200 Viktor Szakats (harbour syenar.net) * include/hbver.h * package/harbour.spec * package/harb_win.mft * package/harbour-win.spec.in * package/harbour-wce.spec.in * package/winuni/mpkg_win_uni.bat * harbour/debian/changelog * trunk version bump. 3.1.0dev -> 3.2.0dev this is to make it easy to create conditional code for new features and the few incompatibilities after introducing unicode in Harbour. May be bumped further when FOR EACH is decided. * contrib/hbexpat/tests/tohash.prg + enabled UTF8EX for testing --- harbour/ChangeLog | 17 +++++++++++++++++ harbour/contrib/hbexpat/tests/tohash.prg | 5 +++++ harbour/debian/changelog | 6 ++++++ harbour/include/hbver.h | 4 ++-- harbour/package/harb_win.mft | 2 +- harbour/package/harbour-wce.spec.in | 2 +- harbour/package/harbour-win.spec.in | 2 +- harbour/package/harbour.spec | 2 +- harbour/package/winuni/mpkg_win_uni.bat | 8 ++++---- 9 files changed, 38 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 510e94f6dc..21f642234d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,23 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-25 14:11 UTC+0200 Viktor Szakats (harbour syenar.net) + * include/hbver.h + * package/harbour.spec + * package/harb_win.mft + * package/harbour-win.spec.in + * package/harbour-wce.spec.in + * package/winuni/mpkg_win_uni.bat + * harbour/debian/changelog + * trunk version bump. 3.1.0dev -> 3.2.0dev + this is to make it easy to create conditional code + for new features and the few incompatibilities after + introducing unicode in Harbour. May be bumped further + when FOR EACH is decided. + + * contrib/hbexpat/tests/tohash.prg + + enabled UTF8EX for testing + 2012-04-25 12:08 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/include/harbour.hbx ! fixed typo in previous commit diff --git a/harbour/contrib/hbexpat/tests/tohash.prg b/harbour/contrib/hbexpat/tests/tohash.prg index e98669c615..c6c9b04b59 100644 --- a/harbour/contrib/hbexpat/tests/tohash.prg +++ b/harbour/contrib/hbexpat/tests/tohash.prg @@ -23,12 +23,17 @@ #define _N_hAttr 4 #define _N_MAX_ 4 +REQUEST HB_CODEPAGE_UTF8 +REQUEST HB_CODEPAGE_UTF8EX + PROCEDURE Main( cFileName ) LOCAL p := XML_ParserCreate() LOCAL aUserData LOCAL aNode LOCAL v1, v2, v3 + hb_cdpSelect( "UTF8EX" ) + IF cFileName == NIL cFileName := ".." + hb_ps() + ".." + hb_ps() + "hbide" + hb_ps() + "setup.ui" ENDIF diff --git a/harbour/debian/changelog b/harbour/debian/changelog index c6b6f7c588..d525509fac 100644 --- a/harbour/debian/changelog +++ b/harbour/debian/changelog @@ -1,3 +1,9 @@ +harbour (3.2.0-1) unstable; urgency=low + + * 3.2.0-1 + + -- Viktor Szakats Wed, 25 Apr 2012 14:04:00 +0200 + harbour (3.1.0-1) unstable; urgency=low * 3.1.0-1 diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index af0322679c..2cb2e2728b 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -60,9 +60,9 @@ #endif #define HB_VER_MAJOR 3 /* Major version number */ -#define HB_VER_MINOR 1 /* Minor version number */ +#define HB_VER_MINOR 2 /* Minor version number */ #define HB_VER_RELEASE 0 /* Release number */ #define HB_VER_STATUS "dev" /* Build status (all lowercase) */ -#define __HARBOUR__ 0x030100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */ +#define __HARBOUR__ 0x030200 /* 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 5e47412337..2469727b58 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 6fb8272b6b..3a61a0d68e 100644 --- a/harbour/package/harbour-wce.spec.in +++ b/harbour/package/harbour-wce.spec.in @@ -14,7 +14,7 @@ ###################################################################### %define name harbour-wce -%define version 3.1.0 +%define version 3.2.0 %define releasen dev # Workaround for the problem of /usr/bin/strip not handling PE binaries. diff --git a/harbour/package/harbour-win.spec.in b/harbour/package/harbour-win.spec.in index 267a2cbea8..4256db4a8e 100644 --- a/harbour/package/harbour-win.spec.in +++ b/harbour/package/harbour-win.spec.in @@ -14,7 +14,7 @@ ###################################################################### %define name harbour-win -%define version 3.1.0 +%define version 3.2.0 %define releasen dev # Workaround for the problem of /usr/bin/strip not handling PE binaries. diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index 44eecf93eb..dd43e8b90c 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -53,7 +53,7 @@ %define name harbour %define dname Harbour -%define version 3.1.0 +%define version 3.2.0 %define releasen dev %define hb_etcdir /etc/%{name} %define hb_plat export HB_PLATFORM=linux diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index a4e3410d52..787549bf87 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -17,10 +17,10 @@ rem - Requires GNU sed tool in PATH echo ! Self: %0 -if "%HB_VS%" == "" set HB_VS=31 -if "%HB_VL%" == "" set HB_VL=310 -if "%HB_VM%" == "" set HB_VM=3.1 -if "%HB_VF%" == "" set HB_VF=3.1.0dev +if "%HB_VS%" == "" set HB_VS=32 +if "%HB_VL%" == "" set HB_VL=320 +if "%HB_VM%" == "" set HB_VM=3.2 +if "%HB_VF%" == "" set HB_VF=3.2.0dev if "%HB_RT%" == "" set HB_RT=C:\hb\ set HB_DR=hb%HB_VS%\