Mesa (master): Appveyor: Quickly fix meson build.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Nov 14 21:45:28 UTC 2019


Module: Mesa
Branch: master
Commit: cc758f1224b48c2c528ea129330e2fe393e57567
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc758f1224b48c2c528ea129330e2fe393e57567

Author: Prodea Alexandru-Liviu <liviuprodea at yahoo.com>
Date:   Thu Nov 14 21:45:23 2019 +0000

Appveyor: Quickly fix meson build.
As this required use of Python 3.8, mako module also had to be updated.

v2 - Unbind mako module version when using Meson.
Signed-off-by: Prodea Alexandru-Liviu <liviuprodea at yahoo.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 .appveyor/appveyor_msvc.bat | 2 +-
 appveyor.yml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor/appveyor_msvc.bat b/.appveyor/appveyor_msvc.bat
index 695eb0f6d74..1ff4fa62521 100644
--- a/.appveyor/appveyor_msvc.bat
+++ b/.appveyor/appveyor_msvc.bat
@@ -16,7 +16,7 @@ if "%buildsystem%" == "scons" (
     call scons --version
 ) else (
     python --version
-    python -m pip install Mako==1.0.7 meson
+    python -m pip install Mako meson
     meson --version
 
     rem Install pkg-config, which meson requires even on windows
diff --git a/appveyor.yml b/appveyor.yml
index c31c2630f55..5b4c9f7beb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -55,7 +55,7 @@ environment:
     buildsystem: scons
   - compiler: msvc
     buildsystem: meson
-    path: C:\Python37-x64;C:\Python37-x64\Scripts;%path%
+    path: C:\Python38-x64;C:\Python38-x64\Scripts;%path%
 
 install:
 - cmd: .appveyor\appveyor_msvc.bat install




More information about the mesa-commit mailing list