From 8a8721e529dd0b0fd9de01c05f7e3b87f62d17af Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 24 Oct 2007 01:16:44 +0000 Subject: [PATCH] 2007-10-24 03:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - make_gnu.cmd - Remove obsolete file. This was the same as make_gnu.bat but with defaults set for OS/2. OS/2 users should use make_gnu.bat with proper platform/compiler sets. * bin/bld.bat * make_gnu.bat * Changed default compiler/platform to w32/mingw32 (was dos/djgpp) --- harbour/ChangeLog | 11 ++++ harbour/bin/bld.bat | 4 +- harbour/make_gnu.bat | 4 +- harbour/make_gnu.cmd | 120 ------------------------------------------- 4 files changed, 15 insertions(+), 124 deletions(-) delete mode 100644 harbour/make_gnu.cmd diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bbf72ae0b9..e78ac7a85d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-10-24 03:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + - make_gnu.cmd + - Remove obsolete file. This was the same as make_gnu.bat + but with defaults set for OS/2. OS/2 users should use + make_gnu.bat with proper platform/compiler sets. + + * bin/bld.bat + * make_gnu.bat + * Changed default compiler/platform to w32/mingw32 + (was dos/djgpp) + 2007-10-24 01:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/libnf/fttext.c % Optimized _writeeol() diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 10f2e73a28..aef9d0a04a 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -20,8 +20,8 @@ rem Copyright 1999-2004 Viktor Szakats (viktor.szakats@syenar.hu) rem See doc/license.txt for licensing terms. rem --------------------------------------------------------------- -rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos -rem if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp +rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=w32 +rem if "%HB_COMPILER%" == "" set HB_COMPILER=mingw32 rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin\ diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 8d80385f6b..e80bbe7e85 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -22,8 +22,8 @@ rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) rem See doc/license.txt for licensing terms. rem --------------------------------------------------------------- -if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos -if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp +if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=w32 +if "%HB_COMPILER%" == "" set HB_COMPILER=mingw32 if "%HB_GT_LIB%" == "" set HB_GT_LIB= rem set PRG_USR= diff --git a/harbour/make_gnu.cmd b/harbour/make_gnu.cmd deleted file mode 100644 index a2e85f2928..0000000000 --- a/harbour/make_gnu.cmd +++ /dev/null @@ -1,120 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem Template to initialize the environment before starting -rem the GNU make system for Harbour -rem -rem For further information about the GNU make system please -rem check doc/gmake.txt -rem -rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -rem See doc/license.txt for licensing terms. -rem --------------------------------------------------------------- - -if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=os2 -if "%HB_COMPILER%" == "" set HB_COMPILER=gcc -if "%HB_GT_LIB%" == "" set HB_GT_LIB= - -rem set PRG_USR= -rem set C_USR= -rem set L_USR= - -rem Uncomment for GCC 3.2.2 on OS/2 v4.0 with mixed 16/32 bit tcp/ip stack -rem set C_USR=-DTCPV40HDRS %C_USR% - -rem Set to constant value to be consistent with the non-GNU make files. - -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=bin\ -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=lib\ -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=include\ - -:START - - if "%HB_ARCHITECTURE%" == "" goto BAD_ARCH - if "%HB_COMPILER%" == "" goto BAD_COMP - - goto MAKE - -:HELP - - echo. - echo Usage: make_gnu [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. - pause - 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. - 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. - echo PRG_USR - Extra Harbour compiler options - echo C_USR - Extra C compiler options - echo L_USR - Extra linker options - goto END - -:BAD_ARCH - - echo Error: HB_ARCHITECTURE is not set. - goto HELP - -:BAD_COMP - - echo Error: HB_COMPILER is not set. - goto HELP - -:MAKE - - rem --------------------------------------------------------------- - rem Start the GNU make system - - make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log - goto END - -:END -