Release 17.3.6.501-1

Minor updates to build script, build documentation and build configuration.

buildenvconf.md

@@ -59,6 +59,5 @@ Git For Windows portable | 2.16.2.1
 ### Mesa3D
 | | |
 |-|-|
-Build config and execute x64 | scons build=release platform=windows machine=x86_64 libgl-gdi swr=1 osmesa graw-gdi
-Build config and execute x86 | scons build=release platform=windows machine=x86 libgl-gdi osmesa graw-gdi
-
+Build config and execute x64 | scons build=release platform=windows machine=x86_64 libgl-gdi swr=1 graw-gdi osmesa
+Build config and execute x86 | scons build=release platform=windows machine=x86 libgl-gdi graw-gdi osmesa

buildscript/build.cmd

@@ -17,9 +17,10 @@
 @python -m pip install -U scons
 @python -m pip install -U MarkupSafe
 @python -m pip install -U mako
+@set pyupd=y
 @echo.
 )
-@if EXIST %makoloc% set /p pyupd=Install/update python modules (y/n):
+@if /I NOT "%pyupd%"=="y" set /p pyupd=Install/update python modules (y/n):
 @if /I "%pyupd%"=="y" (
 @for /F "delims= " %%i in ('python -m pip list -o --format=legacy') do @if NOT "%%i"=="pywin32" python -m pip install -U "%%i"
 @echo.
@@ -126,7 +127,7 @@
 @if NOT EXIST %LLVM% set /p llvmless=Build Mesa without LLVM (y=yes/n=quit). Only softpipe and osmesa will be available:
 @if NOT EXIST %LLVM% echo.
 @if /I "%llvmless%"=="y" set sconscmd=%sconscmd% llvm=no
-@if /I "%llvmless%"=="y" GOTO build_with_vs
+@if /I "%llvmless%"=="y" GOTO osmesa
 @if /I NOT "%llvmless%"=="y" if NOT EXIST %LLVM% GOTO distcreate
 @set swrdrv=n
 @if %abi%==x64 set /p swrdrv=Do you want to build swr drivers? (y=yes):
@@ -136,10 +137,12 @@
 @echo.
 @if /I "%graw%"=="y" set sconscmd=%sconscmd% graw-gdi
 
-:build_with_vs
+:osmesa
 @set /p osmesa=Do you want to build off-screen rendering drivers (y/n):
 @echo.
 @if /I "%osmesa%"=="y" set sconscmd=%sconscmd% osmesa
+
+:build_with_vs
 @where /q python.exe
 @IF ERRORLEVEL 1 set PATH=%mesa%\Python\;%PATH%
 @set ERRORLEVEL=0

buildscript/readme.md

@@ -81,10 +81,10 @@ The script acts like a Wizard asking for the following during execution:
 - if Git is installed and Mesa code is missing, asks if you don't want to download Mesa code using Git and abort execution;
 - if you intend to download Mesa using Git, you are asked to specify which branch (valid entries: 17.2, 17.3 ...);
 - if you want to build Mesa3D;
-- if you want to build off-screen rendering driver(s);
 - if LLVM is available asks if you want to use it;
 - if LLVM is missing asks if you want to build without it;
 - if LLVM is used you are asked if you want to build swr, graw respectively;
+- if you want to build off-screen rendering driver(s);
 - if you want to do a clean build;
 - if you want to organize binaries in a single location (distribution creation).
 

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.5.501-1"
+#define MyAppVersion "17.3.6.501-1"
 #define MyAppPublisher "Pal100x"
 #define MyAppURL "https://github.com/pal1000/mesa-dist-win"
 #define MyAppExeName "mesa-{#MyAppVersion}-setup.exe"

readme.md

@@ -6,7 +6,7 @@
 - [Manual OpenGL context configuration](#manual-opengl-context-configuration) 
 
 # Downloads
-Mesa 17.3.5 builds are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases)
+Mesa 17.3.6 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: