From 7eb4de41a3c9652a855e6c9ca99344d7991fce6f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 17 Aug 2009 09:48:07 +0000 Subject: [PATCH] 2009-08-17 11:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbxbp/tests/demoxbp.prg ! Opening test.dbf in RO mode to avoid it being update. Couldn't spot the code which touched it. * config/global.cf - Deleted unused and commented code section. * INSTALL - Deleted HB_INSTALL_PREFIX from quickstart instructions. ! Modified hbmk2 hello.prg command to work on *nixes. (I never tried this default scenario though) * Modified non-*nix hbmk2 commands to look more natural and similar to *nix. - Deleted mingw32-make as suggested tool for dos builds done on NT hosts. It chokes with too long cmdline with mingw32-make. * bin/hb-mkdyn.sh - Deleted wininet from wce liblist. --- harbour/ChangeLog | 20 ++++++++++++++ harbour/INSTALL | 35 ++++++++++--------------- harbour/bin/hb-mkdyn.sh | 2 +- harbour/config/global.cf | 12 --------- harbour/contrib/hbxbp/tests/demoxbp.prg | 3 +-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a11f4e7cf9..c321c4a9cf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,26 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-17 11:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbxbp/tests/demoxbp.prg + ! Opening test.dbf in RO mode to avoid it being update. + Couldn't spot the code which touched it. + + * config/global.cf + - Deleted unused and commented code section. + + * INSTALL + - Deleted HB_INSTALL_PREFIX from quickstart instructions. + ! Modified hbmk2 hello.prg command to work on *nixes. + (I never tried this default scenario though) + * Modified non-*nix hbmk2 commands to look more natural + and similar to *nix. + - Deleted mingw32-make as suggested tool for dos builds done + on NT hosts. It chokes with too long cmdline with mingw32-make. + + * bin/hb-mkdyn.sh + - Deleted wininet from wce liblist. + 2009-08-17 13:26 UTC+0300 Phil Krylov * source/vm/macro.c * source/vm/hvm.c diff --git a/harbour/INSTALL b/harbour/INSTALL index a054d4ba30..da0e2fab74 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -28,24 +28,22 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE Linux/Darwin ------------ [ $ export HB_COMPILER= ] - [ $ export HB_INSTALL_PREFIX= ] $ make install To test it, type: - $ cd bin - $ ./hbmk2 ../tests/hello.prg + $ cd tests + $ hbmk2 hello.prg $ ./hello You should see 'Hello world!' on screen. BSD/HP-UX/Solaris ----------------- [ $ export HB_COMPILER= ] - [ $ export HB_INSTALL_PREFIX= ] $ gmake install To test it, type: - $ cd bin - $ ./hbmk2 ../tests/hello.prg + $ cd tests + $ hbmk2 hello.prg $ ./hello You should see 'Hello world!' on screen. @@ -70,15 +68,15 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE 3.) You need to get GNU Make. We recommend this link: http://sourceforge.net/projects/mingw/files/GNU%20Make/Current%20Release_%20mingw32-make-3.81-20080326/mingw32-make-3.81-20080326-3.tar.gz/download Unpack it to your PATH or Harbour source root directory. + If you use MinGW compiler, you already have GNU Make. For convenience you may also use included config/mingw32-make.exe instead. [ > set HB_COMPILER= ] - [ > set HB_INSTALL_PREFIX= ] > mingw32-make install To test it, type: - > cd bin - > hbmk2 ..\tests\hello.prg + > cd tests + > ..\bin\hbmk2 hello.prg > hello You should see 'Hello world!' on screen. @@ -98,12 +96,11 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE Generally it's recommended to use native shell though. [ > set HB_COMPILER=<...> ] - [ > set HB_INSTALL_PREFIX= ] > sh -c make install To test it, type: - > cd bin - > hbmk2 ..\tests\hello.prg + > cd tests + > ..\bin\hbmk2 hello.prg > hello You should see 'Hello world!' on screen. @@ -119,20 +116,17 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE 1.) Make sure to have your C compiler of choice properly installed (in PATH). - 2.) You need to get GNU Make. If you use MS-DOS host, we recommend this link: + 2.) You need to get GNU Make. We recommend this link: ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/mak381b.zip - If you use Windows NT host, use this one: - http://sourceforge.net/projects/mingw/files/GNU%20Make/Current%20Release_%20mingw32-make-3.81-20080326/mingw32-make-3.81-20080326-3.tar.gz/download Unpack it to your PATH or Harbour source root directory. For convenience you may also use included config/dj-make.exe instead. [ > set HB_COMPILER= ] - [ > set HB_INSTALL_PREFIX= ] > make install To test it, type: - > cd bin - > hbmk2 ..\tests\hello.prg + > cd tests + > ..\bin\hbmk2 hello.prg > hello You should see 'Hello world!' on screen. @@ -149,12 +143,11 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE in this section. [ > set HB_COMPILER= ] - [ > set HB_INSTALL_PREFIX= ] > make install To test it, type: - > cd bin - > hbmk2 ..\tests\hello.prg + > cd tests + > ..\bin\hbmk2 hello.prg > hello You should see 'Hello world!' on screen. diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh index 6e607ac62a..82f72c8f3e 100755 --- a/harbour/bin/hb-mkdyn.sh +++ b/harbour/bin/hb-mkdyn.sh @@ -134,7 +134,7 @@ if [ "${SLIB_EXT}" = ".dylib" ]; then elif [ "${SLIB_EXT}" = ".dll" ]; then FULLNAME="${LIB_NAME}${SLIB_EXT}" if [ "$HB_COMPILER" = "mingwarm" ]; then - SYSLIBS=" -lwininet -lws2" + SYSLIBS="-lws2" else SYSLIBS="-luser32 -lws2_32 -ladvapi32 -lgdi32" fi diff --git a/harbour/config/global.cf b/harbour/config/global.cf index 21efc25210..9065ca289b 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -866,18 +866,6 @@ else endif HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(HB_INSTALL_PREFIX)) - - # Use names which are not likely to be used by users to - # avoiding accidental overwrites of existing installations -# ifeq ($(HB_ARCHITECTURE),dos) -# HB_INSTALL_PREFIX := C:\hbauto -# else -# ifeq ($(HB_UNIX_COMPATIBLE),no) -# HB_INSTALL_PREFIX := C:$(DIRSEP)hb-auto-$(HB_ARCHITECTURE)-$(HB_COMPILER) -# else -# HB_INSTALL_PREFIX := $(HOME)$(DIRSEP)hb-auto-$(HB_ARCHITECTURE)-$(HB_COMPILER) -# endif -# endif else # TOFIX: HB_INSTALL_PREFIX will have to be duplicated internally to avoid # recursive operation here. diff --git a/harbour/contrib/hbxbp/tests/demoxbp.prg b/harbour/contrib/hbxbp/tests/demoxbp.prg index b1e8ea6679..bf3c5b3b21 100644 --- a/harbour/contrib/hbxbp/tests/demoxbp.prg +++ b/harbour/contrib/hbxbp/tests/demoxbp.prg @@ -1580,7 +1580,7 @@ FUNCTION Build_Browse( oWnd ) Set( _SET_DATEFORMAT, "yyyy.mm.dd" ) /* ANSI */ - USE ( cPath + "test.dbf" ) NEW SHARED VIA 'DBFCDX' + USE ( cPath + "test.dbf" ) NEW SHARED READONLY VIA 'DBFCDX' #if 1 INDEX ON test->last TAG "LAST" TO ( cPath + "test.cdx" ) #endif @@ -1871,4 +1871,3 @@ STATIC FUNCTION TBPrev() RETURN lMoved /*----------------------------------------------------------------------*/ -