Release 17.2.4.500-1.

Build script: Fix Mesa version detection logic epic fail with release candidates.
pal1000 · Oct 30, 2017 · 92f85dd · 92f85dd
1 parent 8e9c2fa
commit 92f85dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/buildscript/build.cmd b/buildscript/build.cmd
@@ -114,9 +114,11 @@
 @cd mesa
 @set LLVM=%mesa%\llvm\%abi%
 @set /p mesaver=<VERSION
-@if %mesaver:~-5%==devel set mesaver=%mesaver:~0,-6%
+@if "%mesaver:~-7%"=="0-devel" set /a intmesaver=%mesaver:~0,2%%mesaver:~3,1%00
+@if "%mesaver:~5,4%"=="0-rc" set /a intmesaver=%mesaver:~0,2%%mesaver:~3,1%00+%mesaver:~9%
+@if NOT "%mesaver:~5,2%"=="0-" set /a intmesaver=%mesaver:~0,2%%mesaver:~3,1%50+%mesaver:~5%
 @set branch=%mesaver:~0,4%
-@set /a mesaver=%mesaver:~0,2%%mesaver:~3,1%00+%mesaver:~5%
+@set mesaver=%intmesaver%
 @if EXIST mesapatched.ini GOTO build_mesa
 @if %prepfail% EQU 1 GOTO build_mesa
 @git apply -v ..\mesa-dist-win\patches\s3tc.patch

diff --git 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.2.3.500-1"
+#define MyAppVersion "17.2.4.500-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
@@ -5,7 +5,7 @@
 - [Manual OpenGL context configuration](#manual-opengl-context-configuration) 
 
 # Downloads
-Mesa 17.2.3 builds are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases)
+Mesa 17.2.4 builds are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases)
 
 By default mesa uses llvmpipe. You can switch to OpenSWR by setting GALLIUM_DRIVER environment variable value to swr either globally or in a batch file. Mesa environment variables documentation is available [here](https://mesa3d.org/envvars.html). Build instructions, if you want to replicate my builds, are available [here](https://github.com/pal1000/mesa-dist-win/tree/master/buildscript).
 # Installation and usage

diff --git a/relnotes.md b/relnotes.md
@@ -1,8 +0,0 @@
-# Build script
-- Dead variables clean-up.
-- Load Visual Studio environment only when building LLVM with Ninja.
-- S3TC build: If both MSYS2 and standalone Mingw-W64 are installed let the user pick which to use.
-- S3TC MSYS2 build: prefer 64-bit MSYS2 over 32-bit if both installed.
-# Build script documentation
-- S3TC build with standalone Mingw-w64 is no longer deprecated. GCC 7.2 update finally took place.
-- You are now asked which flavor of Mingw-W64 to use when building S3TC if both MSYS2 and standalone are installed.