Release 18.0.3.600-1

Update Inno Setup script. It was broken two-fold, once when osmesa DLLs were moved to dedicated folders and again when deployment tool was split in two.
pal1000 · May 7, 2018 · d3b5526 · d3b5526
1 parent 1d002b1
commit d3b5526
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
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 "18.0.2.600-1"
+#define MyAppVersion "18.0.3.600-1"
 #define MyAppPublisher "Pal100x"
 #define MyAppURL "https://github.com/pal1000/mesa-dist-win"
 #define MyAppExeName "mesa-{#MyAppVersion}-setup.exe"
@@ -33,36 +33,39 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "bin\x86\opengl32.dll"; DestDir: "{app}\x86"; Flags: ignoreversion
-Source: "bin\x86\osmesa-gallium.dll"; DestDir: "{app}\x86"; Flags: ignoreversion
-Source: "bin\x86\osmesa-swrast.dll"; DestDir: "{app}\x86"; Flags: ignoreversion
+Source: "bin\x86\osmesa-gallium\osmesa.dll"; DestDir: "{app}\x86\osmesa-gallium"; Flags: ignoreversion
+Source: "bin\x86\osmesa-swrast\osmesa.dll"; DestDir: "{app}\x86\osmesa-swrast"; Flags: ignoreversion
 Source: "bin\x86\graw.dll"; DestDir: "{app}\x86"; Flags: ignoreversion
 Source: "bin\x64\opengl32.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "bin\x64\swrAVX.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "bin\x64\swrAVX2.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "bin\x64\osmesa-gallium.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "bin\x64\osmesa-swrast.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "bin\x64\osmesa-gallium\osmesa.dll"; DestDir: "{app}\x64\osmesa-gallium"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "bin\x64\osmesa-swrast\osmesa.dll"; DestDir: "{app}\x64\osmesa-swrast"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "bin\x64\graw.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "bin\quickdeploy.cmd"; DestDir: "{app}"
+Source: "bin\perappdeploy.cmd"; DestDir: "{app}"
+Source: "bin\systemwidedeploy.cmd"; DestDir: "{app}"
 Source: "bin\readme.txt"; DestDir: "{app}"
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [UninstallDelete]
 Type: files; Name: "{app}\x86\opengl32.dll"
 Type: files; Name: "{app}\x86\graw.dll";
-Type: files; Name: "{app}\x86\osmesa-gallium.dll"
-Type: files; Name: "{app}\x86\osmesa-swrast.dll"
+Type: files; Name: "{app}\x86\osmesa-gallium\osmesa.dll"
+Type: files; Name: "{app}\x86\osmesa-swrast\osmesa.dll"
 Type: files; Name: "{app}\x64\opengl32.dll"; Check: Is64BitInstallMode
 Type: files; Name: "{app}\x64\swrAVX.dll"; Check: Is64BitInstallMode
 Type: files; Name: "{app}\x64\swrAVX2.dll"; Check: Is64BitInstallMode
-Type: files; Name: "{app}\x64\osmesa-gallium.dll"; Check: Is64BitInstallMode
-Type: files; Name: "{app}\x64\osmesa-swrast.dll"; Check: Is64BitInstallMode
+Type: files; Name: "{app}\x64\osmesa-gallium\osmesa.dll"; Check: Is64BitInstallMode
+Type: files; Name: "{app}\x64\osmesa-swrast\osmesa.dll"; Check: Is64BitInstallMode
 Type: files; Name: "{app}\x64\graw.dll"; Check: Is64BitInstallMode
-Type: files; Name: "{app}\quickdeploy.cmd"
+Type: files; Name: "{app}\perappdeploy.cmd"
+Type: files; Name: "{app}\systemwidedeploy.cmd"
 Type: files; Name: "{app}\readme.txt"
 
 [Icons]
-Name: "{commondesktop}\Mesa3D quick deployment utility"; Filename: "{app}\quickdeploy.cmd"
+Name: "{commondesktop}\Mesa3D per-application deployment utility"; Filename: "{app}\quickdeploy.cmd"
+Name: "{commondesktop}\Mesa3D system-wide deployment utility"; Filename: "{app}\systemwidedeploy.cmd"
 
 [Run]
 Filename: "{app}\readme.txt"; Description: "View the README file"; Flags: postinstall shellexec skipifsilent
diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@
 - [Manual OpenGL context configuration](#manual-opengl-context-configuration) 
 
 # Downloads
-Mesa 18.0.2 builds are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases)
+Mesa 18.0.3 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/releasenotes.md b/releasenotes.md
@@ -1,18 +1,23 @@
-# Upcomming release
+# 18.0.3.600-1
+- Updated Mesa3D to [18.0.3](https://www.mesa3d.org/relnotes/18.0.3.html).
+### Inno Setup
+- Update Inno Setup script. It was broken two-fold, once when osmesa DLLs were moved to dedicated folders and again when deployment tool was split in two.
 ### Build script
 - Fix Python 3.x version retrieval;
 - Implement Python version validation without depending on Python launcher;
 - Add /enablemeson command line switch to try Mesa3D Meson build;
 - Python launcher interface is always used if possible;
 - Python launcher interface: Support 32-bit Python on 64-bit Windows;
 - Fix pypi based pywin32 installation again, the part that needs to run as admin was previously unreachable;
-- wheel package is required to install Scons on Python 2.7.15, it also makes possible to uninstall pywin32 cleanly which may provide the means for error-free upgrade.
+- wheel package is required to install Scons on Python 2.7.15, it also makes possible to uninstall pywin32 cleanly which may provide the means for error-free upgrade;
+- Python launcher interface: Lookup for Python 3.x even if /enablemeson command line argument is unset as LLVM build can use it. Display appropriate warnings.
 ### Build environment updates
 - Updated build machine OS to Windows 10 April 2018;
 - Windows 10 SDK 10.0.16299.91 -> 10.0.17134.12;
 - Python 2.7.14 -> 2.7.15;
 - Installed wheel 0.31.0.
 # 18.0.2.600-1
+- Updated Mesa3D to [18.0.2](https://www.mesa3d.org/relnotes/18.0.2.html).
 ### Build script
 - Python packages update: Use grid format pip list and skip pypiwin32 as well. This fixes the known issue from 18.0.1.600-1;
 - Python launcher interface - handle too old Python versions gracefully;
@@ -26,6 +31,7 @@
 - Visual Studio 15.6.6 -> 15.6.7
 - setuptools 39.0.1 -> 39.1.0
 # 18.0.1.600-1
+- Updated Mesa3D to [18.0.1](https://www.mesa3d.org/relnotes/18.0.1.html).
 ### Deployment
 - Per app deployment: Make text fit into Windows 7 default Command Prompt size.
 ### Build script
@@ -49,7 +55,7 @@
 ### Known issue
 - The text may turn red in the Command Prompt in which the build script is running after updating Python packages. This is a glitch caused by pip 10.0.0.
 # 18.0.0.600-1
-- Updated Mesa3D to [18.0.0](https://www.mesa3d.org/relnotes/18.0.0.html)
+- Updated Mesa3D to [18.0.0](https://www.mesa3d.org/relnotes/18.0.0.html).
 ### Build environment updates
 - pip 9.0.2 -> 9.0.3
 - Visual Studio 15.6.3 -> 15.6.4
@@ -79,7 +85,7 @@
 ### Misc
 - Made release notes incremental.
 # 17.3.6.501-1
-- Mesa3D 17.3.6 [release notes](https://www.mesa3d.org/relnotes/17.3.6.html)
+- Mesa3D 17.3.6 [release notes](https://www.mesa3d.org/relnotes/17.3.6.html).
 ### Build environment updates
 - Git 2.16.1.4 -> 2.16.2.1
 - Visual Studio 15.5.6 -> 15.5.7
@@ -96,11 +102,11 @@
 ### Won't fix
 - This release breaks osmesa deployments performed with quick deployment utility. A re-deployment is required. Manual copy-pastes of osmesa libraries are unaffected.
 # 17.3.5.501-1
-- Updated Mesa3D to [17.3.5](https://www.mesa3d.org/relnotes/17.3.5.html)
+- Updated Mesa3D to [17.3.5](https://www.mesa3d.org/relnotes/17.3.5.html).
 ### Build script
 - Allow distribution creation without building Mesa if we have binaries from a past build.
 # 17.3.4.501-1
-- Updated Mesa3D to [17.3.4](https://www.mesa3d.org/relnotes/17.3.4.html)
+- Updated Mesa3D to [17.3.4](https://www.mesa3d.org/relnotes/17.3.4.html).
 ### Build environment updates
 - pywin32 221 -> 222.
 - Visual Studio 15.5.4 -> 15.5.6.