fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-12-09 06:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* package/harbour.spec
  * package/harbour-win.spec.in
  * package/harbour-wce.spec.in
  * include/hbver.h
  * config/global.mk
    + Changed version number to:
         2.1.0beta3 (from 2.1.0beta2)

  * contrib/gtwvg/gtwvg.hbc
    ! Typo.

  * contrib/gtwvg/tests/wvgactivex.prg
    * Eliminated WITH OBJECT. Now Harbour doesn't
      use this statement except in test code.
This commit is contained in:
Viktor Szakats
2010-12-09 05:10:11 +00:00
parent 05f2b13336
commit ea6b36066c
8 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -16,6 +16,22 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-12-09 06:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* package/harbour.spec
* package/harbour-win.spec.in
* package/harbour-wce.spec.in
* include/hbver.h
* config/global.mk
+ Changed version number to:
2.1.0beta3 (from 2.1.0beta2)
* contrib/gtwvg/gtwvg.hbc
! Typo.
* contrib/gtwvg/tests/wvgactivex.prg
* Eliminated WITH OBJECT. Now Harbour doesn't
use this statement except in test code.
2010-12-08 23:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/pp/hbpp.c
* Bumped some more years.

4
harbour/config/global.mk
View File

@@ -36,9 +36,9 @@ HB_VER_MAJOR := 2
HB_VER_MINOR := 1
HB_VER_RELEASE := 0
# Status (dev, alpha1, alpha2, beta1, beta2, rc1, rc2, empty for final)
HB_VER_STATUS := beta2
HB_VER_STATUS := beta3
# Short status (d, a1, a2, b1, b2, r1, r2, empty for final)
HB_VER_STATUS_SH := b2
HB_VER_STATUS_SH := b3
ifeq ($(HB_VER_STATUS_SH),)
HB_VER_STATUS_SH := $(HB_VER_MINOR)$(HB_VER_RELEASE)

2
harbour/contrib/gtwvg/gtwvg.hbc
View File

@@ -6,7 +6,7 @@ skip={!win}
incpaths=.
gt={hb_name}${__HB_DYN__}
gt=${hb_name}${__HB_DYN__}
libs=../hbwin/hbwin.hbc

73
harbour/contrib/gtwvg/tests/wvgactivex.prg
View File

