From dd69f84d5ccfc74aee724009c4612c6275ebf0f4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Mar 2013 20:27:40 +0100 Subject: [PATCH] 2013-03-25 20:27 UTC+0100 Viktor Szakats (harbour syenar.net) * doc/Makefile - updated for recently deleted file * config/global.mk * utils/hbmk2/hbmk2.prg + autodetect gcc 4.8 * package/winuni/mpkg_win_uni.bat + include sjlj and seh libgcc dlls (starting with gcc 4.8, libgcc dll is required by default) --- ChangeLog.txt | 12 ++++++++++++ config/global.mk | 20 ++++++++++++++++++++ doc/Makefile | 1 - package/winuni/mpkg_win_uni.bat | 4 +++- utils/hbmk2/hbmk2.prg | 5 +++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5492a5a69d..2703ba945e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,18 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-25 20:27 UTC+0100 Viktor Szakats (harbour syenar.net) + * doc/Makefile + - updated for recently deleted file + + * config/global.mk + * utils/hbmk2/hbmk2.prg + + autodetect gcc 4.8 + + * package/winuni/mpkg_win_uni.bat + + include sjlj and seh libgcc dlls + (starting with gcc 4.8, libgcc dll is required by default) + 2013-03-25 16:14 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/template/tests/hbmk.hbm * reverted to not refer to hbtest.hbc diff --git a/config/global.mk b/config/global.mk index a1839bf368..ab17b5c9f0 100644 --- a/config/global.mk +++ b/config/global.mk @@ -597,6 +597,9 @@ ifeq ($(HB_COMPILER),) ifneq ($(HB_COMP_PATH),) HB_COMPILER := mingw64 HB_CPU := x86_64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-*-mingw32-gcc-4.8*),) + HB_COMPILER_VER := 48 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-*-mingw32-gcc-4.7*),) HB_COMPILER_VER := 47 else @@ -608,12 +611,16 @@ ifeq ($(HB_COMPILER),) endif endif endif + endif else HB_COMP_PATH := $(call find_in_path,gcc) ifneq ($(HB_COMP_PATH),) # Check for a mingw64-tdm gcc executable in the same directory ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-w64-mingw32-gcc$(HB_HOST_BIN_EXT)),) HB_COMPILER := mingw64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-w64-mingw32-gcc-4.8*),) + HB_COMPILER_VER := 48 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-w64-mingw32-gcc-4.7*),) HB_COMPILER_VER := 47 else @@ -625,8 +632,12 @@ ifeq ($(HB_COMPILER),) endif endif endif + endif else HB_COMPILER := mingw + ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.8*),) + HB_COMPILER_VER := 48 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.7*),) HB_COMPILER_VER := 47 else @@ -650,6 +661,7 @@ ifeq ($(HB_COMPILER),) endif endif endif + endif endif else HB_COMP_PATH := $(call find_in_path,wcc386) @@ -779,6 +791,9 @@ 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.8*),) + HB_COMPILER_VER := 48 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.7*),) HB_COMPILER_VER := 47 else @@ -790,6 +805,7 @@ ifeq ($(HB_COMPILER),) endif endif endif + endif else ifeq ($(HB_HOST_CPU),x86_64) # mingw-w64 build @@ -798,6 +814,9 @@ ifeq ($(HB_COMPILER),) HB_COMPILER := mingw64 HB_CCPREFIX := x86_64-w64-mingw32- HB_CPU := x86_64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.8*),) + HB_COMPILER_VER := 48 + else ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.7*),) HB_COMPILER_VER := 47 else @@ -809,6 +828,7 @@ ifeq ($(HB_COMPILER),) endif endif endif + endif endif endif endif diff --git a/doc/Makefile b/doc/Makefile index dd3519f4d3..12e99dab7c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -17,7 +17,6 @@ DOC_FILES := \ hdr_tpl.txt \ howtorel.txt \ howtorep.txt \ - inet.txt \ locks.txt \ oldnews.txt \ pcode.txt \ diff --git a/package/winuni/mpkg_win_uni.bat b/package/winuni/mpkg_win_uni.bat index c83535e1be..7281a728e2 100644 --- a/package/winuni/mpkg_win_uni.bat +++ b/package/winuni/mpkg_win_uni.bat @@ -1,7 +1,7 @@ @echo off rem --------------------------------------------------------------- -rem Copyright 2009-2011 Viktor Szakats (harbour syenar.net) +rem Copyright 2009-2013 Viktor Szakats (harbour syenar.net) rem See COPYING.txt for licensing terms. rem --------------------------------------------------------------- @@ -80,6 +80,8 @@ xcopy /y "%HB_DIR_UPX%upx.exe" xcopy /y /s /e "%HB_DIR_MINGW%" %HB_ABSROOT%comp\mingw\ rem del %HB_ABSROOT%comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe +xcopy /y "%HB_DIR_MINGW%\bin\libgcc_s_seh-1.dll" %HB_ABSROOT%bin\ +xcopy /y "%HB_DIR_MINGW%\bin\libgcc_s_sjlj-1.dll" %HB_ABSROOT%bin\ xcopy /y "%HB_DIR_MINGW%\bin\libgcc_s_dw2-1.dll" %HB_ABSROOT%bin\ xcopy /y "%HB_DIR_MINGW%\bin\mingwm10.dll" %HB_ABSROOT%bin\ diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index 9bdd794d83..4a65e33be8 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -2280,6 +2280,11 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit ( hbmk[ _HBMK_cPLAT ] == "wce" .AND. hbmk[ _HBMK_cCOMP ] == "mingwarm" ) DO CASE + CASE File( hb_FNameDir( cPath_CompC ) + "mingw32-gcc-4.8" + hb_osFileMask() ) .OR. ; + File( hb_FNameDir( cPath_CompC ) + "i686-w64-mingw32-gcc-4.8" + hb_osFileMask() ) .OR. ; + File( hb_FNameDir( cPath_CompC ) + "x86_64-pc-mingw32-gcc-4.8" + hb_osFileMask() ) .OR. ; + File( hb_FNameDir( cPath_CompC ) + "x86_64-w64-mingw32-gcc-4.8" + hb_osFileMask() ) + hbmk[ _HBMK_nCOMPVer ] := 48 CASE File( hb_FNameDir( cPath_CompC ) + "mingw32-gcc-4.7" + hb_osFileMask() ) .OR. ; File( hb_FNameDir( cPath_CompC ) + "i686-w64-mingw32-gcc-4.7" + hb_osFileMask() ) .OR. ; File( hb_FNameDir( cPath_CompC ) + "x86_64-pc-mingw32-gcc-4.7" + hb_osFileMask() ) .OR. ;