From 7294efc91d165719e698343ab7ec97b127c15d91 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 23 Aug 2009 16:15:53 +0000 Subject: [PATCH] 2009-08-23 18:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - doc/linux1st.txt * doc/Makefile * INSTALL + Moved linux1st.txt content to INSTALL. * utils/hbmk2/hbmk2.prg * config/global.mk - Deleted some HB_ARCHITECTURE compatibility lines. Now only legacy hbmake sources keep referencing it. --- harbour/ChangeLog | 11 ++++++ harbour/INSTALL | 66 ++++++++++++++++++++++++++++------- harbour/config/global.mk | 5 --- harbour/doc/Makefile | 1 - harbour/doc/linux1st.txt | 62 -------------------------------- harbour/utils/hbmk2/hbmk2.prg | 8 ++--- 6 files changed, 67 insertions(+), 86 deletions(-) delete mode 100644 harbour/doc/linux1st.txt diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 937f17dad7..7dea1963a1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-23 18:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + - doc/linux1st.txt + * doc/Makefile + * INSTALL + + Moved linux1st.txt content to INSTALL. + + * utils/hbmk2/hbmk2.prg + * config/global.mk + - Deleted some HB_ARCHITECTURE compatibility lines. + Now only legacy hbmake sources keep referencing it. + 2009-08-23 17:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * doc/linux1st.txt - Deleted Linux build instructions no more relevant. diff --git a/harbour/INSTALL b/harbour/INSTALL index 2c49d5ed3d..f2e67cd676 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -168,10 +168,9 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD You only need to use manual setup if the dependency isn't available on your platform on a system location, or you wish to use a non-standard location. Typically you need to do that on non-*nix - (Windows/MS-DOS/OS2) systems for all packages and for a few packages on - *nix which aren't available through official package managers - (ADS Client f.e.). Please see a list of official packages in - doc/linux1st.txt. + (Windows, MS-DOS, OS/2) systems for all packages and for a few packages + on *nix which aren't available through official package managers + (ADS Client f.e.). You can set these environment variables before starting the build. Make sure to adjust them to your own directories: @@ -201,17 +200,60 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD Windows/Windows CE ------------------ - Some contribs support build mode in which they can be linked *statically* - with 3rd party components: + Some contribs support build mode in which they can be linked *statically* + with 3rd party components: - HB_ALLEGRO_STATIC=yes - HB_QT_STATIC=yes + HB_ALLEGRO_STATIC=yes + HB_QT_STATIC=yes Darwin (Mac OS X) - ------------- - 1.) Install MacPorts, follow their instructions: - http://www.macports.org/ - 2.) sudo port install allegro freeimage gd2 mysql5-devel postgresql83 + ----------------- + 1.) Install MacPorts, follow their instructions: + http://www.macports.org/ + 2.) sudo port install allegro freeimage gd2 mysql5-devel postgresql83 + + Linux (all) + ---------------------- + + For contrib/rddads lib: + Download and install 'Advantage Client Engine API for Linux' package + (f.e. aceapi-9.00.0.0.tar.gz) + + For contrib/hbhpdf lib: + Download libharu from http://libharu.org/ -> './configure' -> 'make install' + + Linux (Debian, Ubuntu) + ---------------------- + (tested with Ubuntu 7.04, 8.04, 9.04) + + for gtcrs terminal lib: sudo apt-get install libncurses-dev + for gtsln terminal lib: sudo apt-get install libslang2-dev + for gtxwc terminal lib: sudo apt-get install libx11-dev + for console mouse (GPM) support: sudo apt-get install libgpmg1-dev + for contrib/hbodbc lib: sudo apt-get install unixodbc-dev + for contrib/hbcurl lib: sudo apt-get install libcurl4-openssl-dev OR + sudo apt-get install libcurl4-gnutls-dev + for contrib/hbfbird lib: sudo apt-get install libfirebird2.0-dev OR + sudo apt-get install firebird2.1-dev + for contrib/hbfimage lib: sudo apt-get install libfreeimage-dev + for contrib/hbgd lib: sudo apt-get install libgd2-xpm-dev OR + sudo apt-get install libgd-xpm-dev + for contrib/hbmysql lib: sudo apt-get install libmysqlclient15-dev + for contrib/hbpgsql lib: sudo apt-get install libpq-dev + for contrib/hbqt lib: sudo apt-get install libqt4-dev + + Linux (openSUSE) + ---------------------- + + You'll need these packages to compile certain contribs and optional Harbour features: + - xorg-x11-devel + - postgresql-devel + - gtk2-devel + - ncurses-devel + - slang-devel + - unixodbc-devel + - gd-devel + - libmysqlclient-devel SUPPORTED PLATFORMS AND C COMPILERS diff --git a/harbour/config/global.mk b/harbour/config/global.mk index be93719a03..74254bab8f 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -200,11 +200,6 @@ ifneq ($(HB_BUILD_NAME),) endif endif -# Compatibility -#ifeq ($(HB_PLATFORM),) -# HB_PLATFORM := $(HB_ARCHITECTURE) -#endif - ifeq ($(HB_INIT_DONE),) # Store the original value export HB_MAKECMDGOALS := $(MAKECMDGOALS) diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index c5ed3625e1..f316ce0407 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -21,7 +21,6 @@ DOC_FILES := \ howtorel.txt \ howtosvn.txt \ inet.txt \ - linux1st.txt \ pcode.txt \ pp.txt \ pragma.txt \ diff --git a/harbour/doc/linux1st.txt b/harbour/doc/linux1st.txt deleted file mode 100644 index 8cd23c6e20..0000000000 --- a/harbour/doc/linux1st.txt +++ /dev/null @@ -1,62 +0,0 @@ -/* - * $Id$ - */ - - Linux primer - ============ - -Ubuntu/Debian distro --------------------- - -Packages needed to cleanly build Harbour: -(Tested with Ubuntu 7.04, 8.04, 9.04) - -For GTCRS terminal lib: sudo apt-get install libncurses-dev -For GTSLN terminal lib: sudo apt-get install libslang2-dev -For GTXWC terminal lib: sudo apt-get install libx11-dev -For console mouse support: sudo apt-get install libgpmg1-dev -For contrib/hbodbc lib: sudo apt-get install unixodbc-dev -For contrib/hbcurl lib: sudo apt-get install libcurl4-openssl-dev OR - sudo apt-get install libcurl4-gnutls-dev -For contrib/hbfbird lib: sudo apt-get install libfirebird2.0-dev OR - sudo apt-get install firebird2.1-dev -For contrib/hbfimage lib: sudo apt-get install libfreeimage-dev -For contrib/hbgd lib: sudo apt-get install libgd2-xpm-dev OR - sudo apt-get install libgd-xpm-dev -For contrib/hbmysql lib: sudo apt-get install libmysqlclient15-dev -For contrib/hbpgsql lib: sudo apt-get install libpq-dev -For contrib/hbqt lib: sudo apt-get install libqt4-dev -For examples/hbgf/hbgfgtk lib: sudo apt-get install libgtk2.0-dev AND - sudo apt-get install libglib2.0-dev - -For contrib/rddads lib: -Download and install 'Advantage Client Engine API for Linux' package -(f.e. aceapi-9.00.0.0.tar.gz) - -For contrib/hbhpdf lib: -Download and './configure', 'make install' libharu -from http://libharu.org/ - -openSUSE distro ---------------- - -You'll need these packages to compile certain contribs and optional -Harbour modules: -- xorg-x11-devel -- postgresql-devel -- gtk2-devel -- ncurses-devel -- slang-devel -- unixodbc-devel -- gd-devel -- libmysqlclient-devel - -For contrib/rddads lib: -Download and install 'Advantage Client Engine API for Linux' package -(f.e. aceapi-9.00.0.0.tar.gz) - -For contrib/libharu: -- Download and './configure', 'make install' libharu - from http://libharu.org/ -- libpng-devel -- zlib-devel diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 1240a9b197..57b95c7b9d 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -783,13 +783,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) /* Load platform / compiler settings (compatibility) */ IF Empty( hbmk[ _HBMK_cPLAT ] ) - ParseCOMPPLAT( hbmk, Lower( GetEnv( "HB_PLATFORM" ) ), _TARG_PLAT ) - IF Empty( hbmk[ _HBMK_cPLAT ] ) - ParseCOMPPLAT( hbmk, Lower( GetEnv( "HB_ARCHITECTURE" ) ), _TARG_PLAT ) /* Compatibility */ - ENDIF + ParseCOMPPLAT( hbmk, GetEnv( "HB_PLATFORM" ), _TARG_PLAT ) ENDIF IF Empty( hbmk[ _HBMK_cCOMP ] ) - ParseCOMPPLAT( hbmk, Lower( GetEnv( "HB_COMPILER" ) ), _TARG_COMP ) + ParseCOMPPLAT( hbmk, GetEnv( "HB_COMPILER" ), _TARG_COMP ) ENDIF nCCompVer := Val( GetEnv( "HB_COMPILER_VER" ) ) /* Format: <09><00>[.<00>] = [.] */ @@ -5592,7 +5589,6 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, cMacroPrefix ) CASE "HB_PLAT" CASE "HB_PLATFORM" CASE "HB_ARCH" /* Compatibility */ - CASE "HB_ARCHITECTURE" /* Compatibility */ cMacro := hbmk[ _HBMK_cPLAT ] ; EXIT CASE "HB_COMP" CASE "HB_COMPILER" /* Compatibility */