From ad1a6ba93eca8ecfaefa03a38c839cb61793b343 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Thu, 15 Feb 2018 23:52:45 +0200 Subject: [PATCH] Release 17.3.4.501-1 Debug script: Backup old llvm-config output. --- buildscript/build.cmd | 6 +++--- debug/llvm-config.cmd | 18 +++++++++++++++--- mesa3d.iss | 2 +- readme.md | 2 +- relnotes.md | 16 ---------------- 5 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 relnotes.md diff --git a/buildscript/build.cmd b/buildscript/build.cmd index 0b53a8ef..d56f54db 100644 --- a/buildscript/build.cmd +++ b/buildscript/build.cmd @@ -130,11 +130,11 @@ @if /i NOT "%buildmesa%"=="y" GOTO exit @echo. @cd %mesa%\mesa -@set openswr=n +@set swrdrv=n @set sconscmd=python %sconsloc% build=release platform=windows machine=%longabi% libgl-gdi -@if %abi%==x64 set /p openswr=Do you want to build OpenSWR drivers? (y=yes): +@if %abi%==x64 set /p swrdrv=Do you want to build swr drivers? (y=yes): @echo. -@if /I "%openswr%"=="y" set sconscmd=%sconscmd% swr=1 +@if /I "%swrdrv%"=="y" set sconscmd=%sconscmd% swr=1 @set /p osmesa=Do you want to build off-screen rendering drivers (y/n): @echo. @if /I "%osmesa%"=="y" set sconscmd=%sconscmd% osmesa diff --git a/debug/llvm-config.cmd b/debug/llvm-config.cmd index 059aec8e..8ff3da9d 100644 --- a/debug/llvm-config.cmd +++ b/debug/llvm-config.cmd @@ -1,4 +1,8 @@ -@cd ../../llvm +@if EXIST llvm-config-old.txt del llvm-config-old.txt +@if EXIST llvm-config.txt REN llvm-config.txt llvm-config-old.txt +@cd ../../ +@IF NOT EXIST llvm GOTO error +@cd llvm @if EXIST x64 ( @cd x64 @GOTO writedebugoutput @@ -7,11 +11,19 @@ @cd x86 @GOTO writedebugoutput ) +@GOTO error :writedebugoutput +@IF EXIST bin ( @cd bin -@del "..\..\..\mesa-dist-win\debug\llvm-config.txt" @llvm-config --libs engine mcjit bitwriter x86asmprinter irreader > "..\..\..\mesa-dist-win\debug\llvm-config.txt" -@echo LLVM config output updated +@echo LLVM config output updated. +@GOTO finished +) + +:error +@echo LLVM is not built yet. Cannot determine required libraries for requested configuration. + +:finished @pause @exit \ No newline at end of file diff --git a/mesa3d.iss b/mesa3d.iss index 4edc1785..fcfe28d3 100644 --- a/mesa3d.iss +++ b/mesa3d.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Mesa3D software rendering drivers for Windows" -#define MyAppVersion "17.3.3.501-1" +#define MyAppVersion "17.3.4.501-1" #define MyAppPublisher "Pal100x" #define MyAppURL "https://github.com/pal1000/mesa-dist-win" #define MyAppExeName "mesa-{#MyAppVersion}-setup.exe" diff --git a/readme.md b/readme.md index 9f149249..84934c05 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ - [Manual OpenGL context configuration](#manual-opengl-context-configuration) # Downloads -Mesa 17.3.3 builds are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases) +Mesa 17.3.4 builds are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases) # Package contents The following Mesa3D drivers are shipped in each release: diff --git a/relnotes.md b/relnotes.md deleted file mode 100644 index bd6d7051..00000000 --- a/relnotes.md +++ /dev/null @@ -1,16 +0,0 @@ -### Build environment updates -- pywin32 221 -> 222. -- Visual Studio 15.5.4 -> 15.5.6. -- setuptools 38.4.0 -> 38.5.1. -- Git 2.16.0.2 -> 2.16.1.4. -### Build script -- Experimental: Get pywin32 via pypi. -- Drop support for libxtc_dxtn standalone library. Mesa3D 17.2 reached end-of-life on 23rd December 2017. -### Build script documentaion -- pywin32 moved to Github. -- Drop support for libxtc_dxtn standalone library and other few miscellaneous changes. -### Inno Setup -- Drop S3TC standalone library support. -- Drop swr 32-bit support. Unsupported upstream. -### Debugging -- Add a script to generate LLVM config output. Allows for finding new LLVM libraries a lot easier using an online diff service like text-compare.com. Makes sending patches upstream easier. \ No newline at end of file