From 03ca82e16f29c5e3fc7b6928805ebd94c9d364bc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 15 Jul 2010 15:15:29 +0000 Subject: [PATCH] 2010-07-15 17:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbpost.hbm ! Fixed issue where prg flags were interpreted as implib tool flags when building *.hbi files via make.hbs. Caused problems for bcc, watcom and some rarer other cases. * config/beos/gcc.mk * config/qnx/gcc.mk * config/bsd/gcc.mk * config/bsd/clang.mk * config/bsd/pcc.mk * config/wce/mingwarm.mk * config/darwin/gcc.mk * config/darwin/icc.mk * config/darwin/clang.mk * config/hpux/gcc.mk * config/win/mingw.mk * config/win/cygwin.mk * config/linux/gcc.mk * config/linux/icc.mk * config/linux/clang.mk * config/linux/sunpro.mk * config/os2/gcc.mk * config/sunos/gcc.mk * config/sunos/sunpro.mk % Using 'LD = $(CC)' instead of duplicating the 'CC = ' line with identical value. * contrib/hbqt/THbQtUI.prg * Minor. * tests/hbdocext.prg ! Minor portability. --- harbour/ChangeLog | 37 +++++++++++++++++++++++++++++++- harbour/config/beos/gcc.mk | 2 +- harbour/config/bsd/clang.mk | 2 +- harbour/config/bsd/gcc.mk | 2 +- harbour/config/bsd/pcc.mk | 4 ++-- harbour/config/darwin/clang.mk | 2 +- harbour/config/darwin/gcc.mk | 2 +- harbour/config/darwin/icc.mk | 2 +- harbour/config/hpux/gcc.mk | 2 +- harbour/config/linux/clang.mk | 2 +- harbour/config/linux/gcc.mk | 2 +- harbour/config/linux/icc.mk | 2 +- harbour/config/linux/sunpro.mk | 2 +- harbour/config/os2/gcc.mk | 2 +- harbour/config/qnx/gcc.mk | 2 +- harbour/config/sunos/gcc.mk | 2 +- harbour/config/sunos/sunpro.mk | 2 +- harbour/config/wce/mingwarm.mk | 2 +- harbour/config/win/cygwin.mk | 2 +- harbour/config/win/mingw.mk | 2 +- harbour/contrib/hbpost.hbm | 8 +++++-- harbour/contrib/hbqt/THbQtUI.prg | 5 +++-- harbour/tests/hbdocext.prg | 2 +- 23 files changed, 66 insertions(+), 26 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2a440ccee0..ed966b8b75 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,41 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-15 17:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbpost.hbm + ! Fixed issue where prg flags were interpreted as + implib tool flags when building *.hbi files via + make.hbs. Caused problems for bcc, watcom and some + rarer other cases. + + * config/beos/gcc.mk + * config/qnx/gcc.mk + * config/bsd/gcc.mk + * config/bsd/clang.mk + * config/bsd/pcc.mk + * config/wce/mingwarm.mk + * config/darwin/gcc.mk + * config/darwin/icc.mk + * config/darwin/clang.mk + * config/hpux/gcc.mk + * config/win/mingw.mk + * config/win/cygwin.mk + * config/linux/gcc.mk + * config/linux/icc.mk + * config/linux/clang.mk + * config/linux/sunpro.mk + * config/os2/gcc.mk + * config/sunos/gcc.mk + * config/sunos/sunpro.mk + % Using 'LD = $(CC)' instead of duplicating the + 'CC = ' line with identical value. + + * contrib/hbqt/THbQtUI.prg + * Minor. + + * tests/hbdocext.prg + ! Minor portability. + 2010-07-15 16:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + config/vxworks @@ -97,7 +132,7 @@ ; Patches by Tamas Tevesz: * src/pp/ppcore.c - ! Fixed very old bad type on one of the PP error msgs. + ! Fixed very old bad typo on one of the PP error msgs. * contrib/gtwvg/wvgwin.c * contrib/gtwvg/wvgwing.c diff --git a/harbour/config/beos/gcc.mk b/harbour/config/beos/gcc.mk index edc21182ce..9ab7f95bd8 100644 --- a/harbour/config/beos/gcc.mk +++ b/harbour/config/beos/gcc.mk @@ -34,7 +34,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/bsd/clang.mk b/harbour/config/bsd/clang.mk index 916070b2ff..29227aeac4 100644 --- a/harbour/config/bsd/clang.mk +++ b/harbour/config/bsd/clang.mk @@ -42,7 +42,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk index 2c087d11cc..b24f205f3b 100644 --- a/harbour/config/bsd/gcc.mk +++ b/harbour/config/bsd/gcc.mk @@ -32,7 +32,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/bsd/pcc.mk b/harbour/config/bsd/pcc.mk index ce3e74193f..c83b516b87 100644 --- a/harbour/config/bsd/pcc.mk +++ b/harbour/config/bsd/pcc.mk @@ -20,7 +20,7 @@ CFLAGS += -I. -I$(HB_INC_COMPILE) -fpic # Warning and optimization options are not stable yet #ifneq ($(HB_BUILD_WARN),no) -# CFLAGS += +# CFLAGS += #else # CFLAGS += #endif @@ -33,7 +33,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk index d928e417b0..5cc54dfb3d 100644 --- a/harbour/config/darwin/clang.mk +++ b/harbour/config/darwin/clang.mk @@ -45,7 +45,7 @@ endif # remove it if you have newer compiler version #CFLAGS += -Wno-long-double -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk index 127911ba66..8fb4569c6a 100644 --- a/harbour/config/darwin/gcc.mk +++ b/harbour/config/darwin/gcc.mk @@ -46,7 +46,7 @@ endif # remove it if you have newer compiler version #CFLAGS += -Wno-long-double -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk index a2caa1820d..680f8e82b2 100644 --- a/harbour/config/darwin/icc.mk +++ b/harbour/config/darwin/icc.mk @@ -32,7 +32,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CMP) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk index cb2aea22cc..ea5f4820da 100644 --- a/harbour/config/hpux/gcc.mk +++ b/harbour/config/hpux/gcc.mk @@ -38,7 +38,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/linux/clang.mk b/harbour/config/linux/clang.mk index f510102f9c..2a76f29911 100644 --- a/harbour/config/linux/clang.mk +++ b/harbour/config/linux/clang.mk @@ -44,7 +44,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk index 3f0bdd0d4f..e4f0c957fe 100644 --- a/harbour/config/linux/gcc.mk +++ b/harbour/config/linux/gcc.mk @@ -36,7 +36,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk index 04b4cb7bd6..d3e0f037c3 100644 --- a/harbour/config/linux/icc.mk +++ b/harbour/config/linux/icc.mk @@ -37,7 +37,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CMP) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk index cedfdb0e6b..8b2e90452b 100644 --- a/harbour/config/linux/sunpro.mk +++ b/harbour/config/linux/sunpro.mk @@ -50,7 +50,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk index 90cb5ca793..1d7117a509 100644 --- a/harbour/config/os2/gcc.mk +++ b/harbour/config/os2/gcc.mk @@ -59,7 +59,7 @@ ifneq ($(HB_LINKING_RTL),) SYSLIBS += socket endif -LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/qnx/gcc.mk b/harbour/config/qnx/gcc.mk index 3f0bdd0d4f..e4f0c957fe 100644 --- a/harbour/config/qnx/gcc.mk +++ b/harbour/config/qnx/gcc.mk @@ -36,7 +36,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk index 69c9084488..cacf66823c 100644 --- a/harbour/config/sunos/gcc.mk +++ b/harbour/config/sunos/gcc.mk @@ -36,7 +36,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk index add8890a7d..8e3b40b89d 100644 --- a/harbour/config/sunos/sunpro.mk +++ b/harbour/config/sunos/sunpro.mk @@ -55,7 +55,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk index 49b98fefb9..eaf97ac45f 100644 --- a/harbour/config/wce/mingwarm.mk +++ b/harbour/config/wce/mingwarm.mk @@ -48,7 +48,7 @@ ifneq ($(filter $(HB_BUILD_STRIP),all bin),) DYSTRIP := -s endif -LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := -L$(LIB_DIR) diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk index 1d082197a2..5c651dfc95 100644 --- a/harbour/config/win/cygwin.mk +++ b/harbour/config/win/cygwin.mk @@ -45,7 +45,7 @@ ifneq ($(filter $(HB_BUILD_STRIP),all bin),) DYSTRIP := -s endif -LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o LIBPATHS := -L$(LIB_DIR) diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk index ca77a6827c..b90d9fab66 100644 --- a/harbour/config/win/mingw.mk +++ b/harbour/config/win/mingw.mk @@ -82,7 +82,7 @@ ifneq ($(filter $(HB_BUILD_STRIP),all bin),) DYSTRIP := -s endif -LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(CC) LD_OUT := -o$(subst x,x, ) LIBPATHS := -L$(LIB_DIR) diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm index c3ffe46ca7..daba0427b3 100644 --- a/harbour/contrib/hbpost.hbm +++ b/harbour/contrib/hbpost.hbm @@ -5,12 +5,16 @@ # These are mandatory in Harbour SVN, they will always # override project options. --w3 -es2 -kmo -i- +-prgflag=-w3 +-prgflag=-es2 +-prgflag=-kmo +-prgflag=-i- + -warn=yes -cflag=-DHB_LEGACY_TYPES_OFF {allwin&!(HB_BUILD_UNICODE='no')}-cflag=-DUNICODE -{HB_BUILD_DEBUG}-l- +{HB_BUILD_DEBUG}-prgflag=-l- {HB_BUILD_DEBUG}-debug {HB_BUILD_DEBUG}-cflag=-DHB_TR_LEVEL_DEBUG diff --git a/harbour/contrib/hbqt/THbQtUI.prg b/harbour/contrib/hbqt/THbQtUI.prg index eb4aff0df3..3a2291b3c9 100644 --- a/harbour/contrib/hbqt/THbQtUI.prg +++ b/harbour/contrib/hbqt/THbQtUI.prg @@ -83,7 +83,7 @@ CLASS HbQtUI DATA cLoadingMode INIT "" - DATA qObj INIT hb_hash() + DATA qObj INIT {=>} DATA widgets INIT {} DATA aCommands INIT {} @@ -624,7 +624,8 @@ METHOD HbQtUI:formatCommand( cCmd, lText ) /*----------------------------------------------------------------------*/ STATIC FUNCTION hbq_isObjectNameSet( s ) - RETURN ( "objectName" $ s .OR. "ObjectName" $ s ) + RETURN "objectName" $ s .OR. ; + "ObjectName" $ s /*----------------------------------------------------------------------*/ diff --git a/harbour/tests/hbdocext.prg b/harbour/tests/hbdocext.prg index dfb7754c52..f4004db1ac 100644 --- a/harbour/tests/hbdocext.prg +++ b/harbour/tests/hbdocext.prg @@ -23,7 +23,7 @@ PROCEDURE Main() " * $" + "Id" + "$" + hb_eol() +; " */" + hb_eol() - FOR EACH aFile IN Directory( "*.*" ) + FOR EACH aFile IN Directory( hb_osFileMask() ) cFile := __hbdoc_ToSource( __hbdoc_FromSource( MemoRead( aFile[ F_NAME ] ) ) ) IF ! Empty( cFile ) cDst := FNameExtSet( aFile[ F_NAME ], ".txt" )