diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 126db3c031..9545009a64 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,20 +16,47 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-12 03:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/hbqtgui.hbx + * contrib/hbqt/qtgui/hbqtgui.hbm + - contrib/hbqt/qtgui/gtqtc.h + - contrib/hbqt/qtgui/gtqtc.cpp + + contrib/hbqt/gtqtc + + contrib/hbqt/gtqtc/gtqtc.cpp + + contrib/hbqt/gtqtc/gtqtc.h + * Moved readded GTQTC related files to their original + position. Please add build files (f.e. from old SVN) + and add them to HBQT core makefiles, like f.e. for + hbqtsql. + IMPORTANT: .hbx is not required for any GT, so it's not + needed for GTQTC either. + + * contrib/hbqt/hbqt_common.hbm + * utils/hbmk2/hbmk2.prg + * config/bsd/pcc.mk + * pcc fixups [Tamas Tevesz] + + * utils/hbmk2/hbmk2.prg + + Added pcc to help screen + * config/bsd/pcc.mk + * XXX -> TODO + * INSTALL + + Added pcc to more platforms. + 2011-04-11 17:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqtgui.hbm * contrib/hbqt/qtgui/hbqtgui.hbx + contrib/hbqt/qtgui/gtqtc.cpp + contrib/hbqt/qtgui/gtqtc.h + Reintroduced: half-cooked console implementation of hbQT. - This time it is targeted to provide a console widget inside - GUI MDI inetrface to run Clipper console code alongside GUI - controls. + This time it is targeted to provide a console widget inside + GUI MDI inetrface to run Clipper console code alongside GUI + controls. - DISCLAIMER: this is an effort and still don't know if I + DISCLAIMER: this is an effort and still don't know if I will succeed or be failure. But if I do succeed, it will allow the migration of existing Harbour - console applications to GUI world easily. + console applications to GUI world easily. * contrib/hbxbp/xbpparthandler.prg * contrib/hbxbp/xbpwindow.prg diff --git a/harbour/INSTALL b/harbour/INSTALL index 7d6f55d90d..0aaa3e3b91 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -543,12 +543,14 @@ HARBOUR icc - Intel(R) C/C++ sunpro - Sun Studio C/C++ open64 - Open64 C/C++ + pcc - Portable C Compiler (experimental) darwin ------ gcc - GNU C clang - Clang compiler frontend icc - Intel(R) C/C++ + pcc - Portable C Compiler (experimental) bsd --- @@ -581,6 +583,7 @@ HARBOUR ------- gcc - GNU C ack - Amsterdam Compiler Kit (does not work yet) + pcc - Portable C Compiler (experimental) cygwin ------ @@ -590,6 +593,7 @@ HARBOUR ----- gcc - GNU C sunpro - Sun Studio C/C++ + pcc - Portable C Compiler (experimental) win --- diff --git a/harbour/config/bsd/pcc.mk b/harbour/config/bsd/pcc.mk index 9fde18ad09..f6dcca15e3 100644 --- a/harbour/config/bsd/pcc.mk +++ b/harbour/config/bsd/pcc.mk @@ -2,10 +2,14 @@ # $Id$ # +# TODO: No autodetection + ifeq ($(HB_BUILD_MODE),cpp) HB_BUILD_MODE := c endif +HB_CMP := pcc + OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a @@ -14,29 +18,29 @@ HB_DYN_COPT := -DHB_DYNLIB -fPIC CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) CC_IN := -c -CC_OUT := -o +CC_OUT := -o$(subst x,x, ) CFLAGS += -I. -I$(HB_HOST_INC) -#ifneq ($(HB_BUILD_WARN),no) -# CFLAGS += -W -Wall -#else -# CFLAGS += -Wmissing-braces -Wreturn-type -Wformat -# ifneq ($(HB_BUILD_MODE),cpp) -# CFLAGS += -Wimplicit-int -Wimplicit-function-declaration -# endif -#endif -# -#ifneq ($(HB_BUILD_OPTIM),no) -# CFLAGS += -O3 -#endif +ifneq ($(HB_BUILD_WARN),no) + CFLAGS += -W -Wall +else + CFLAGS += -Wmissing-braces -Wreturn-type -Wformat + ifneq ($(HB_BUILD_MODE),cpp) + CFLAGS += -Wimplicit-int -Wimplicit-function-declaration + endif +endif + +ifneq ($(HB_BUILD_OPTIM),no) + CFLAGS += -O3 +endif ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif LD := $(CC) -LD_OUT := -o +LD_OUT := -o$(subst x,x, ) LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) diff --git a/harbour/contrib/hbqt/qtgui/gtqtc.cpp b/harbour/contrib/hbqt/gtqtc/gtqtc.cpp similarity index 100% rename from harbour/contrib/hbqt/qtgui/gtqtc.cpp rename to harbour/contrib/hbqt/gtqtc/gtqtc.cpp diff --git a/harbour/contrib/hbqt/qtgui/gtqtc.h b/harbour/contrib/hbqt/gtqtc/gtqtc.h similarity index 100% rename from harbour/contrib/hbqt/qtgui/gtqtc.h rename to harbour/contrib/hbqt/gtqtc/gtqtc.h diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index f32752fe28..84bcf7005c 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -19,7 +19,7 @@ -i. --stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64} +-stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64|pcc} -plugin=hbmk2_qt.hbs diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm index 81a122d1a4..0d48b1486f 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm @@ -16,14 +16,12 @@ hbqt_hbqsyntaxhighlighter.cpp hbqt_hbqtableview.cpp hbqt_init.cpp hbqt_utils.cpp -gtqtc.cpp hbqt_hbqabstractitemmodel.h hbqt_hbqgraphicsscene.h hbqt_hbqplaintextedit.h hbqt_hbqsyntaxhighlighter.h hbqt_hbqtableview.h -gtqtc.h hbqt_errorsys.prg diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx index a49c2a63e6..abeb7b3861 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx @@ -36,7 +36,6 @@ DYNAMIC HBQTUI DYNAMIC HBQT_ERRORSYS DYNAMIC HBQT_QMAINWINDOW_RESTSETTINGS DYNAMIC HBQT_QMAINWINDOW_SAVESETTINGS -DYNAMIC HB_GT_QTC DYNAMIC HB_HBQABSTRACTITEMMODEL DYNAMIC HB_HBQGRAPHICSITEM DYNAMIC HB_HBQGRAPHICSSCENE diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a3943da253..da6c943373 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1319,19 +1319,19 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE HBMK_ISPLAT( "darwin|bsd|hpux|sunos|beos|qnx|vxworks|symbian|linux|cygwin|minix" ) DO CASE CASE hbmk[ _HBMK_cPLAT ] == "linux" - aCOMPSUP := { "gcc", "clang", "icc", "watcom", "sunpro", "open64" } + aCOMPSUP := { "gcc", "clang", "icc", "watcom", "sunpro", "open64", "pcc" } CASE hbmk[ _HBMK_cPLAT ] == "darwin" - aCOMPSUP := { "gcc", "clang", "icc" } + aCOMPSUP := { "gcc", "clang", "icc", "pcc" } CASE hbmk[ _HBMK_cPLAT ] == "bsd" aCOMPSUP := { "gcc", "clang", "pcc" } CASE hbmk[ _HBMK_cPLAT ] == "sunos" - aCOMPSUP := { "gcc", "sunpro" } + aCOMPSUP := { "gcc", "sunpro", "pcc" } CASE hbmk[ _HBMK_cPLAT ] == "vxworks" aCOMPSUP := { "gcc", "diab" } CASE hbmk[ _HBMK_cPLAT ] == "aix" aCOMPSUP := { "gcc", "icc" } case hbmk[ _HBMK_cPLAT ] == "minix" - aCOMPSUP := { "gcc", "ack" } + aCOMPSUP := { "gcc", "ack", "pcc" } OTHERWISE aCOMPSUP := { "gcc" } ENDCASE @@ -3217,6 +3217,10 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ( hbmk[ _HBMK_cPLAT ] == "symbian" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "cygwin" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "open64" ) .OR. ; + ( hbmk[ _HBMK_cPLAT ] == "bsd" .AND. hbmk[ _HBMK_cCOMP ] == "pcc" ) .OR. ; + ( hbmk[ _HBMK_cPLAT ] == "darwin" .AND. hbmk[ _HBMK_cCOMP ] == "pcc" ) .OR. ; + ( hbmk[ _HBMK_cPLAT ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "pcc" ) .OR. ; + ( hbmk[ _HBMK_cPLAT ] == "sunos" .AND. hbmk[ _HBMK_cCOMP ] == "pcc" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "minix" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) #if defined( __PLATFORM__UNIX ) @@ -3265,6 +3269,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE hbmk[ _HBMK_cCOMP ] == "clang" cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + "clang" + hbmk[ _HBMK_cCCPOSTFIX ] cBin_CompCPP := cBin_CompC + CASE hbmk[ _HBMK_cCOMP ] == "pcc" + cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + "pcc" + hbmk[ _HBMK_cCCPOSTFIX ] CASE hbmk[ _HBMK_cCOMP ] == "open64" cBin_CompCPP := "openCC" cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, "opencc" ) @@ -3410,14 +3416,14 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ENDIF IF lStopAfterCComp IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1 - IF HBMK_ISPLAT( "darwin|sunos" ) + IF HBMK_ISPLAT( "darwin|sunos" ) .OR. HBMK_ISCOMP( "pcc" ) AAdd( hbmk[ _HBMK_aOPTC ], "-o {OO}" ) ELSE AAdd( hbmk[ _HBMK_aOPTC ], "-o{OO}" ) ENDIF ENDIF ELSE - IF HBMK_ISPLAT( "darwin|sunos" ) + IF HBMK_ISPLAT( "darwin|sunos" ) .OR. HBMK_ISCOMP( "pcc" ) AAdd( hbmk[ _HBMK_aOPTL ], "-o {OE}" ) ELSE AAdd( hbmk[ _HBMK_aOPTL ], "-o{OE}" ) @@ -10933,7 +10939,7 @@ FUNCTION hbmk_KEYW( hbmk, cKeyword, cValue, cOperator ) CASE "ascii" ; RETURN ! hbmk[ _HBMK_lUNICODE ] CASE "unix" ; RETURN HBMK_ISPLAT( "bsd|hpux|sunos|beos|qnx|vxworks|symbian|linux|darwin|cygwin|minix" ) CASE "allwin" ; RETURN HBMK_ISPLAT( "win|wce" ) - CASE "allgcc" ; RETURN HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|djgpp|gccomf|clang|open64" ) + CASE "allgcc" ; RETURN HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|djgpp|gccomf|clang|open64|pcc" ) CASE "allmingw" ; RETURN HBMK_ISCOMP( "mingw|mingw64|mingwarm" ) CASE "allmsvc" ; RETURN HBMK_ISCOMP( "msvc|msvc64|msvcia64|msvcarm" ) CASE "allpocc" ; RETURN HBMK_ISCOMP( "pocc|pocc64|poccarm" ) @@ -11793,8 +11799,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) LOCAL aText_Supp := {; "",; I_( "Supported values for each supported value:" ),; - " - linux : gcc, clang, icc, watcom, sunpro, open64",; - " - darwin : gcc, clang, icc",; + " - linux : gcc, clang, icc, watcom, sunpro, open64, pcc",; + " - darwin : gcc, clang, icc, pcc",; " - win : mingw, msvc, bcc, watcom, icc, pocc, xcc,",; " - mingw64, msvc64, msvcia64, iccia64, pocc64",; " - wce : mingwarm, mingw, msvcarm, poccarm",; @@ -11807,8 +11813,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) " - vxworks : gcc, diab",; " - symbian : gcc",; " - cygwin : gcc",; - " - minix : gcc",; - " - sunos : gcc, sunpro" } + " - minix : gcc, ack, pcc",; + " - sunos : gcc, sunpro, pcc" } LOCAL aOpt_Basic := {; { "-o" , I_( "output file name" ) },;