release: add contrib/release/build.sh recipe for -winlibs-gcc-8.4

Author: jayrm

contrib/release/build.sh

@@ -59,12 +59,13 @@
 #
 # --recipe name
 #   specify which build recipe to use.  Not all recipes are supported on all targets.
-#       -gcc-5.2.0
-#       -gcc-7.1.0
-#       -gcc-7.1.0r0
-#       -gcc-7.1.0r2
-#       -gcc-7.3.0
-#       -gcc-8.1.0
+#       -gcc-5.2.0          (mingw-w64 project)
+#       -gcc-7.1.0          (mingw-w64 project)
+#       -gcc-7.1.0r0        (mingw-w64 project)
+#       -gcc-7.1.0r2        (mingw-w64 project)
+#       -gcc-7.3.0          (mingw-w64 project)
+#       -gcc-8.1.0          (mingw-w64 project)
+#       -winlibs-gcc-8.4.0  (winlibs)
 #
 # Requirements:
 #   - MSYS environment on Windows with: bash, wget/curl, zip, unzip, patch, make, findutils
@@ -192,7 +193,7 @@ if [ ! -z "$repo_url" ]; then
 fi
 
 # grab the FBSHA1 now, instead of forcing fbc/makefile to do it
-# and we don't want to rely on host having git it the path
+# and we don't want to rely on host having git in the path
 FBSHA1="$(git rev-parse HEAD)"
 
 cd ../..
@@ -252,8 +253,15 @@ download_mingw() {
 get_mingww64_toolchain() {
 	bits="$1"
 	arch="$2"
+	toolchain=mingw-w64
 
 	case "$recipe" in
+	-winlibs-gcc-8.4.0)
+		gccversion=8.4.0
+		mingwbuildsrev=
+		mingwruntime=7.0.0-r1
+		toolchain=winlibs
+		;;
 	-gcc-8.1.0)
 		gccversion=8.1.0
 		mingwbuildsrev=rev0
@@ -279,22 +287,42 @@ get_mingww64_toolchain() {
 		mingwbuildsrev=rev0
 		mingwruntime=v4
 		;;
-	*)
+	"")
 		gccversion=5.2.0
 		mingwbuildsrev=rev0
 		mingwruntime=v4
 		;;
+	*)
+		echo "unknown recipe $recipe"
+		exit 1
 	esac
 
-	dir=Toolchains%20targetting%20Win$bits/Personal%20Builds/mingw-builds/$gccversion/threads-win32/sjlj/
-	file=$arch-$gccversion-release-win32-sjlj-rt_$mingwruntime-$mingwbuildsrev.7z
+	case "$toolchain" in
+	winlibs)
+		dir=brechtsanders/winlibs_mingw/releases/download/$gccversion-$mingwruntime/
 
-	mkdir -p ../input/MinGW-w64
-	download "MinGW-w64/$file" "http://sourceforge.net/projects/mingw-w64/files/$dir$file/download"
+		file=mingw-w64-$arch-$gccversion-$mingwruntime.7z
+		binUrl=https://github.com/$dir$file
+
+		srcfile=src-$gccversion-$mingwruntime.tar.gz
+		srcUrl=https://github.com/brechtsanders/winlibs_mingw/archive/refs/tags/$gccversion-$mingwruntime.tar.gz
+		;;
+
+	*)
+		# mingw-w64 project - personal builds
+		dir=Toolchains%20targetting%20Win$bits/Personal%20Builds/mingw-builds/$gccversion/threads-win32/sjlj/
+
+		file=$arch-$gccversion-release-win32-sjlj-rt_$mingwruntime-$mingwbuildsrev.7z
+		binUrl=http://sourceforge.net/projects/mingw-w64/files/$dir$file/download
 
-	srcfile=src-$gccversion-release-rt_$mingwruntime-$mingwbuildsrev.tar.7z
-	download "MinGW-w64/$srcfile" "http://sourceforge.net/projects/mingw-w64/files/Toolchain%20sources/Personal%20Builds/mingw-builds/$gccversion/$srcfile/download"
+		srcfile=src-$gccversion-release-rt_$mingwruntime-$mingwbuildsrev.tar.7z
+		srcUrl=http://sourceforge.net/projects/mingw-w64/files/Toolchain%20sources/Personal%20Builds/mingw-builds/$gccversion/$srcfile/download
+		;;
+	esac
 
+	mkdir -p ../input/MinGW-w64
+	download "MinGW-w64/$file"    $binUrl
+	download "MinGW-w64/$srcfile" $srcUrl
 	7z x "../input/MinGW-w64/$file" > /dev/null
 }
 
