diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 36e0e3f9a3..809d8c6d24 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-09 14:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + + Added autodetection of mingw/cygwin compiler versions. + + * config/postinst.prg + * Minor in comment. + 2010-05-09 00:30 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/doc/en/class_hbqplaintextedit.txt * contrib/hbqt/qtgui/HBQPlainTextEdit.cpp @@ -36,18 +43,18 @@ + Implemented: persistent blocks per all three modes; stream, column and line. This follows xMate footsteps but enhanced to suit any scenarion. By xMate footsteps, I mean, blocks are streamed to clipboard when cut/copied/pasted - as per the standard rules. Enhancement describes that blocks cut/copied + as per the standard rules. Enhancement describes that blocks cut/copied as such are subject to be pasted in the same format as are copied. Last - cut/copy operation is pasted and if clipboard contain data which matches - last cut/copy action within from hbIDE, its format is used to paste; but + cut/copy operation is pasted and if clipboard contain data which matches + last cut/copy action within from hbIDE, its format is used to paste; but if it is alien text then "stream" is applied by default. - Block remain persistent until another selection action is not initiated or + Block remain persistent until another selection action is not initiated or is explicitly cleared with Sh+F11. There is no need to use any other key to make it persistent. Cut/copy operation can be carried on any time after block is visible. - This effectively empowers hbIDE for a variety of applications. One + This effectively empowers hbIDE for a variety of applications. One block per source can remain active for entire duration of that instance. Just click on required instance and activate copy operation. Go anywhere on another instance and carry a paste operation. Thus blocks are movable @@ -55,13 +62,13 @@ All supported actions on blocks are now fully functional for all three flavours. You will really like "Indents" action on column selections. Now more actions - can be defined for blocks, so please submit your requests supported with + can be defined for blocks, so please submit your requests supported with use-case. - In the coming days on-line documentation to explore this feature will be - posted at http://hbide.vouch.info, stay tuned. + In the coming days on-line documentation to explore this feature will be + posted at http://hbide.vouch.info, stay tuned. - Please forward your suggessions or bug reports. It was such a complex logic + Please forward your suggessions or bug reports. It was such a complex logic that for sure I found it extremely difficult to carry all debug operations, so your input will be of immense value. diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 9c040c1954..02e18e439f 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -701,6 +701,9 @@ ifeq ($(HB_COMPILER),) endif ifneq ($(HB_COMP_PATH),) HB_COMPILER := cygwin + ifneq ($(wildcard $(dir $(HB_COMP_PATH))i686-pc-cygwin-gcc-3.4*),) + HB_COMPILER_VER := 34 + endif else HB_COMP_PATH := $(call find_in_path,djasm) ifneq ($(HB_COMP_PATH),) @@ -710,7 +713,7 @@ ifeq ($(HB_COMPILER),) $(error ! Error: DJGPP cross-builds are only possible on 32-bit Windows hosts) endif else - # tdragon DWARF-2 build + # tdragon DWARF-2 build (4.4.1) HB_COMP_PATH := $(call find_in_path,gcc-dw2) ifneq ($(HB_COMP_PATH),) HB_COMPILER := mingw @@ -719,8 +722,8 @@ ifeq ($(HB_COMPILER),) # Equation Solution build (requires x86_64 host) HB_COMP_PATH := $(call find_in_path,x86_64-pc-mingw32-gcc) ifneq ($(HB_COMP_PATH),) - ifeq ($(HB_COMPILER_VER),) - HB_COMPILER_VER := 44 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-pc-mingw32-gcc-4.5*),) + HB_COMPILER_VER := 45 endif HB_COMPILER := mingw64 HB_CPU := x86_64 @@ -728,6 +731,15 @@ ifeq ($(HB_COMPILER),) HB_COMP_PATH := $(call find_in_path,gcc) ifneq ($(HB_COMP_PATH),) HB_COMPILER := mingw + ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.5*),) + HB_COMPILER_VER := 45 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.4*),) + HB_COMPILER_VER := 44 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.3*),) + HB_COMPILER_VER := 43 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-3.4*),) + HB_COMPILER_VER := 34 + endif else HB_COMP_PATH := $(call find_in_path,wpp386) ifneq ($(HB_COMP_PATH),) @@ -810,17 +822,22 @@ ifeq ($(HB_COMPILER),) HB_COMPILER := mingw64 HB_CCPREFIX := i686-w64-mingw32- HB_CPU := x86_64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),) + HB_COMPILER_VER := 45 + endif else ifeq ($(HB_HOST_CPU),x86_64) # mingw-w64 build HB_COMP_PATH := $(call find_in_path,x86_64-w64-mingw32-gcc) ifneq ($(HB_COMP_PATH),) - ifeq ($(HB_COMPILER_VER),) - HB_COMPILER_VER := 44 - endif HB_COMPILER := mingw64 HB_CCPREFIX := x86_64-w64-mingw32- HB_CPU := x86_64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.6*),) + HB_COMPILER_VER := 46 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),) + HB_COMPILER_VER := 45 + endif endif endif endif diff --git a/harbour/config/postinst.prg b/harbour/config/postinst.prg index 3a9d8d660c..6b99de4837 100644 --- a/harbour/config/postinst.prg +++ b/harbour/config/postinst.prg @@ -85,7 +85,7 @@ PROCEDURE Main() { "HB_WITH_CAIRO" , "..\..\bin\libcairo-2.dll" , .T., "cairo" },; { "HB_WITH_CURL" , "..\libcurl.dll" , .T., "" },; { "HB_WITH_CURL" , "..\bin\libcurl.dll" , .T., "" },; - { "HB_WITH_FIREBIRD" , "..\bin\fbclient.dll" , .F., "" },; /* Doesn't work for mingw, because .lib has another name in another directory */ + { "HB_WITH_FIREBIRD" , "..\bin\fbclient.dll" , .F., "" },; /* Doesn't work with mingw*/cygwin, because .lib has another name in another directory */ { "HB_WITH_FREEIMAGE" , "..\Dist\FreeImage.dll" , .F., "" },; { "HB_WITH_GD" , "..\bin\bgd.dll" , .F., "" },; { "HB_WITH_LIBHARU" , "..\libhpdf.dll" , .F., "" },;