From 059939de5fa8309934f16269548e284879b3e866 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 11 Jun 2009 06:25:39 +0000 Subject: [PATCH] 2009-06-11 08:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * Stripped "\devl" from all examples dirs. + Adjusted all examples dir to use default installation paths where possible. + Adjusted examples dir to not include a version number. + Added OS/2 Watcom example (untested) ; These makes example much more readily usable and avoid some more potential confusion. * mpkg_win.bat ! Handling spaces in HB_DIR_NSIS. * make_gnu.bat + Added beeps if errors were detected. (step towards error handling) * source/common/hbver.c * Changed OS version for DOS to show "(Windows NT) under NT systems (instead of former "(Windows NT/2000)"). --- harbour/ChangeLog | 21 ++++++++++ harbour/INSTALL | 79 +++++++++++++++++++++-------------- harbour/make_gnu.bat | 8 ++-- harbour/mpkg_win.bat | 2 +- harbour/source/common/hbver.c | 4 +- 5 files changed, 76 insertions(+), 38 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4e8624e29b..a388af6c8b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,27 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-11 08:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * Stripped "\devl" from all examples dirs. + + Adjusted all examples dir to use default installation + paths where possible. + + Adjusted examples dir to not include a version number. + + Added OS/2 Watcom example (untested) + ; These makes example much more readily usable and + avoid some more potential confusion. + + * mpkg_win.bat + ! Handling spaces in HB_DIR_NSIS. + + * make_gnu.bat + + Added beeps if errors were detected. + (step towards error handling) + + * source/common/hbver.c + * Changed OS version for DOS to show "(Windows NT) + under NT systems (instead of former "(Windows NT/2000)"). + 2009-06-10 23:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) ; TOFIX: dos/owatcom builds can now created successfully diff --git a/harbour/INSTALL b/harbour/INSTALL index f5846bcbac..e7036899c7 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -351,7 +351,7 @@ EXAMPLES --- --- MinGW GCC (make sure msys (sh.exe) isn't in the PATH) - set PATH=C:\devl\MinGW-440\bin;%PATH% + set PATH=C:\mingw\bin;%PATH% rem set HB_COMPILER=mingw set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% @@ -359,8 +359,8 @@ EXAMPLES --- --- MinGW GCC + msys - set PATH=C:\devl\msys\1.0.11\bin;%PATH% - set PATH=C:\devl\MinGW-440\bin;%PATH% + set PATH=C:\msys\1.0.11\bin;%PATH% + set PATH=C:\mingw\bin;%PATH% rem set HB_COMPILER=mingw set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% @@ -368,7 +368,7 @@ EXAMPLES --- --- MinGW GCC for x86-64 (requires native x86 Harbour binaries) - set PATH=C:\devl\MinGW-440-64\bin;%PATH% + set PATH=C:\mingw64\bin;%PATH% rem set HB_BIN_COMPILE=C:\hb-mingw\bin set HB_PPGEN_PATH=%HB_BIN_COMPILE% @@ -379,7 +379,7 @@ EXAMPLES --- --- MinGW GCC for WinCE/ARM (requires native x86 Harbour binaries) - set PATH=C:\devl\MinGW-410-ce\opt\mingw32ce\bin;%PATH% + set PATH=C:\mingwce\opt\mingw32ce\bin;%PATH% rem set HB_BIN_COMPILE=C:\hb-mingw\bin set HB_PPGEN_PATH=%HB_BIN_COMPILE% @@ -391,7 +391,7 @@ EXAMPLES --- --- Open Watcom C++ - SET WATCOM=C:\devl\owatcom-1.8 + SET WATCOM=C:\watcom SET PATH=%WATCOM%\BINNT;%WATCOM%\BINW;%PATH% SET EDPATH=%WATCOM%\EDDAT SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT @@ -410,7 +410,7 @@ EXAMPLES --- --- Borland/CodeGear C++ - set PATH=C:\devl\bcc55\bin;%PATH% + set PATH=C:\Borland\BCC55\bin;%PATH% rem set HB_COMPILER=bcc set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% @@ -418,9 +418,9 @@ EXAMPLES --- --- Pelles C - set PATH=C:\devl\PellesC-501\bin;%PATH% - set INCLUDE=C:\devl\PellesC-501\include;C:\devl\PellesC-501\include\win;%INCLUDE% - set LIB=C:\devl\PellesC-501\lib;C:\devl\PellesC-501\lib\win;%LIB% + set PATH=%ProgramFiles%\PellesC\bin;%PATH% + set INCLUDE=%ProgramFiles%\PellesC\include;%ProgramFiles%\PellesC\include\win;%INCLUDE% + set LIB=%ProgramFiles%\PellesC\lib;%ProgramFiles%\PellesC\lib\win;%LIB% rem set HB_COMPILER=pocc set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% @@ -428,9 +428,9 @@ EXAMPLES --- --- Pelles C x86-64 (requires native x86 Harbour binaries) - set PATH=C:\devl\PellesC-501-64\bin;%PATH% - set INCLUDE=C:\devl\PellesC-501-64\include;C:\devl\PellesC-501-64\include\win;%INCLUDE% - set LIB=C:\devl\PellesC-501-64\lib;C:\devl\PellesC-501-64\lib\win64;%LIB% + set PATH=%ProgramFiles%\PellesC-64\bin;%PATH% + set INCLUDE=%ProgramFiles%\PellesC-64\include;%ProgramFiles%\PellesC-64\include\win;%INCLUDE% + set LIB=%ProgramFiles%\PellesC-64\lib;%ProgramFiles%\PellesC-64\lib\win64;%LIB% rem set HB_BIN_COMPILE=C:\hb-pocc\bin set HB_PPGEN_PATH=%HB_BIN_COMPILE% @@ -441,9 +441,9 @@ EXAMPLES --- --- Pelles C WinCE/ARM (requires native x86 Harbour binaries) - set PATH=C:\devl\PellesC-501\bin;%PATH% - set INCLUDE=C:\devl\PellesC-501\include\wince;C:\devl\PellesC-501\include;%INCLUDE% - set LIB=C:\devl\PellesC-501\lib;C:\devl\PellesC-501\lib\wince;%INCLUDE% + set PATH=%ProgramFiles%\PellesC\bin;%PATH% + set INCLUDE=%ProgramFiles%\PellesC\include\wince;%ProgramFiles%\PellesC\include;%INCLUDE% + set LIB=%ProgramFiles%\PellesC\lib;%ProgramFiles%\PellesC\lib\wince;%INCLUDE% rem set HB_BIN_COMPILE=C:\hb-pocc\bin set HB_PPGEN_PATH=%HB_BIN_COMPILE% @@ -455,9 +455,9 @@ EXAMPLES --- --- Cygwin GCC - set PATH=C:\devl\cygwin\bin;%PATH% - set C_INCLUDE_PATH=/cygdrive/c/devl/cygwin/usr/include:/cygdrive/c/devl/cygwin/usr/include/w32api - set LIBRARY_PATH=/cygdrive/c/devl/cygwin/usr/lib:/cygdrive/c/devl/cygwin/usr/lib/w32api + set PATH=C:\cygwin\bin;%PATH% + set C_INCLUDE_PATH=/cygdrive/c/cygwin/usr/include:/cygdrive/c/cygwin/usr/include/w32api + set LIBRARY_PATH=/cygdrive/c/cygwin/usr/lib:/cygdrive/c/cygwin/usr/lib/w32api rem set HB_COMPILER=cygwin set HB_INSTALL_PREFIX=/cygdrive/c/hb-%HB_COMPILER% @@ -505,7 +505,7 @@ EXAMPLES --8<-- rem ; To create installation packages (.exe + .zip), rem replace last line (calling make_gnu.bat) with these two: - set HB_DIR_NSIS=C:\devl\NSIS-2.44\ + set HB_DIR_NSIS=%ProgramFiles%\NSIS\ call mpkg_win.bat > log-%HB_COMPILER%.txt 2>&1 -->8-- @@ -513,8 +513,8 @@ EXAMPLES --- --- Delorie GNU C - set DJGPP=C:\devl\djgpp\djgpp.env - set PATH=C:\devl\djgpp\bin;%PATH% + set DJGPP=C:\djgpp\djgpp.env + set PATH=C:\djgpp\bin;%PATH% rem set HB_ARCHITECTURE=dos set HB_COMPILER=djgpp @@ -523,25 +523,25 @@ EXAMPLES --- --- Open Watcom C++ - SET WATCOM=C:\devl\owatcom-1.8 - SET PATH=%WATCOM%\BINNT;%WATCOM%\BINW;%PATH% + SET WATCOM=C:\watcom + SET PATH=%WATCOM%\BINW;%PATH% SET EDPATH=%WATCOM%\EDDAT - SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT + SET INCLUDE=%WATCOM%\H rem set HB_ARCHITECTURE=dos set HB_COMPILER=owatcom set HB_INSTALL_PREFIX=C:\hb-ow - call make_gnu.bat %1 %2 > log-%HB_COMPILER%.txt 2>&1 + call make_gnu.bat %1 %2 > log-ow.txt 2>&1 --- --8<-- rem ; Add these *before* above sample scripts to configure 3rd party dependencies. rem You have to use 8.3 path notation. - set HB_INC_ALLEGRO=C:\devl\ALLEGR~1.2\include - set HB_INC_FIREBIRD=C:\devl\FIREBI~1.4\include - set HB_INC_GD=C:\devl\GD-20~1.34\include - set HB_INC_MYSQL=C:\devl\MYSQL-~1.67\include - set HB_INC_PGSQL=C:\devl\PGSQL-~1.3\include + set HB_INC_ALLEGRO=C:\ALLEGR~1.2\include + set HB_INC_FIREBIRD=C:\FIREBI~1.4\include + set HB_INC_GD=C:\GD-20~1.34\include + set HB_INC_MYSQL=C:\MYSQL-~1.67\include + set HB_INC_PGSQL=C:\PGSQL-~1.3\include -->8-- --8<-- @@ -550,6 +550,23 @@ EXAMPLES call mpkg_dos.bat > log-%HB_COMPILER%.txt 2>&1 -->8-- + OS/2 + ---- + + --- Open Watcom C++ + SET WATCOM=C:\watcom + SET PATH=%WATCOM%\BINP;%WATCOM%\BINW;%PATH% + SET BEGINLIBPATH=%WATCOM%\BINP\DLL + SET EDPATH=%WATCOM%\EDDAT + SET INCLUDE=%WATCOM%\H;%WATCOM%\H\OS2 + SET HELP=%WATCOM%\BINP\HELP;%HELP% + SET BOOKSHELF=%WATCOM%\BINP\HELP;%BOOKSHELF% + rem + set HB_COMPILER=owatcom + set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% + call make_gnu_os2.cmd %1 %2 > log-%HB_COMPILER%.txt 2>&1 + --- + HOW TO GET THE HARBOUR SOURCES ============================== diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index ca6ac46d1e..502d3b53f9 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -162,7 +162,7 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp set HB_EXTERNALLIBS=no set HB_EXTERNAL_ADDONS= %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 - if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% set HB_DYNLIB=no set HB_CONTRIBLIBS=%_HB_CONTRIBLIBS% set HB_CONTRIB_ADDONS=%_HB_CONTRIB_ADDONS% @@ -173,20 +173,20 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp set _HB_EXTERNALLIBS= set _HB_EXTERNAL_ADDONS= %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 - if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% goto MAKE_DONE :DO_GCC set HB_DYNLIB=no %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 - if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% goto MAKE_DONE :SKIP_WINDLL %_HB_MAKE% %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 - if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% goto MAKE_DONE :MAKE_DONE diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat index d61a9b08eb..fce7d112fc 100644 --- a/harbour/mpkg_win.bat +++ b/harbour/mpkg_win.bat @@ -74,7 +74,7 @@ zip -9 -X -r -o %~dp0%HB_PKGNAME%.zip . -i %HB_DIRNAME%\* popd rem ; Build installer package -%HB_DIR_NSIS%makensis.exe %~dp0mpkg_win.nsi +"%HB_DIR_NSIS%makensis.exe" %~dp0mpkg_win.nsi :MK_ERROR diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index 99b5870839..310891679e 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -199,14 +199,14 @@ char * hb_verPlatform( void ) } } - /* Host OS detection: Windows NT/2000 */ + /* Host OS detection: Windows NT family */ { regs.HB_XREGS.ax = 0x3306; HB_DOS_INT86( 0x21, ®s, ®s ); if( regs.HB_XREGS.bx == 0x3205 ) - hb_strncat( pszPlatform, " (Windows NT/2000)", PLATFORM_BUF_SIZE ); + hb_strncat( pszPlatform, " (Windows NT)", PLATFORM_BUF_SIZE ); } /* Host OS detection: OS/2 */