@@ -650,32 +678,69 @@ windowsbuild() {
 	cp bin/gprof.exe	fbc/bin/$fbtarget
 	cp bin/ld.exe		fbc/bin/$fbtarget
 
+	echo $toolchain
+
+	case "$recipe" in
+	-winlibs-gcc-8.4.0)
+		# -winlibs-gcc-X.X is being built from winlibs and the binutils have a few dependencies
+		# copy these to the bin directory - they go with the executables and should
+		# not be used as general libraries
+		cp bin/libdl.dll            fbc/bin/$fbtarget
+		cp bin/libiconv-2.dll       fbc/bin/$fbtarget
+		cp bin/libintl-8.dll        fbc/bin/$fbtarget
+		cp bin/libwinpthread-1.dll  fbc/bin/$fbtarget
+		cp bin/zlib1.dll            fbc/bin/$fbtarget
+		cp bin/gcc.exe fbc/bin/$target
+
+		case "$target" in
+		win32)
+			cp bin/libgcc_s_dw2-1.dll	fbc/bin/$fbtarget
+			# copy all the dll's from libexec; they are needed for cc1.exe
+			cp --parents libexec/gcc/i686-w64-mingw32/$gccversion/cc1.exe fbc/bin
+			cp --parents libexec/gcc/i686-w64-mingw32/$gccversion/*.dll   fbc/bin
+			;;
+		win64)
+			cp bin/libgcc_s_seh-1.dll	fbc/bin/$fbtarget
+			# copy all the dll's from libexec; they are needed for cc1.exe
+			cp --parents libexec/gcc/x86_64-w64-mingw32/$gccversion/cc1.exe fbc/bin
+			cp --parents libexec/gcc/x86_64-w64-mingw32/$gccversion/*.dll   fbc/bin
+			;;
+		*)
+			echo "invalid target $target"
+			exit 1
+			;;
+		esac
+		;;
+	*)
+		case "$target" in
+		win32)
+			# !!! TODO !!! re-evaluate the gdb used with later gcc versions
+			# Take MinGW.org's gdb, because the gdb from the MinGW-w64 toolchain has much more
+			# dependencies (e.g. Python for scripting purposes) which we probably don't want/need.
+			# (this should probably be reconsidered someday)
+			cp mingworg-gdb/bin/gdb.exe		fbc/bin/win32
+			cp mingworg-gdb/bin/libgcc_s_dw2-1.dll	fbc/bin/win32
+			cp mingworg-gdb/bin/zlib1.dll		fbc/bin/win32
+			;;
+		win32-mingworg)
+			cp bin/gdb.exe			fbc/bin/win32
+			cp bin/libgcc_s_dw2-1.dll	fbc/bin/win32
+			cp bin/zlib1.dll		fbc/bin/win32
+			;;
+		win64)
+			cp bin/gcc.exe fbc/bin/win64
+			cp --parents libexec/gcc/x86_64-w64-mingw32/$gccversion/cc1.exe fbc/bin
+			;;
+		esac
+		;;
+	esac
+
 	cd fbc && make mingw-libs ENABLE_STANDALONE=1 && cd ..
 
 	if [ $fbtarget = "win32" ]; then
 		cd fbc/lib/win32 && make && cd ../../..
 	fi
 
-	case "$target" in
-	win32)
-		# Take MinGW.org's gdb, because the gdb from the MinGW-w64 toolchain has much more
-		# dependencies (e.g. Python for scripting purposes) which we probably don't want/need.
-		# (this should probably be reconsidered someday)
-		cp mingworg-gdb/bin/gdb.exe		fbc/bin/win32
-		cp mingworg-gdb/bin/libgcc_s_dw2-1.dll	fbc/bin/win32
-		cp mingworg-gdb/bin/zlib1.dll		fbc/bin/win32
-		;;
-	win32-mingworg)
-		cp bin/gdb.exe			fbc/bin/win32
-		cp bin/libgcc_s_dw2-1.dll	fbc/bin/win32
-		cp bin/zlib1.dll		fbc/bin/win32
-		;;
-	win64)
-		cp bin/gcc.exe fbc/bin/win64
-		cp --parents libexec/gcc/x86_64-w64-mingw32/$gccversion/cc1.exe fbc/bin
-		;;
-	esac
-
 	cp ../input/$libffi_title/$target$recipe/libffi.a fbc/lib/$fbtarget
 
 	# Reduce .exe sizes by dropping debug info