@@ -1,8 +1,8 @@
/*
* $Id$
*/
/*
/*
* Pritpal Bedi <bedipritpal@hotmail.com>
*/
/*----------------------------------------------------------------------*/
@@ -12,7 +12,7 @@
#include "wvtwin.ch"
#include "hbgtinfo.ch"
#include "hbgtwvg.ch"
#include "wvgparts.ch"
#include "wvgparts.ch"
/*----------------------------------------------------------------------*/
// The function has to be called via hb_threadStart( {|| ExecuteActiveX( nActiveX ) } )
@@ -236,7 +236,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam )
oCrt:Destroy()
Return NIL
//----------------------------------------------------------------------//
STATIC FUNCTION ResizeDialog( oCrt, oTBar, oSBar, oStatic, oCom, oTree )
@@ -264,7 +264,7 @@ STATIC FUNCTION ResizeDialog( oCrt, oTBar, oSBar, oStatic, oCom, oTree )
ENDIF
RETURN 1
//----------------------------------------------------------------------//
Static Function ActiveXBuildMenu( oCrt, oStatic, oStatic2 )
@@ -302,7 +302,7 @@ Static Function ActiveXBuildMenu( oCrt, oStatic, oStatic2 )
oMenuBar:addItem( { oSubMenu, NIL } )
Return NIL
//----------------------------------------------------------------------//
STATIC FUNCTION BuildActiveXControl( nActiveX, oDA )
@@ -368,7 +368,7 @@ STATIC FUNCTION BuildActiveXControl( nActiveX, oDA )
oCom:create()
RETURN oCom
//----------------------------------------------------------------------//
STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
@@ -584,11 +584,14 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
endif
enddo
RETURN NIL
RETURN NIL
//----------------------------------------------------------------------//
STATIC FUNCTION ConfigureRMChart( RMChart )
LOCAL oRegion
LOCAL oCaption
LOCAL oChart
#define RMC_CTRLSTYLEFLAT 0
#define RMC_PIE_GRADIENT 52
@@ -598,37 +601,35 @@ STATIC FUNCTION ConfigureRMChart( RMChart )
#define RMC_HATCHBRUSH_OFF 0
/* The code pulled from freewin sources */
WITH OBJECT RMChart
:Font := "Tahoma"
:RMCStyle := RMC_CTRLSTYLEFLAT
RMChart:Font := "Tahoma"
RMChart:RMCStyle := RMC_CTRLSTYLEFLAT
:AddRegion()
WITH OBJECT :Region( 1 )
:Footer = "http://vouch.info"
RMChart:AddRegion()
:AddCaption()
WITH OBJECT :Caption()
:Titel := "GTWVG Active-X Demo"
:FontSize := 10
:Bold := .T.
END
oRegion := RMChart:Region( 1 )
oRegion:Footer = "http://vouch.info"
:AddGridlessSeries()
oRegion:AddCaption()
WITH OBJECT :GridLessSeries
:SeriesStyle := RMC_PIE_GRADIENT
:Alignment := RMC_FULL
:Explodemode := RMC_EXPLODE_NONE
:Lucent := .F.
:ValueLabelOn := RMC_VLABEL_ABSOLUTE
:HatchMode := RMC_HATCHBRUSH_OFF
:StartAngle := 0
:DataString := "10*5*20*25"
END
END
END
oCaption := oRegion:Caption()
oCaption:Titel := "GTWVG Active-X Demo"
oCaption:FontSize := 10
oCaption:Bold := .T.
oRegion:AddGridlessSeries()
oChart := oRegion:GridLessSeries
oChart:SeriesStyle := RMC_PIE_GRADIENT
oChart:Alignment := RMC_FULL
oChart:Explodemode := RMC_EXPLODE_NONE
oChart:Lucent := .F.
oChart:ValueLabelOn := RMC_VLABEL_ABSOLUTE
oChart:HatchMode := RMC_HATCHBRUSH_OFF
oChart:StartAngle := 0
oChart:DataString := "10*5*20*25"
RETURN NIL
RETURN NIL
//----------------------------------------------------------------------//
STATIC FUNCTION MyFunction( nMode )
@@ -660,5 +661,5 @@ STATIC FUNCTION MyFunction( nMode )
endcase
RETURN NIL
//----------------------------------------------------------------------//

2
harbour/include/hbver.h
View File

@@ -62,7 +62,7 @@
#define HB_VER_MAJOR 2 /* Major version number */
#define HB_VER_MINOR 1 /* Minor version number */
#define HB_VER_RELEASE 0 /* Release number */
#define HB_VER_STATUS "beta2" /* Build status (all lowercase) */
#define HB_VER_STATUS "beta3" /* Build status (all lowercase) */
#define __HARBOUR__ 0x020100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */
#endif /* HB_VER_H_ */

2
harbour/package/harbour-wce.spec.in
View File

@@ -15,7 +15,7 @@
%define name harbour-wce
%define version 2.1.0
%define releasen beta2
%define releasen beta3
# Workaround for the problem of /usr/bin/strip not handling PE binaries.
%define hb_ccpath /opt/mingw32ce/bin

2
harbour/package/harbour-win.spec.in
View File

@@ -15,7 +15,7 @@
%define name harbour-win
%define version 2.1.0
%define releasen beta2
%define releasen beta3
# Workaround for the problem of /usr/bin/strip not handling PE binaries.
%define hb_ccpath /opt/xmingw/bin

24
harbour/package/harbour.spec
View File

