From 163ee5350034aa3cb15e52ffb32d70be21afe470 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Jun 2010 22:53:22 +0000 Subject: [PATCH] 2010-06-06 00:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * external/sqlite3/Makefile * utils/hbmk2/hbmk2.prg * config/global.mk * config/wce/msvcarm.mk * config/win/msvc.mk * Changed HB_COMPILER_VER values for msvc targets. Previously it was the Visual Studio version, now it is the C compiler version, the same value used in _MSC_VER predefined macro: Name old NEW -------------------------------------- ---- ---- C Compiler version 6.0 600 C/C++ compiler version 7.0 700 Visual C++, Windows, version 1.0 100 800 Visual C++, 32-bit, version 1.0 100 800 Visual C++, Windows, version 2.0 200 900 Visual C++, 32-bit, version 2.x 200 900 Visual C++, 32-bit, version 4.0 400 1000 Visual C++, 32-bit, version 5.0 500 1100 Visual C++, 32-bit, version 6.0 600 1200 Visual Studio .NET (2002), version 7.0 700 1300 Visual Studio .NET 2003, version 7.1 710 1310 Visual Studio 2005, version 8.0 800 1400 Visual Studio 2008, version 9.0 900 1500 Visual Studio 2010, version 10.0 1000 1600 INCOMPATIBLE for users setting HB_COMPILER_VER manually, pls change the value as indicated above. For most users it's recommended to rely on autodetection and not to set this variable at all. * config/postinst.prg ! Fixed to use hb_osFileMask() instead of hard-coded '*' mask. --- harbour/ChangeLog | 44 ++++++++++++++++++++++++++++--- harbour/INSTALL | 2 +- harbour/config/global.mk | 12 ++++----- harbour/config/postinst.prg | 4 +-- harbour/config/wce/msvcarm.mk | 12 ++++----- harbour/config/win/msvc.mk | 10 +++---- harbour/external/sqlite3/Makefile | 2 +- harbour/utils/hbmk2/hbmk2.prg | 24 ++++++++--------- 8 files changed, 73 insertions(+), 37 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e3c2aaf69a..e34de028d5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,42 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-06-06 00:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * external/sqlite3/Makefile + * utils/hbmk2/hbmk2.prg + * config/global.mk + * config/wce/msvcarm.mk + * config/win/msvc.mk + * Changed HB_COMPILER_VER values for msvc targets. Previously it was + the Visual Studio version, now it is the C compiler version, + the same value used in _MSC_VER predefined macro: + + Name old NEW + -------------------------------------- ---- ---- + C Compiler version 6.0 600 + C/C++ compiler version 7.0 700 + Visual C++, Windows, version 1.0 100 800 + Visual C++, 32-bit, version 1.0 100 800 + Visual C++, Windows, version 2.0 200 900 + Visual C++, 32-bit, version 2.x 200 900 + Visual C++, 32-bit, version 4.0 400 1000 + Visual C++, 32-bit, version 5.0 500 1100 + Visual C++, 32-bit, version 6.0 600 1200 + Visual Studio .NET (2002), version 7.0 700 1300 + Visual Studio .NET 2003, version 7.1 710 1310 + Visual Studio 2005, version 8.0 800 1400 + Visual Studio 2008, version 9.0 900 1500 + Visual Studio 2010, version 10.0 1000 1600 + + INCOMPATIBLE for users setting HB_COMPILER_VER manually, pls + change the value as indicated above. For most users it's + recommended to rely on autodetection and not to set this + variable at all. + + * config/postinst.prg + ! Fixed to use hb_osFileMask() instead of hard-coded '*' mask. + 2010-06-05 11:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbqt_hbqplaintextedit.cpp @@ -26,11 +62,11 @@ * contrib/hbide/ideeditor.prg * contrib/hbide/idefindreplace.prg * contrib/hbide/ideobject.prg - + Implemented: interface to find next/previous occurance of selected - text in the current editing instance. + + Implemented: interface to find next/previous occurance of selected + text in the current editing instance. - The moment some text is selected in the editor, two tool-buttons will - automatically show-up on the lower-right corner of the editing window + The moment some text is selected in the editor, two tool-buttons will + automatically show-up on the lower-right corner of the editing window to facilitate you execute "find" operation for selected text up or down. Buttons will disappear where there is no more selected text. diff --git a/harbour/INSTALL b/harbour/INSTALL index 4c76e050ca..a0b7c51a1c 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -656,7 +656,7 @@ HARBOUR - HB_COMPILER_VER=[] Set C compiler version. This is used with msvc and mingw/cygwin targets currently. format: - <9><0>[<0>] = [.] + <15><0>[<0>] = [.] Default: filled by compiler autodetection or empty - HB_USER_LIBS=[] Add space separated of libs to link process. Lib names should be without extension and path. diff --git a/harbour/config/global.mk b/harbour/config/global.mk index b118410106..06cf7abaa2 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -761,7 +761,7 @@ ifeq ($(HB_COMPILER),) else HB_COMP_PATH := $(call find_in_path,clarm) ifneq ($(HB_COMP_PATH),) - HB_COMPILER_VER := 710 + HB_COMPILER_VER := 1310 HB_COMPILER := msvcarm HB_PLATFORM := wce HB_CPU := arm @@ -795,15 +795,15 @@ ifeq ($(HB_COMPILER),) ifneq ($(HB_COMP_PATH),) HB_COMPILER := msvc ifneq ($(findstring VC98,$(HB_COMP_PATH)),) - HB_COMPILER_VER := 600 + HB_COMPILER_VER := 1200 else ifneq ($(findstring 2003,$(HB_COMP_PATH)),) - HB_COMPILER_VER := 700 + HB_COMPILER_VER := 1300 else ifneq ($(findstring 8/,$(HB_COMP_PATH)),) - HB_COMPILER_VER := 800 + HB_COMPILER_VER := 1400 else ifneq ($(findstring 9.0,$(HB_COMP_PATH)),) - HB_COMPILER_VER := 900 + HB_COMPILER_VER := 1500 else ifneq ($(findstring 10.0,$(HB_COMP_PATH)),) - HB_COMPILER_VER := 1000 + HB_COMPILER_VER := 1600 endif else HB_COMP_PATH := $(call find_in_path,bcc32) diff --git a/harbour/config/postinst.prg b/harbour/config/postinst.prg index bcdc874569..466bce8279 100644 --- a/harbour/config/postinst.prg +++ b/harbour/config/postinst.prg @@ -82,7 +82,7 @@ PROCEDURE Main() GetEnv( "HB_BUILD_IMPLIB" ) == "yes" .AND. ; ! Empty( GetEnv( "HB_HOST_BIN_DIR" ) ) - FOR EACH tmp IN PackageList( "contrib" + _PS_ + "*", GetEnv( "HB_CONTRIBLIBS" ), GetEnv( "HB_CONTRIB_ADDONS" ) ) + FOR EACH tmp IN PackageList( "contrib" + _PS_ + hb_osFileMask(), GetEnv( "HB_CONTRIBLIBS" ), GetEnv( "HB_CONTRIB_ADDONS" ) ) IF hb_FileExists( "contrib" + _PS_ + tmp + _PS_ + tmp + ".hbi" ) mk_hb_processRun( GetEnv( "HB_HOST_BIN_DIR" ) + _PS_ + "hbmk2" +; " -quiet -lang=en" +; @@ -130,7 +130,7 @@ PROCEDURE Main() OutStd( "! Making shared version of Harbour binaries..." + hb_osNewLine() ) - FOR EACH tmp IN Directory( "utils" + _PS_ + "*", "D" ) + FOR EACH tmp IN Directory( "utils" + _PS_ + hb_osFileMask(), "D" ) IF "D" $ tmp[ F_ATTR ] .AND. ; !( tmp[ F_NAME ] == "." ) .AND. ; !( tmp[ F_NAME ] == ".." ) .AND. ; diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk index 0aec680d73..96d74262f0 100644 --- a/harbour/config/wce/msvcarm.mk +++ b/harbour/config/wce/msvcarm.mk @@ -10,7 +10,7 @@ HB_DYN_COPT := -DHB_DYNLIB CC := cl.exe ifeq ($(HB_COMPILER),msvcarm) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) + ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) CC := clarm.exe endif endif @@ -32,7 +32,7 @@ else ifeq ($(HB_COMPILER),msvc) endif # MSVS 2005 SP1 also supports it, but we only enable it for 2008 and upper. -ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800),) +ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400),) LDFLAGS += -nxcompat -dynamicbase -fixed:no DFLAGS += -nxcompat -dynamicbase endif @@ -49,7 +49,7 @@ ifeq ($(HB_BUILD_MODE),) endif ifneq ($(HB_BUILD_WARN),no) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) + ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) # Lowered warning level to avoid large amount of warnings in system headers. # Maybe this is related to the msvc2003 kit I was using. [vszakats] CFLAGS += -W3 @@ -61,7 +61,7 @@ else endif ifneq ($(HB_BUILD_OPTIM),no) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) + ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) CFLAGS += -Oxsb1 -GF else CFLAGS += -Os -Gy @@ -77,7 +77,7 @@ endif RC := rc.exe RC_OUT := -fo$(subst x,x, ) RCFLAGS := -ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800 900),) +ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400 1500),) RCFLAGS += -nologo endif @@ -90,7 +90,7 @@ LIBPATHS := -libpath:$(LIB_DIR) LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) LDFLAGS += -nologo -subsystem:windowsce -nodefaultlib:oldnames.lib -nodefaultlib:kernel32.lib -ifeq ($(filter $(HB_COMPILER_VER),600 700 710),) +ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) LDFLAGS += -manifest:no endif LDFLAGS += $(LIBPATHS) diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk index 6ce725db73..bf70d3fac5 100644 --- a/harbour/config/win/msvc.mk +++ b/harbour/config/win/msvc.mk @@ -17,7 +17,7 @@ CFLAGS += -I. -I$(HB_INC_COMPILE) CFLAGS += -nologo # MSVS 2005 SP1 also supports it, but we only enable it for 2008 and upper. -ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800),) +ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400),) LDFLAGS += -nxcompat -dynamicbase -fixed:no DFLAGS += -nxcompat -dynamicbase endif @@ -40,7 +40,7 @@ else endif ifneq ($(HB_BUILD_OPTIM),no) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) + ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) CFLAGS += -Ogt2yb1p -GX- -G6 else CFLAGS += -O2 @@ -53,7 +53,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) DFLAGS += -debug endif -ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) +ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -MTd else @@ -65,13 +65,13 @@ RC := rc.exe RC_OUT := -fo$(subst x,x, ) RCFLAGS := # Windows SDK 7.0 also supports it, but we cannot detect it. -ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800 900),) +ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400 1500),) RCFLAGS += -nologo endif # # NOTE: -GA flag should be disabled when building MT _.dlls_, # # as it creates bad code according to MS docs [vszakats]. -# ifneq ($(filter $(HB_COMPILER_VER),600),) +# ifneq ($(filter $(HB_COMPILER_VER),1200),) # CFLAGS += -GA # endif diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index 8a710a1796..4eb2a7cb30 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -21,7 +21,7 @@ ifeq ($(HB_COMPILER),poccarm) endif # NOTE: old msvcarm can't cope with some PP directives. [vszakats] ifeq ($(HB_COMPILER),msvcarm) - ifneq ($(filter $(HB_COMPILER_VER),600 700 710),) + ifneq ($(filter $(HB_COMPILER_VER),1200 1300 1310),) HB_SUPPORTED := no endif endif diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index ab6aa56bf0..bfca8cdfaf 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1063,7 +1063,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) be created. [vszakats] */ ENDIF - nCCompVer := Val( GetEnv( "HB_COMPILER_VER" ) ) /* Format: <09><00>[.<00>] = [.] */ + nCCompVer := Val( GetEnv( "HB_COMPILER_VER" ) ) /* Format: <15><00>[.<00>] = [.] */ /* Autodetect platform */ @@ -3420,12 +3420,12 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) IF Empty( nCCompVer ) /* Compatibility with Harbour GNU Make system */ IF hbmk[ _HBMK_cCOMP ] == "msvcarm" .AND. ! Empty( FindInPath( "clarm" ) ) - nCCompVer := 710 /* Visual Studio .NET 2003 */ + nCCompVer := 1310 /* Visual Studio .NET 2003 */ ELSE - nCCompVer := 800 /* Visual Studio 2005 */ + nCCompVer := 1400 /* Visual Studio 2005 */ ENDIF - /* 900 : Visual Studio 2008 */ - /* 1000 : Visual Studio 2010 */ + /* 1500 : Visual Studio 2008 */ + /* 1600 : Visual Studio 2010 */ ENDIF IF hbmk[ _HBMK_lDEBUG ] @@ -3456,7 +3456,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) cBin_Dyn := cBin_Link ELSE cBin_Lib := "lib.exe" - IF hbmk[ _HBMK_cCOMP ] == "msvcarm" .AND. nCCompVer < 800 + IF hbmk[ _HBMK_cCOMP ] == "msvcarm" .AND. nCCompVer < 1400 cBin_CompC := "clarm.exe" ELSE cBin_CompC := "cl.exe" @@ -3471,13 +3471,13 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) cOpt_CompC := "-nologo -c" IF hbmk[ _HBMK_lOPTIM ] IF hbmk[ _HBMK_cPLAT ] == "wce" - IF nCCompVer >= 800 + IF nCCompVer >= 1400 cOpt_CompC += " -Os -Gy" ELSE cOpt_CompC += " -Oxsb1 -GF" ENDIF ELSE - IF nCCompVer >= 800 + IF nCCompVer >= 1400 cOpt_CompC += " -O2" ELSE cOpt_CompC += " -Ogt2yb1p -GX- -G6" @@ -3485,7 +3485,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) ENDIF ENDIF IF hbmk[ _HBMK_cPLAT ] == "win" - IF nCCompVer < 800 + IF nCCompVer < 1400 IF hbmk[ _HBMK_lDEBUG ] AAdd( hbmk[ _HBMK_aOPTC ], "-MTd" ) ELSE @@ -3504,7 +3504,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) SWITCH hbmk[ _HBMK_nWARN ] CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-W4" ) ; EXIT CASE _WARN_YES - IF hbmk[ _HBMK_cCOMP ] == "msvcarm" .AND. nCCompVer < 800 + IF hbmk[ _HBMK_cCOMP ] == "msvcarm" .AND. nCCompVer < 1400 /* Lowered warning level to avoid large amount of warnings in system headers. Maybe this is related to the msvc2003 kit I was using. [vszakats] */ AAdd( hbmk[ _HBMK_aOPTC ], "-W3" ) @@ -3556,7 +3556,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:oldnames.lib" ) AAdd( hbmk[ _HBMK_aOPTD ], "-nodefaultlib:oldnames.lib" ) AAdd( hbmk[ _HBMK_aOPTL ], "-nodefaultlib:kernel32.lib" ) - IF nCCompVer >= 800 + IF nCCompVer >= 1400 AAdd( hbmk[ _HBMK_aOPTL ], "-manifest:no" ) ENDIF ENDIF @@ -3595,7 +3595,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) IF !( hbmk[ _HBMK_cCOMP ] $ "icc|iccia64" ) cBin_Res := "rc.exe" cOpt_Res := "{FR} -fo {OS} {IR}" - IF nCCompVer >= 1000 + IF nCCompVer >= 1600 cOpt_Res := "-nologo " + cOpt_Res /* NOTE: Only in MSVC 2010 and upper. [vszakats] */ ENDIF cResExt := ".res"