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

2009-12-22 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* harbour-win-spec
  * harbour-wce-spec
  * harbour.spec
  * include/hbver.h
  * package/winuni/RELNOTES
  * config/global.mk
    * Changed version to 2.0.0 (from 2.0.0rc1)

  * package/winuni/RELNOTES
    * Finalization (djgpp -> watcom)

  * package/winuni/mpkg_win_uni.nsi
    ! Fixed uninstallation of Start Menu on Vista/Win7, at the
      same time it won't ask for admin credentials anymore on
      these OS versions.
    * MS-DOS/OS2/Linux libs are now not selected by default.

  * config/dos/watcom.mk
  * config/dos/djgpp.mk
    * Disabled .dll generation for MS-DOS build for now.
      dos/watcom doesn't work, dos/djgpp needs special fixes
      in djgpp to work.
      In the meantime, for testing purposes they can be
      enabled using: HB_BUILD_DLL=dostest
This commit is contained in:
Viktor Szakats
2009-12-22 21:00:36 +00:00
parent f9fbf1d8f2
commit 2252b2fe2b
10 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
harbour/ChangeLog
View File

@@ -17,6 +17,32 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-22 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* harbour-win-spec
* harbour-wce-spec
* harbour.spec
* include/hbver.h
* package/winuni/RELNOTES
* config/global.mk
* Changed version to 2.0.0 (from 2.0.0rc1)
* package/winuni/RELNOTES
* Finalization (djgpp -> watcom)
* package/winuni/mpkg_win_uni.nsi
! Fixed uninstallation of Start Menu on Vista/Win7, at the
same time it won't ask for admin credentials anymore on
these OS versions.
* MS-DOS/OS2/Linux libs are now not selected by default.
* config/dos/watcom.mk
* config/dos/djgpp.mk
* Disabled .dll generation for MS-DOS build for now.
dos/watcom doesn't work, dos/djgpp needs special fixes
in djgpp to work.
In the meantime, for testing purposes they can be
enabled using: HB_BUILD_DLL=dostest
2009-12-22 19:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* debian/changelog
* Changed version to 2.0.0 (from 2.0.0rc1)

2
harbour/config/dos/djgpp.mk
View File

@@ -104,7 +104,7 @@ AR_RULE = $(create_library)
LD_RULE = $(link_exe_file)
ifeq ($(HB_BUILD_DLL),yes)
ifeq ($(HB_BUILD_DLL),dostest)
DY := dxe3gen
DFLAGS += $(LIBPATHS)

2
harbour/config/dos/watcom.mk
View File

@@ -71,7 +71,7 @@ ifneq ($(HB_LINKING_RTL),)
endif
endif
ifeq ($(HB_BUILD_DLL),yes)
ifeq ($(HB_BUILD_DLL),dostest)
DY := $(LD)
DFLAGS += OP quiet SYS cwdllr

6
harbour/config/global.mk
View File

@@ -35,8 +35,10 @@ GLOBAL_MK_ := yes
HB_VER_MAJOR := 2
HB_VER_MINOR := 0
HB_VER_RELEASE := 0
HB_VER_STATUS := rc1
HB_VER_STATUS_SH := r1
# Status (alpha1, alpha2, beta1, beta2, rc1, rc2, empty for final)
HB_VER_STATUS :=
# Short status (a1, a2, b1, b2, r1, r2, MINOR+RELEASE for final)
HB_VER_STATUS_SH := $(HB_VER_MINOR)$(HB_VER_RELEASE)
# Arbitrary pattern which we do not expect to occur in real-world path names
substpat := !@!@

2
harbour/harbour-wce-spec
View File

@@ -15,7 +15,7 @@
%define name harbour-wce
%define version 2.0.0
%define releasen rc1
%define releasen 0
%define hb_pref hbce
%define hb_host www.harbour-project.org
%define readme README.RPM

2
harbour/harbour-win-spec
View File

@@ -15,7 +15,7 @@
%define name harbour-win
%define version 2.0.0
%define releasen rc1
%define releasen 0
%define hb_pref hbw
%define hb_host www.harbour-project.org
%define readme README.RPM

2
harbour/harbour.spec
View File

@@ -47,7 +47,7 @@
%define name harbour
%define dname Harbour
%define version 2.0.0
%define releasen rc1
%define releasen 0
%define hb_pref hb
%define hb_etcdir /etc/%{name}
%define hb_plat export HB_PLATFORM=linux

2
harbour/include/hbver.h
View File

@@ -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 "rc1" /* Build status (all lowercase) */
#define HB_VER_STATUS "" /* 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_ */

18
harbour/package/winuni/RELNOTES
View File

