diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 87ba6ad5be..bf4f61a975 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-24 02:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_gcc.sh + * make_gnu_os2.cmd + * make_gnu.bat + * make_gnu.sh + * make_tgz.sh + % Some additional GT defaulting logic removed. + 2008-09-24 01:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbwhat/tests/whatdemo.prg ! SVN ID. diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index 3bd992edd8..0f479de2f7 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -33,16 +33,6 @@ if [ -z "$HB_CC_NAME" ]; then export HB_CC_NAME 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="gttrm" ;; - esac - export HB_GT_LIB -fi - if [ -z "$HB_GPM_MOUSE" ]; then if [ "$HB_ARCHITECTURE" = "linux" ] && \ ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 8b09a08919..3d54f618f0 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -24,7 +24,6 @@ rem --------------------------------------------------------------- if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=w32 if "%HB_COMPILER%" == "" set HB_COMPILER=mingw -if "%HB_GT_LIB%" == "" set HB_GT_LIB= rem set PRG_USR= rem set C_USR= @@ -59,10 +58,10 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HARBOURDIR%/include 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 - dos + echo - w32 + echo - linux + echo - os2 echo. pause echo HB_COMPILER: @@ -84,17 +83,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HARBOURDIR%/include echo - gcc (EMX GNU C, OS/2 32-bit) echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) echo. - pause - 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. echo - Use these optional envvars to configure the make process echo when using the 'all' command: echo. diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index d8c4c1c7ba..ec2d2aa6dc 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -39,16 +39,6 @@ if [ -z "$HB_COMPILER" ]; then export HB_COMPILER 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="gttrm" ;; - esac - export HB_GT_LIB -fi - if [ -z "$HB_GPM_MOUSE" ]; then if [ "$HB_ARCHITECTURE" = "linux" ] && \ ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then @@ -145,14 +135,14 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then 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 " - os2 (HB_GT_LIB=gtos2 by default)" - echo " - linux (HB_GT_LIB=gttrm by default)" - echo " - bsd (HB_GT_LIB=gttrm by default)" - echo " - darwin (HB_GT_LIB=gttrm by default)" - echo " - sunos (HB_GT_LIB=gttrm by default)" - echo " - hpux (HB_GT_LIB=gttrm by default)" + echo " - dos" + echo " - w32" + echo " - os2" + echo " - linux" + echo " - bsd" + echo " - darwin" + echo " - sunos" + echo " - hpux" echo read echo " HB_COMPILER:" @@ -174,21 +164,6 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then 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 (TTY streaming) (for all architectures)" - echo " - gtcgi (Standard streaming) (for all architectures)" - echo " - gtpca (PC ANSI console) (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 " - gtcrs (Curses console) (for *nixes, w32 architectures)" - echo " - gtsln (Slang console) (for *nixes, w32 architectures)" - echo " - gttrm (Terminal console) (for *nixes architecture)" - echo " - gtxwc (XWindow console) (for *nixes architecture)" - echo " - gtalleg (Allegro console) (for all architectures)" - echo echo " - Use these optional envvars to configure the make process" echo " when using the 'all' target:" echo diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd index 62ab10ed8a..d31f48c8db 100644 --- a/harbour/make_gnu_os2.cmd +++ b/harbour/make_gnu_os2.cmd @@ -8,6 +8,5 @@ rem for further information about see make_gnu.bat if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=os2 if "%HB_COMPILER%" == "" set HB_COMPILER=gcc -if "%HB_GT_LIB%" == "" set HB_GT_LIB= make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log diff --git a/harbour/make_tgz.sh b/harbour/make_tgz.sh index 715f51aa32..c19312f072 100755 --- a/harbour/make_tgz.sh +++ b/harbour/make_tgz.sh @@ -60,16 +60,6 @@ if [ -z "$HB_COMPILER" ]; then export HB_COMPILER 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="gttrm" ;; - esac - export HB_GT_LIB -fi - if [ -z "$HB_COMMERCE" ]; then export HB_COMMERCE=no; fi # default lib dir name