@@ -54,7 +54,7 @@
%define name harbour
%define dname Harbour
%define version 2.1.0
%define releasen beta2
%define releasen beta3
%define hb_etcdir /etc/%{name}
%define hb_plat export HB_PLATFORM=linux
%define hb_cc export HB_COMPILER=gcc
@@ -86,7 +86,7 @@
Summary: Free software Clipper compatible compiler
Summary(pl): Darmowy kompilator kompatybilny z językiem Clipper.
Summary(pt_BR): Um compilador Clipper compativel Gratis
Summary(ru): Свободный компилятор, совместимый с языком Clipper.
Summary(ru): ????????? ??????????, ??????????? ? ?????? Clipper.
Summary(hu): Szabad szoftver Clipper kompatibilis fordító
Name: %{name}
Version: %{version}
@@ -118,9 +118,9 @@ Esse pacote contem um compilador, um pré-processador, arquivos de cabeçalho
uma maquina virtual e documentaçăo.
%description -l ru
%{dname} - многоплатформенный компилятор, совместимый с языком CA-Cl*pper.
Этот пакет содержит компилятор, препроцессор, файлы заголовков, виртуальную
машину и документацию.
%{dname} - ?????????????????? ??????????, ??????????? ? ?????? CA-Cl*pper.
???? ????? ???????? ??????????, ????????????, ????? ??????????, ???????????
?????? ? ????????????.
%description -l hu
%{dname} egy több platformon is működő CA-Cl*pper kompatibilis
@@ -134,7 +134,7 @@ fordítóprogram. A csomag része a fordító maga, az előfordító, fejléc
%package lib
Summary: Shared runtime libaries for %{dname} compiler
Summary(pl): Dzielone bilioteki dla kompilatora %{dname}
Summary(ru): Совместно используемые библиотеки для компилятора %{dname}
Summary(ru): ????????? ???????????? ?????????? ??? ??????????? %{dname}
Summary(hu): Megosztott könyvtárak a(z) %{dname} fordítóhoz
Group: Development/Languages
Provides: lib%{name}.so lib%{name}mt.so
@@ -155,9 +155,9 @@ Esse pacote %{dname} provem as bibliotecas compartilhadas para programas
linkados dinamicamente.
%description -l ru lib
%{dname} - компилятор, совместимый с языком CA-Cl*pper.
Этот пакет содержит совместно используемые библиотеки %{dname},
необходимые для работы динамически скомпонованных программ.
%{dname} - ??????????, ??????????? ? ?????? CA-Cl*pper.
???? ????? ???????? ????????? ???????????? ?????????? %{dname},
??????????? ??? ?????? ??????????? ?????????????? ????????.
%description -l hu lib
A(z) %{dname} egy Clipper kompatibilis fordítóprogram.
@@ -172,7 +172,7 @@ programokhoz szükséges megosztott (dinamikus) futtatókönyvtárakat.
Summary: Contrib runtime libaries for %{dname} compiler
Summary(pl): Bilioteki z drzewa contrib dla kompilatora %{dname}
Summary(pt_BR): Libs contrib para %{dname}
Summary(ru): Библиотеки из дерева contrib для компилятора %{dname}
Summary(ru): ?????????? ?? ?????? contrib ??? ??????????? %{dname}
Summary(hu): Kiegészítő könyvtárak a(z) %{dname} fordítóhoz
Group: Development/Languages
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -192,8 +192,8 @@ Esse pacote %{dname} provem as bibliotecas contrib para linkagem
dos programas.
%description -l ru contrib
%{dname} - компилятор, совместимый с языком CA-Cl*pper.
Этот пакет содержит статические библиотеки %{dname} из дерева contrib.
%{dname} - ??????????, ??????????? ? ?????? CA-Cl*pper.
???? ????? ???????? ??????????? ?????????? %{dname} ?? ?????? contrib.
%description -l hu contrib
A(z) %{dname} egy Clipper kompatibilis fordítóprogram.