@@ -1,6 +1,6 @@
Hi All,
Harbour 2.0.0rc1 (r133??) source archives and Windows binary
Harbour 2.0.0 (r13372) source archives and Windows binary
releases are available for download on sourceforge.net.
Make sure to check INSTALL doc "QUICK START" section and visit
@@ -12,28 +12,28 @@ Release notes:
Unified Windows release for most supported compilers and
x86, x64, WinCE/ARM, MS-DOS, OS/2, Linux target platforms.
Installed size: 247MB (54MB - 337MB)
Installed size: 214MB (54MB - 339MB)
The default installation will install MinGW compiler + x86 static and
shared libs, MSVC and BCC x86 libs and examples.
Options: x86 shared tools, x64 shared tools, MinGW x64 and
WinCE-ARM libs, MSVC x64 libs, Open Watcom x86 libs,
shared x64/WinCE-ARM libs, MS-DOS (watcom), OS/2 (watcom) libs,
Linux (watcom) libs.
shared x64/WinCE-ARM libs, MS-DOS (watcom) libs, OS/2 (watcom)
libs, Linux (watcom) libs.
Usage:
1) install/unpack to any directory (C:\hb20)
2) go to bin dir (optional if you specify path for hbmk2)
3) For x86 executable, type: 'hbmk2 ../tests/hello.prg'
4) For x64 executable, type: 'hbmk2 ../tests/hello.prg -compiler=mingw64'
[needs mingw64 to be installed into 'comp/mingw64' dir beforehand]
[needs mingw64 to be installed in 'comp/mingw64' dir beforehand]
5) For WinCE/ARM executable, type: 'hbmk2 ../tests/hello.prg -platform=wce'
[needs cegcc to be installed into 'comp/mingwarm' dir beforehand]
[needs cegcc to be installed in 'comp/mingwarm' dir beforehand]
6) For MS-DOS executable, type: 'hbmk2 ../tests/hello.prg -platform=dos'
[needs DJGPP to be installed into 'comp/djgpp' dir beforehand]
[needs OpenWatcom to be installed in 'comp/watcom' dir beforehand]
7) For Linux executable, type: 'hbmk2 ../tests/hello.prg -platform=linux'
[needs OpenWatcom to be installed into 'comp/watcom' dir beforehand]
[needs OpenWatcom to be installed in 'comp/watcom' dir beforehand]
Tool/lib versions used to create this package:
-----------------------------------------------------------------------
@@ -73,7 +73,7 @@ Changes since previous (2.0.0beta3 20090905) release:
- upx updated to 3.04.
- MinGW 4.4.1 updated to TDM-2 release fixing a performance problem.
- MinGW w64 updated to latest binary release.
- DJGPP build replaced with OpenWatcom MS-DOS build.
- DJGPP build in unified release replaced with OpenWatcom MS-DOS build.
- External libs updated (except OpenSSL and libcurl).
- hbwin cleanups/fixes (printer handling) and improvements (mutex, MAPI, misc)
- hbwin OLE2, ActiveX support improved and finalized.

10
harbour/package/winuni/mpkg_win_uni.nsi
View File

@@ -25,6 +25,8 @@ SetDateSave on
SetDatablockOptimize on
CRCCheck on
RequestExecutionLevel user
!define PKG_NODJGPP
!define /date NOW "%Y%m%d"
@@ -235,7 +237,7 @@ SectionEnd
!endif
!ifndef PKG_NOLINUX
Section "Libs for Open Watcom Linux" hb_lib_linux
Section /o "Libs for Open Watcom Linux" hb_lib_linux
SetOutPath $INSTDIR\lib\linux\watcom
File "$%HB_ROOT%hb20\lib\linux\watcom\*.*"
SetOutPath $INSTDIR\comp\watcom
@@ -244,7 +246,7 @@ SectionEnd
!endif
!ifndef PKG_NOOS2
Section "Libs for Open Watcom OS/2" hb_lib_os2
Section /o "Libs for Open Watcom OS/2" hb_lib_os2
SetOutPath $INSTDIR\lib\os2\watcom
File "$%HB_ROOT%hb20\lib\os2\watcom\*.*"
SetOutPath $INSTDIR\comp\watcom
@@ -253,7 +255,7 @@ SectionEnd
!endif
!ifndef PKG_NODOS
Section "Libs for Open Watcom MS-DOS" hb_lib_dos
Section /o "Libs for Open Watcom MS-DOS" hb_lib_dos
SetOutPath $INSTDIR\lib\dos\watcom
File "$%HB_ROOT%hb20\lib\dos\watcom\*.*"
SetOutPath $INSTDIR\comp\watcom
@@ -262,7 +264,7 @@ SectionEnd
!endif
!ifndef PKG_NODJGPP
Section "Libs for DJGPP MS-DOS" hb_lib_djgpp
Section /o "Libs for DJGPP MS-DOS" hb_lib_djgpp
SetOutPath $INSTDIR\lib\dos\djgpp
File "$%HB_ROOT%hb20\lib\dos\djgpp\*.*"
SetOutPath $INSTDIR\comp\djgpp