diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 12b2a564ad..ed32dc809f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,32 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-01 18:16 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + * make_b32.bat + * doc/gmake.txt + * bin/postinst.bat + * bin/hb-mkdyn.bat + * make_gnu.bat + * contrib/hbfimage/readme.txt + * contrib/examples/uhttpd/modules/bldhrb.bat + * source/vm/Makefile + * source/rtl/console.c + * source/compiler/gencobj.c + * utils/hbmk2/hbmk2.prg + * utils/hbmk2/examples/winapi.hbp + - config/win/bcc32.cf + + config/win/bcc.cf + * Long time TODO done: Renamed bcc32 compiler name to bcc. + bcc32 is still accepted by make_gnu.bat, but will be + removed in the future, so it's recommended to update + your local settings to use: + set HB_COMPILER=bcc + + - config/dos/bcc16.cf + - Deleted bcc16 compiler support. I didn't work since ages, + and Harbour doesn't support 16-bit compilers anyway. + 2009-03-01 17:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * config/win/bcc32.cf ! Fix to prev. diff --git a/harbour/INSTALL b/harbour/INSTALL index 4cd0068c3b..6a6a67a4aa 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -69,7 +69,7 @@ HOW TO BUILD AND INSTALL HARBOUR - Rename mingw32-make.exe to make.exe and put it in your PATH _before_ your compiler tools. - > set HB_COMPILER= + > set HB_COMPILER= > set HB_INSTALL_PREFIX= > make_gnu.bat install @@ -149,7 +149,7 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS mingw - MinGW GNU C msvc - Microsoft Visual C++ owatcom - Open Watcom C++ - bcc32 - Borland/CodeGear C++ 4.x and above + bcc - Borland/CodeGear C++ 4.x and above gcc - Cygwin GNU C rxsnt - EMX/RSXNT/Windows GNU C icc - IBM Visual Age C++ diff --git a/harbour/bin/hb-mkdyn.bat b/harbour/bin/hb-mkdyn.bat index d93d453311..486cbce35f 100644 --- a/harbour/bin/hb-mkdyn.bat +++ b/harbour/bin/hb-mkdyn.bat @@ -25,7 +25,7 @@ set HB_DLL_LIBS_MT=hbvmmt if "%HB_COMPILER%" == "msvc" goto DO_MSVC if "%HB_COMPILER%" == "msvc64" goto DO_MSVC if "%HB_COMPILER%" == "msvcia64" goto DO_MSVC -if "%HB_COMPILER%" == "bcc32" goto DO_BCC32 +if "%HB_COMPILER%" == "bcc" goto DO_BCC if "%HB_COMPILER%" == "owatcom" goto DO_OWATCOM echo HB_COMPILER %HB_COMPILER% isn't supported. @@ -125,7 +125,7 @@ rmdir _dll goto END -:DO_BCC32 +:DO_BCC echo Making .dlls for %HB_COMPILER%... diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 819147deab..a1dd36957d 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -42,7 +42,7 @@ if "%HB_DIR_IMPLIB%" == "yes" ( if not "%HB_LIB_INSTALL%" == "" ( - if "%HB_COMPILER%" == "bcc32" ( + if "%HB_COMPILER%" == "bcc" ( if exist "%HB_DIR_ADS%\Redistribute\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\Redistribute\ace32.dll" if exist "%HB_DIR_ADS%\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\ace32.dll" diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf deleted file mode 100644 index 1bb1ac91e1..0000000000 --- a/harbour/config/dos/bcc16.cf +++ /dev/null @@ -1,92 +0,0 @@ -# -# $Id$ -# -# The Harbour Project -# GNU MAKE file for Borland C/C++ 3.x, 4.x, 5.0x - -include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf - -OBJ_EXT = .obj -EXE_EXT = .exe -LIB_PREF = -LIB_EXT = .lib - -$(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP = $(subst /,\\,$(GRANDP)) -_HB_INC_COMPILE = $(subst /,\\,$(HB_INC_COMPILE)) -_HL = $(notdir $(HB_LIB_COMPILE)) -ifeq ($(_HL),) -#there is an ending slash -_HB_LIB_COMPILE = $(subst /,\\,$(HB_LIB_COMPILE)) -else -_HB_LIB_COMPILE = $(subst /,\\,$(HB_LIB_COMPILE)/) -endif - -CC = bcc -CC_IN = -c -CC_OUT = -o -CPPFLAGS = -I$($(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP) -I$(_HB_INC_COMPILE) -CFLAGS = -i48 -O2 -mh -d -DHB_LONG_LONG_OFF - -# BCC (at least version 3.1) requires that the output file be listed ahead of the input file -CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(> __link__.tmp - -endef - - -define link_exe_file -echo. $(LDFLAGS) -e$@ > __link__.tmp -$(foreach file, $(^F), $(link_file)) -$(foreach file, $(LINKLIBS), $(link_file)) --$(LD) @__link__.tmp -endef - -LD = bcc -LDFLAGS = -i48 -O2 -mh $(HB_USER_LDFLAGS) -ifeq ($(HB_LIB_COMPILE),) -LINKLIBS += $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) -LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) -ifeq ($(findstring rdd,$(LIBS)),rdd) -LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(LIB_DIR)$(lib)$(LIB_EXT)) -endif -else -LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT)) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) -ifeq ($(findstring rdd,$(LIBS)),rdd) -LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(lib)$(LIB_EXT)) -endif -endif -LD_RULE = $(link_exe_file) - -# Add the specified GT driver library -ifeq ($(findstring rtl,$(LIBS)),rtl) -ifeq ($(HB_LIB_COMPILE),) -LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)$(LIB_EXT)) -else -LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) -endif -endif - -#Note: The empty line below HAVE TO exist! -define lib_object -echo. -+$(file) &>> __lib__.tmp - -endef - -define create_library -echo. $(LIB_DIR)/$@ &> __lib__.tmp -$(foreach file, $(^F), $(lib_object)) -echo. ,, >> __lib__.tmp -$(AR) $(ARFLAGS) @__lib__.tmp -del __lib__.tmp -endef - -AR = tlib -ARFLAGS = /C $(HB_USER_AFLAGS) -AR_RULE = $(create_library) - -include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/bcc32.cf b/harbour/config/win/bcc.cf similarity index 97% rename from harbour/config/win/bcc32.cf rename to harbour/config/win/bcc.cf index fa3f891727..203eeb4cd4 100644 --- a/harbour/config/win/bcc32.cf +++ b/harbour/config/win/bcc.cf @@ -1,8 +1,9 @@ # # $Id$ # + # The Harbour Project -# GNU MAKE file for Borland C/C++ 32bit (4.x, 5.x) +# GNU MAKE file for Borland/CodeGear C/C++ 32-bit (4.x-) include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf diff --git a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat index c380923722..71638ba168 100644 --- a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat +++ b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat @@ -3,19 +3,8 @@ rem rem $Id$ rem -rem Saving current HB_MT state -set OLDENVMT=%HB_MT% -set OLDENVGT=%HB_GT_LIB% -set OLDENVC=%CFLAGS% -set OLDENVHB=%HARBOURFLAGS% -set OLD_HB_ARCHITECTURE=%HB_ARCHITECTURE% -set OLD_HB_COMPILER=%HB_COMPILER% -set OLD_HB_USER_LIBS=%HB_USER_LIBS% - set HB_INSTALL=..\..\..\.. -if %HB_ARCHITECTURE%.==. set HB_ARCHITECTURE=win -if %HB_COMPILER%.==. set HB_COMPILER=bcc32 -SET HB_BIN_INSTALL=%HB_INSTALL%\bin +set HB_BIN_INSTALL=%HB_INSTALL%\bin set HB_INC_INSTALL=include;%HB_INSTALL%\include set HB_LIB_INSTALL=%HB_INSTALL%\lib @@ -47,20 +36,3 @@ if exist %1.hrb del %1.hrb GOTO ENDSET :ENDSET -rem Restore Old Settings -set HB_MT=%OLDENVMT% -set HB_GT_LIB=%OLDENVGT% -set CFLAGS=%OLDENVC% -set HARBOURFLAGS=%OLDENVHB% -set HB_ARCHITECTURE=%OLD_HB_ARCHITECTURE% -set HB_COMPILER=%OLD_HB_COMPILER% -set HB_USER_LIBS=%OLD_HB_USER_LIBS% - -set OLDENVHB= -set OLDENVGT= -set OLDENVC= -set OLDENVMT= -set BLDDEFAULT= -set OLD_HB_ARCHITECTURE= -set OLD_HB_COMPILER= -set OLD_HB_USER_LIBS= diff --git a/harbour/contrib/hbfimage/readme.txt b/harbour/contrib/hbfimage/readme.txt index 01de1a7b96..e8831b7b71 100644 --- a/harbour/contrib/hbfimage/readme.txt +++ b/harbour/contrib/hbfimage/readme.txt @@ -21,17 +21,6 @@ FreeImage Project's web site is http://freeimage.sourceforge.net/ COMPILING ========= -Actually platforms supported are: -- Win32 / BCC32 -- GNU systems / GCC - -to build library on Win32 with BCC use: -make_b32.bat - -on GNU system use: -make install -WARNING: not actually tested - ** requirements: to build FreeImage library: gcc-c++, libstdc++-devel DOCUMENTATION @@ -51,8 +40,3 @@ NOTES WARNING: if you are using Windows platform, download the FreeImage.dll in tests before use it. - -At this time (28/10/2005 CET) it builds on Windows with last CVS. -Not tested on GNU system, but it have to run correctly. - - diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index f1faef62eb..fa4321c44f 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -143,8 +143,6 @@ For gcc on Win95/WinNT with the Cygwin library: HB_COMPILER gcc HB_GT_LIB gtwin CYGWIN noglob - HB_USER_CFLAGS -mwin32 - HB_USER_LDFLAGS -mwin32 For gcc on Win95/WinNT with the MinGW library: HB_ARCHITECTURE win @@ -219,12 +217,11 @@ For IBM Visual Age C++ on OS/2 for PM mode: For Borland C++ 5.5 HB_ARCHITECTURE win - HB_COMPILER bcc32 + HB_COMPILER bcc HB_GT_LIB gtwin For Borland C++ 3.x HB_ARCHITECTURE dos - HB_COMPILER bcc16 HB_GT_LIB gtdos For DJGPP (GCC port for DOS) diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index d7cad0fda2..78e9e62114 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -14,7 +14,7 @@ rem --------------------------------------------------------------- @echo off -set HB_COMPILER=bcc32 +set HB_COMPILER=bcc if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=%~dp0 set _HB_CC_NAME=%HB_CC_NAME% diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index cc0f5c6666..4d51414ea4 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -30,6 +30,9 @@ if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos if "%HB_COMPILER%" == "" if not "%WINDIR%" == "" set HB_COMPILER=msvc if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp +rem Compatibility +if "%HB_COMPILER%" == "bcc32" set HB_COMPILER=bcc + if "%HB_INSTALL_PREFIX%" == "" if "%OS%" == "Windows_NT" set HB_INSTALL_PREFIX=%~dp0 rem Set to constant value to be consistent with the non-GNU make files. diff --git a/harbour/source/compiler/gencobj.c b/harbour/source/compiler/gencobj.c index 0a44646b59..cd3ca88c3d 100644 --- a/harbour/source/compiler/gencobj.c +++ b/harbour/source/compiler/gencobj.c @@ -189,12 +189,12 @@ void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME pFileName ) ulLen--; szStr[ ulLen ] = '\0'; - /* TODO: Check for comments within macros, i.e: CC=bcc32 #comment */ + /* TODO: Check for comments within macros, i.e: CC=bcc #comment */ if( *szStr ) { szToken = strchr( szStr, '=' ); - + if( szToken ) { *szToken++ = '\0'; @@ -278,7 +278,7 @@ void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME pFileName ) #if defined(_MSC_VER) hb_strncat( szOutPath, "-Fo", sizeof( szOutPath ) - 1 ); #elif defined(__WATCOMC__) - hb_strncat( szOutPath, "-fo=", sizeof( szOutPath ) - 1 ); + hb_strncat( szOutPath, "-fo=", sizeof( szOutPath ) - 1 ); #else hb_strncat( szOutPath, "-o", sizeof( szOutPath ) - 1 ); #endif diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index a9d268a65c..f3b853e0e2 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -79,7 +79,7 @@ #include "hbset.h" #include "hb_io.h" -/* NOTE: Some C compilers like BCC32 optimize the call of small static buffers +/* NOTE: Some C compilers like Borland C optimize the call of small static buffers * into an integer to read it faster. Later, programs like CodeGuard * complain if the given buffer was smaller than an int. [ckedem] */ diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index d39ad8bda6..f6dc5c1a4b 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -26,7 +26,7 @@ else endif ifeq ($(HB_ARCHITECTURE),win) - ifeq ($(HB_COMPILER),bcc32) + ifeq ($(HB_COMPILER),bcc) DIRS += maindllh endif ifeq ($(HB_COMPILER),msvc) diff --git a/harbour/utils/hbmk2/examples/winapi.hbp b/harbour/utils/hbmk2/examples/winapi.hbp index 8b6420dc20..a912c3d966 100644 --- a/harbour/utils/hbmk2/examples/winapi.hbp +++ b/harbour/utils/hbmk2/examples/winapi.hbp @@ -6,4 +6,4 @@ {win}libs=kernel32 user32 wsock32 advapi32 gdi32 # Others {win}libs=winspool comctl32 comdlg32 shell32 ole32 oleaut32 uuid odbc32 mpr winmm mapi32 -{win&!bcc32}libs=odbccp32 +{win&!bcc}libs=odbccp32 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 7d61861b7b..f2fa868929 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -362,7 +362,7 @@ FUNCTION Main( ... ) CASE "msvc" CASE "msvc64" CASE "msvcia64" - CASE "bcc32" + CASE "bcc" CASE "xcc" CASE "pocc" CASE "dmc" @@ -430,14 +430,14 @@ FUNCTION Main( ... ) { {|| FindInPath( "ml64" ) != NIL }, "msvc64" },; { {|| FindInPath( "cl" ) != NIL .AND. ; FindInPath( "wpp386" ) == NIL }, "msvc" },; - { {|| FindInPath( "bcc32" ) != NIL }, "bcc32" },; + { {|| FindInPath( "bcc32" ) != NIL }, "bcc" },; { {|| FindInPath( "porc64" ) != NIL }, "pocc64" },; { {|| FindInPath( "pocc" ) != NIL }, "pocc" },; { {|| FindInPath( "dmc" ) != NIL }, "dmc" },; { {|| FindInPath( "icc" ) != NIL }, "icc" },; { {|| FindInPath( "xcc" ) != NIL }, "xcc" } } /* TODO: "mingwce", "msvcce", "poccce" */ - aCOMPSUP := { "gcc", "mingw", "msvc", "msvc64", "msvcia64", "bcc32", "owatcom", "pocc", "pocc64", "rsxnt", "xcc", "dmc", "icc" } + aCOMPSUP := { "gcc", "mingw", "msvc", "msvc64", "msvcia64", "bcc", "owatcom", "pocc", "pocc64", "rsxnt", "xcc", "dmc", "icc" } cBin_CompPRG := "harbour.exe" s_aLIBHBGT := { "gtwin", "gtwvt", "gtgui" } t_cGTDEFAULT := "gtwin" @@ -1371,7 +1371,7 @@ FUNCTION Main( ... ) ENDIF /* Misc */ - CASE t_cARCH == "win" .AND. t_cCOMP == "bcc32" + CASE t_cARCH == "win" .AND. t_cCOMP == "bcc" IF s_lDEBUG AAdd( s_aOPTC, "-y -v" ) ELSE @@ -1547,10 +1547,10 @@ FUNCTION Main( ... ) "LNK4217: locally defined symbol ... imported in function ..." if using 'dllimport'. [vszakats] */ tmp := "" - CASE t_cCOMP $ "gcc|mingw" ; tmp := "__attribute__ (( dllimport ))" - CASE t_cCOMP == "bcc32|owatcom" ; tmp := "__declspec( dllimport )" - CASE t_cCOMP == "owatcom" ; tmp := "__declspec( dllimport )" - OTHERWISE ; tmp := "_declspec( dllimport )" + CASE t_cCOMP $ "gcc|mingw" ; tmp := "__attribute__ (( dllimport ))" + CASE t_cCOMP == "bcc|owatcom" ; tmp := "__declspec( dllimport )" + CASE t_cCOMP == "owatcom" ; tmp := "__declspec( dllimport )" + OTHERWISE ; tmp := "_declspec( dllimport )" ENDCASE /* Create list of requested symbols */ @@ -2765,7 +2765,7 @@ STATIC PROCEDURE ShowHelp( lLong ) " - Supported values for each supported value:" ,; " linux : gcc, gpp, owatcom, icc, mingw, mingwce" ,; " darwin : gcc" ,; - " win : gcc, mingw, msvc, bcc32, owatcom, pocc, dmc, rsxnt, xcc, icc" ,; + " win : gcc, mingw, msvc, bcc, owatcom, pocc, dmc, rsxnt, xcc, icc" ,; " mingwce, msvc64, msvcia64, msvcce, pocc64, poccce" ,; " os2 : gcc, owatcom, icc" ,; " dos : gcc, djgpp, owatcom, rsx32" ,;