From b16d514cf8da86b0b90f200a5a4d5a2f170ad84a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 5 Mar 2009 13:45:42 +0000 Subject: [PATCH] 2009-03-05 14:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * doc/man/hbmk.1 * INSTALL * utils/hbmk2/hbmk2.prg * config/dos/global.cf - config/dos/rsx32.cf - config/win/rsxnt.cf - Pruned rsx32 and rsxnt compiler support. Both are dead product since long years. Their successor is MinGW on win, and DJGPP on dos. ; NOTE: More candidates for such pruning are: - dmc (buggy and compiler not updated) - xcc (based on very old version of pocc) Any opinions? * config/dos/global.cf - Cleaned emx, watcom, rsx, bcc16 related branches. * mpkg_win.bat * mpkg_win.nsi ! Exclusion of junk files is now done in batch, so the .zip is now also free from them. --- harbour/ChangeLog | 23 ++++++++++ harbour/INSTALL | 2 - harbour/config/dos/global.cf | 18 ++------ harbour/config/dos/rsx32.cf | 59 -------------------------- harbour/config/win/rsxnt.cf | 80 ----------------------------------- harbour/doc/man/hbmk.1 | 4 +- harbour/mpkg_win.bat | 6 +++ harbour/mpkg_win.nsi | 2 +- harbour/utils/hbmk2/hbmk2.prg | 24 ++++------- 9 files changed, 43 insertions(+), 175 deletions(-) delete mode 100644 harbour/config/dos/rsx32.cf delete mode 100644 harbour/config/win/rsxnt.cf diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7d1c134b57..f8a6cb2226 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,29 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-05 14:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * doc/man/hbmk.1 + * INSTALL + * utils/hbmk2/hbmk2.prg + * config/dos/global.cf + - config/dos/rsx32.cf + - config/win/rsxnt.cf + - Pruned rsx32 and rsxnt compiler support. Both are dead + product since long years. Their successor is MinGW on win, + and DJGPP on dos. + ; NOTE: More candidates for such pruning are: + - dmc (buggy and compiler not updated) + - xcc (based on very old version of pocc) + Any opinions? + + * config/dos/global.cf + - Cleaned emx, watcom, rsx, bcc16 related branches. + + * mpkg_win.bat + * mpkg_win.nsi + ! Exclusion of junk files is now done in batch, so + the .zip is now also free from them. + 2009-03-05 14:34 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbdefs.h * harbour/source/vm/hvm.c diff --git a/harbour/INSTALL b/harbour/INSTALL index b63a422f6f..a176db62da 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -176,7 +176,6 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS owatcom - Open Watcom C++ bcc - Borland/CodeGear C++ 4.x and above cygwin - Cygwin GNU C - rxsnt - EMX/RSXNT/Windows GNU C icc - IBM Visual Age C++ dmc - Digital Mars C msvc64 - Microsoft Visual C++ x64 @@ -192,7 +191,6 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS --- djgpp - Delorie GNU C owatcom - Open Watcom C++ 9.x and above - rxs32 - EMX/RSXNT/DOS GNU C OS/2 ---- diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf index af25d73c9b..0d36feca11 100644 --- a/harbour/config/dos/global.cf +++ b/harbour/config/dos/global.cf @@ -36,25 +36,13 @@ MK := $(subst \,/,$(subst \~,~,$(MAKE))) ifeq ($(COMSPEC),) #location of command.com COMSPEC := command.com else - ifeq ($(HB_COMPILER),bcc16) + ifneq ($(HB_COMPILER),owatcom) #Use standard dos path, which is already set up. else - ifeq ($(HB_COMPILER),rsx32) + ifeq ($(HB_COMPILER),djgpp) #Use standard dos path, which is already set up. else - ifneq ($(findstring watcom,$(HB_COMPILER)),) - #Use standard dos path, which is already set up. - else - ifeq ($(HB_COMPILER),djgpp) - #Use standard dos path, which is already set up. - else - ifeq ($(HB_COMPILER),emx) - #Use standard dos path, which is already set up. - else - COMSPEC := $(subst \,/,$(COMSPEC)) - endif - endif - endif + COMSPEC := $(subst \,/,$(COMSPEC)) endif endif endif diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf deleted file mode 100644 index 3caf663d9f..0000000000 --- a/harbour/config/dos/rsx32.cf +++ /dev/null @@ -1,59 +0,0 @@ -# -# $Id$ -# -# GNU Make file for RSXNT for DOS target - -include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf - -OBJ_EXT = .o -EXE_EXT = .exe -LIB_PREF = -LIB_EXT = .a - -CC = gcc -CC_IN = -c -CC_OUT = -o -CPPFLAGS = -I. -I$(HB_INC_COMPILE) -Zrsx32 -CFLAGS = -Wall -W -O3 - -LD = gcc -LDFLAGS = -Zrsx32 -# Note the space after -o -LD_OUT = -o - -# Add all libraries specified in CONTRIBS and LIBS. -ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif - -# The -( option could be appropriate to link against libraries with -# cyclic dependencies, but I think it is not really necessary if the -# libraries are kept in proper order. -# LINKLIBS += -Wl,-( -LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib))) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) - -# If LIBS specifies the rdd library, add all DB drivers. -ifeq ($(findstring rdd,$(LIBS)),rdd) -LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) -endif - -# Add the specified GT driver library and other RTLs -ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl -endif - -# The -) option could be appropriate to link against libraries with -# cyclic dependencies, but I think it is not really necessary if the -# libraries are kept in proper order. -# LINKLIBS += -Wl,-) - -LDFLAGS += $(LINKPATHS) - -AR = ar -ARFLAGS = $(HB_USER_AFLAGS) -AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) - -include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/rsxnt.cf b/harbour/config/win/rsxnt.cf deleted file mode 100644 index e1264204c4..0000000000 --- a/harbour/config/win/rsxnt.cf +++ /dev/null @@ -1,80 +0,0 @@ -# -# $Id$ -# - -include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf - -OBJ_EXT = .o -EXE_EXT = .exe -LIB_PREF = -LIB_EXT = .a - -CC = gcc -CC_IN = -c -CC_OUT = -o -CPPFLAGS = -I. -I$(HB_INC_COMPILE) -Zwin32 -CFLAGS = -Wall -W -O3 - -LD = gcc -LDFLAGS = -Zwin32 -# Note the space after -o -LD_OUT = -o - -# Add all libraries specified in CONTRIBS and LIBS. -ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif - -# The -( option could be appropriate to link against libraries with -# cyclic dependencies, but I think it is not really necessary if the -# libraries are kept in proper order. -# LINKLIBS += -Wl,-( -LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib))) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) - -# This library is needed for CharToOemBuff() and OemToCharBuff() support. -# it's automatically added by RSXNT -#LINKLIBS += -luser32 - -# If LIBS specifies the rdd library, add all DB drivers. -ifeq ($(findstring rdd,$(LIBS)),rdd) -LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) -endif - -# Add the specified GT driver library -ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl -endif - -# HB_SCREEN_LIB: empty, or one of ncurses, slang -# HB_SCREEN_LIB=ncurses -# HB_SCREEN_LIB=slang - -ifneq ($(HB_SCREEN_LIB),) -LINKLIBS += -l$(HB_SCREEN_LIB) -endif - -# Add the optional user path(s) -ifneq ($(LNK_USR_PATH),) -LINKPATHS += $(foreach path, $(LNK_USR_PATH), -L$(path)) -endif - -# Add the optional user libarary (or libraries) -ifneq ($(LNK_USR_LIB),) -LINKLIBS += $(foreach lib, $(LNK_USR_LIB), -l$(lib)) -endif - -# The -) option could be appropriate to link against libraries with -# cyclic dependencies, but I think it is not really necessary if the -# libraries are kept in proper order. -# LINKLIBS += -Wl,-) - -LDFLAGS += $(LINKPATHS) - -AR = ar -ARFLAGS = $(HB_USER_AFLAGS) -AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ - -include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/doc/man/hbmk.1 b/harbour/doc/man/hbmk.1 index 42de985b3c..fc665f0ca4 100644 --- a/harbour/doc/man/hbmk.1 +++ b/harbour/doc/man/hbmk.1 @@ -123,9 +123,9 @@ Defaults and feature support vary by architecture/compiler. Supported values for each supported value: linux: gcc, gpp, owatcom, icc, mingw, mingwce darwin: gcc -win: mingw, msvc, bcc, owatcom, pocc, dmc, rsxnt, icc, cygwin mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc +win: mingw, msvc, bcc, owatcom, pocc, dmc, icc, cygwin mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc os2: gcc, owatcom, icc -dos: gcc, djgpp, owatcom, rsx32 +dos: gcc, djgpp, owatcom bsd, hpux, sunos: gcc .SH FILES diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat index 2c31260717..e45a4f2022 100644 --- a/harbour/mpkg_win.bat +++ b/harbour/mpkg_win.bat @@ -50,6 +50,12 @@ call make_gnu.bat :MK_PKG +rem ; Post build cleanup + +if exist "%HB_BIN_INSTALL%\*.tds" del "%HB_BIN_INSTALL%\*.tds" +if exist "%HB_BIN_INSTALL%\*.lib" del "%HB_BIN_INSTALL%\*.lib" +if exist "%HB_BIN_INSTALL%\*.exp" del "%HB_BIN_INSTALL%\*.exp" + rem ; Installer package makensis.exe %~dp0mpkg_win.nsi diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi index e6e8f78d14..fd6286e2f3 100644 --- a/harbour/mpkg_win.nsi +++ b/harbour/mpkg_win.nsi @@ -75,7 +75,7 @@ Section "Main components" hb_main File /oname=COPYING "$%HB_DOC_INSTALL%\license.txt" SetOutPath $INSTDIR\bin - File /x *.tds /x *.lib /x *.exp "$%HB_BIN_INSTALL%\*.*" + File "$%HB_BIN_INSTALL%\*.*" SetOutPath $INSTDIR\lib File "$%HB_LIB_INSTALL%\*.*" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index ce938964d3..cd4cfc720e 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -424,7 +424,7 @@ FUNCTION Main( ... ) CASE t_cARCH == "dos" aCOMPDET := { { {|| FindInPath( "gcc" ) != NIL }, "djgpp" },; { {|| FindInPath( "wpp386" ) != NIL }, "owatcom" } } /* TODO: Add full support for wcc386 */ - aCOMPSUP := { "djgpp", "gcc", "owatcom", "rsx32" } + aCOMPSUP := { "djgpp", "gcc", "owatcom" } cBin_CompPRG := "harbour.exe" s_aLIBHBGT := { "gtdos" } t_cGTDEFAULT := "gtdos" @@ -460,7 +460,7 @@ FUNCTION Main( ... ) { {|| FindInPath( "icc" ) != NIL }, "icc" },; { {|| FindInPath( "cygstart" ) != NIL }, "cygwin" },; { {|| FindInPath( "xcc" ) != NIL }, "xcc" } } - aCOMPSUP := { "mingw", "msvc", "bcc", "owatcom", "pocc", "rsxnt", "xcc", "dmc", "icc", "cygwin",; + aCOMPSUP := { "mingw", "msvc", "bcc", "owatcom", "pocc", "xcc", "dmc", "icc", "cygwin",; "msvc64", "msvcia64", "pocc64",; "mingwce", "msvcce", "poccce" } cBin_CompPRG := "harbour.exe" @@ -1204,8 +1204,7 @@ FUNCTION Main( ... ) CASE ( t_cARCH == "win" .AND. t_cCOMP == "gcc" ) .OR. ; ( t_cARCH == "win" .AND. t_cCOMP == "mingw" ) .OR. ; - ( t_cARCH == "win" .AND. t_cCOMP == "cygwin" ) .OR. ; - ( t_cARCH == "win" .AND. t_cCOMP == "rsxnt" ) + ( t_cARCH == "win" .AND. t_cCOMP == "cygwin" ) cLibPrefix := "-l" cLibExt := "" @@ -1225,9 +1224,6 @@ FUNCTION Main( ... ) IF s_lSHARED AAdd( s_aLIBPATH, "{DB}" ) ENDIF - IF t_cCOMP == "rsxnt" - cOpt_CompC += " -Zwin32" - ENDIF IF t_cCOMP == "mingw" cOpt_CompC += " -Wl,--start-group {LL} -Wl,--end-group" ELSE @@ -1264,8 +1260,7 @@ FUNCTION Main( ... ) ENDIF ENDIF - CASE ( t_cARCH == "dos" .AND. t_cCOMP == "djgpp" ) .OR. ; - ( t_cARCH == "dos" .AND. t_cCOMP == "rsx32" ) + CASE t_cARCH == "dos" .AND. t_cCOMP == "djgpp" cLibPrefix := "-l" cLibExt := "" @@ -1274,9 +1269,6 @@ FUNCTION Main( ... ) cOpt_CompC := "{LC} {LO} {LA} -O3 {FC} -I{DI} {DL}{SCRIPT}" cLibPathPrefix := "-L" cLibPathSep := " " - IF t_cCOMP == "rsx32" - cOpt_CompC += " -Zrsx32" - ENDIF IF t_cCOMP == "djgpp" cOpt_CompC += " -Wl,--start-group {LL} -Wl,--end-group" ELSE @@ -1636,7 +1628,7 @@ FUNCTION Main( ... ) DO CASE CASE ! s_lSHARED .OR. ; !( t_cARCH == "win" ) .OR. ; - t_cCOMP $ "msvc|msvc64|msvcia64|rsxnt" + t_cCOMP $ "msvc|msvc64|msvcia64" /* NOTE: MSVC gives the warning: "LNK4217: locally defined symbol ... imported in function ..." @@ -2064,7 +2056,7 @@ STATIC FUNCTION ListCookLib( arraySrc, cPrefix, cExtNew ) LOCAL cDir LOCAL cLibName - IF t_cCOMP $ "gcc|gpp|mingw|djgpp|rsxnt|rsx32|cygwin" + IF t_cCOMP $ "gcc|gpp|mingw|djgpp|cygwin" FOR EACH cLibName IN array hb_FNameSplit( cLibName, @cDir ) IF Empty( cDir ) @@ -2877,10 +2869,10 @@ STATIC PROCEDURE ShowHelp( lLong ) " - Supported values for each supported value:" ,; " linux : gcc, gpp, owatcom, icc, mingw, mingwce" ,; " darwin : gcc" ,; - " win : mingw, msvc, bcc, owatcom, pocc, dmc, rsxnt, icc, cygwin" ,; + " win : mingw, msvc, bcc, owatcom, pocc, dmc, icc, cygwin" ,; " mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc" ,; " os2 : gcc, owatcom, icc" ,; - " dos : gcc, djgpp, owatcom, rsx32" ,; + " dos : gcc, djgpp, owatcom" ,; " bsd, hpux, sunos: gcc" } DEFAULT lLong TO .F.