diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d168bb9b48..01472ec51c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-07-31 23:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/make_gcc.sh + * cleanup + - harbour/make_drw.sh + - harbour/make_bsd.sh + - removed not longer necessary files - make_gnu.sh can be used + instead with exactly the same effect + 2007-07-31 22:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/make_deb.sh * cleanup diff --git a/harbour/make_bsd.sh b/harbour/make_bsd.sh deleted file mode 100755 index af3b3d4bba..0000000000 --- a/harbour/make_bsd.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/local/bin/bash -# -# $Id$ -# - -# --------------------------------------------------------------- -# Template to initialize the environment before starting -# the GNU make system for Harbour -# -# For further information about the GNU make system please -# check doc/gmake.txt -# -# Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -# See doc/license.txt for licensing terms. -# --------------------------------------------------------------- - -if [ -z "$HB_ARCHITECTURE" ]; then export HB_ARCHITECTURE=bsd; fi -if [ -z "$HB_COMPILER" ]; then export HB_COMPILER=gcc; fi -if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtstd; fi -if [ -z "$HB_MT" ]; then export HB_MT=MT; fi - -# export PRG_USR= -# export C_USR= -# export L_USR= - -# Set to constant value to be consistent with the non-GNU make files. - -export PREFIX=/usr/local - -if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=$PREFIX/bin/; fi -if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$PREFIX/lib/harbour/; fi -if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$PREFIX/include/harbour/; fi - -if [ -z "$HB_ARCHITECTURE" ]; then - echo "Error: HB_ARCHITECTURE is not set." -fi -if [ -z "$HB_COMPILER" ]; then - echo "Error: HB_COMPILER is not set." -fi - -if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then - - echo - echo "Usage: make_gnu.sh [command]" - echo - echo "The following commands are supported:" - echo " - all (default)" - echo " - clean" - echo " - install" - echo - echo "Notes:" - echo - echo " - HB_ARCHITECTURE and HB_COMPILER envvars must be set." - echo " The following values are currently supported:" - echo - echo " HB_ARCHITECTURE:" - echo " - dos (HB_GT_LIB=gtdos by default)" - echo " - w32 (HB_GT_LIB=gtw32 by default)" - echo " - linux (HB_GT_LIB=gtstd by default)" - echo " - os2 (HB_GT_LIB=gtos2 by default)" - echo - read - echo " HB_COMPILER:" - echo " - When HB_ARCHITECTURE=dos" - echo " - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit)" - echo " - djgpp (Delorie GNU C, DOS 32-bit)" - echo " - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit)" - echo " - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit)" - echo " - When HB_ARCHITECTURE=w32" - echo " - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit)" - echo " - gcc (Cygnus/Cygwin GNU C, Windows 32-bit)" - echo " - mingw32 (Cygnus/Mingw32 GNU C, Windows 32-bit)" - echo " - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit)" - echo " - icc (IBM Visual Age C++, Windows 32-bit)" - echo " - msvc (Microsoft Visual C++, Windows 32-bit)" - echo " - When HB_ARCHITECTURE=linux" - echo " - gcc (GNU C, 32-bit)" - echo " - When HB_ARCHITECTURE=os2" - echo " - gcc (EMX GNU C, OS/2 32-bit)" - echo " - icc (IBM Visual Age C++ 3.0, OS/2 32-bit)" - echo - read - echo " HB_GT_LIB:" - echo " - gtstd (Standard streaming) (for all architectures)" - echo " - gtdos (DOS console) (for dos architecture)" - echo " - gtwin (Win32 console) (for w32 architecture)" - echo " - gtwvt (Win32 win console) (for w32 architecture)" - echo " - gtos2 (OS/2 console) (for os2 architecture)" - echo " - gtpca (PC ANSI console) (for all architectures)" - echo " - gtcrs (Curses console) (for linux, w32 architectures)" - echo " - gtsln (Slang console) (for linux, w32 architectures)" - echo " - gtxvt (XWindow console) (for linux architecture)" - echo - echo " - Use these optional envvars to configure the make process" - echo " when using the 'all' command:" - echo - echo " PRG_USR - Extra Harbour compiler options" - echo " C_USR - Extra C compiler options" - echo " L_USR - Extra linker options" - exit - -else - - # --------------------------------------------------------------- - # Start the GNU make system - gmake $* - - if [ "$*" = "clean" ]; then - find . -type d -name "$HB_ARCHITECTURE" | xargs rmdir 2> /dev/null - fi -fi diff --git a/harbour/make_drw.sh b/harbour/make_drw.sh deleted file mode 100755 index 6b6baabcf3..0000000000 --- a/harbour/make_drw.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# $Id$ -# - -# --------------------------------------------------------------- -# Template to initialize the environment before starting -# the GNU make system for Harbour -# -# For further information about the GNU make system please -# check doc/gmake.txt -# -# Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -# See doc/license.txt for licensing terms. -# --------------------------------------------------------------- - -export HB_ARCHITECTURE=darwin -export HB_COMPILER=gcc -export HB_GPM_MOUSE=no -export PREFIX=/usr/local - -if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtstd; fi - -# Set to constant value to be consistent with the non-GNU make files. - -if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=$PREFIX/bin/; fi -if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$PREFIX/lib/harbour/; fi -if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$PREFIX/include/harbour/; fi - -. `dirname $0`/make_gnu.sh $* diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index efe75d1323..7d81f57cfb 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -17,10 +17,20 @@ if [ -z "$HB_ARCHITECTURE" ]; then export HB_ARCHITECTURE="$hb_arch" fi +if [ -z "$CC_DIRNAME" ]; then + case "$HB_ARCHITECTURE" in + w32) CC_DIRNAME="mingw" ;; + dos) CC_DIRNAME="djgpp" ;; + *) CC_DIRNAME="gcc" ;; + esac + export CC_DIRNAME +fi + if [ -z "$HB_GT_LIB" ]; then case "$HB_ARCHITECTURE" in w32) HB_GT_LIB="gtwin" ;; dos) HB_GT_LIB="gtdos" ;; + os2) HB_GT_LIB="gtos2" ;; *) HB_GT_LIB="gtstd" ;; esac export HB_GT_LIB @@ -36,15 +46,6 @@ if [ -z "$HB_GPM_MOUSE" ]; then export HB_GPM_MOUSE fi -if [ -z "$CC_DIRNAME" ]; then - case "$HB_ARCHITECTURE" in - w32) CC_DIRNAME="mingw" ;; - dos) CC_DIRNAME="djgpp" ;; - *) CC_DIRNAME="gcc" ;; - esac - export CC_DIRNAME -fi - # default lib dir name HB_LIBDIRNAME="lib" @@ -135,10 +136,12 @@ do fi done +[ "${HB_WITHOUT_GTSLN}" != "yes" ] || GTSLN="" if [ "$HB_COMMERCE" = yes ]; then export HB_GPM_MOUSE=no GTSLN="" fi + if [ "$GTCRS" = "yes" ]; then GT_LIST="$GT_LIST CRS" OS_LIBS="$OS_LIBS -l${CRSLIB}" diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index 9f61be7433..30bf3e2e6f 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -15,8 +15,6 @@ # See doc/license.txt for licensing terms. # --------------------------------------------------------------- -name="harbour" - if [ -z "$HB_ARCHITECTURE" ]; then if [ "$OSTYPE" = "msdosdjgpp" ]; then hb_arch="dos" @@ -111,7 +109,7 @@ fi case "$HB_INSTALL_PREFIX" in /usr|/usr/local|/opt) - hb_instsubdir="/$name" + hb_instsubdir="/harbour" ;; *) hb_instsubdir="" @@ -123,7 +121,6 @@ if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$HB_INSTALL_PREFIX/lib$h if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$HB_INSTALL_PREFIX/include$hb_instsubdir; fi - if [ -z "$HB_ARCHITECTURE" ]; then echo "Error: HB_ARCHITECTURE is not set." fi @@ -201,8 +198,7 @@ else # --------------------------------------------------------------- # Start the GNU make system - if [ "$HB_ARCHITECTURE" = "bsd" ] || [ "$HB_ARCHITECTURE" = "hpux" ] || \ - uname|grep "BSD$" &> /dev/null + if [ "$HB_ARCHITECTURE" = "bsd" ] || [ "$HB_ARCHITECTURE" = "hpux" ] then gmake $* else