OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appveyor: Use Python3.

Browse Source 
This implied upgrading to the Visual Studio 2019 image, not for VS
itself, but for the newer Python 3.8.5 version it contains, to avoid
UnicodeDecodeError inside modulefinder module when attempting to decode
our UTF-8 encoded Python scripts with cp1252 encoding.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6184>
This commit is contained in:
Jose Fonseca
2020-08-04 14:16:37 +01:00
committed by Marge Bot
parent 0f9fb7ffaa
commit e2c614a415
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.appveyor/appveyor_msvc.bat
View File

@@ -7,13 +7,13 @@ python -m pip install --upgrade pip
python -m pip --version python -m pip --version
if "%buildsystem%" == "scons" ( if "%buildsystem%" == "scons" (
rem Install Mako rem Install Mako
python -m pip install Mako==1.0.7 python -m pip install Mako==1.1.3
rem Install pywin32 extensions, needed by SCons rem Install pywin32 extensions, needed by SCons
python -m pip install pypiwin32 python -m pip install pypiwin32
rem Install python wheels, necessary to install SCons via pip rem Install python wheels, necessary to install SCons via pip
python -m pip install wheel python -m pip install wheel
rem Install SCons rem Install SCons
python -m pip install scons==3.0.1 python -m pip install scons==3.1.2
call scons --version call scons --version
) else ( ) else (
python -m pip install Mako meson python -m pip install Mako meson
@@ -44,7 +44,7 @@ goto :eof
:build_script :build_script
if "%buildsystem%" == "scons" ( if "%buildsystem%" == "scons" (
call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.2 machine=x86 llvm=1
) else ( ) else (
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86
rem We use default-library as static to affect any wraps (such as expat and zlib) rem We use default-library as static to affect any wraps (such as expat and zlib)
@@ -59,7 +59,7 @@ goto :eof
:test_script :test_script
if "%buildsystem%" == "scons" ( if "%buildsystem%" == "scons" (
call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.2 machine=x86 llvm=1 check
) else ( ) else (
call meson test -C builddir call meson test -C builddir
) )

3
appveyor.yml
View File

@@ -40,7 +40,7 @@ cache:
- llvm-5.0.1-msvc2017-mtd.7z - llvm-5.0.1-msvc2017-mtd.7z
- subprojects\packagecache -> subprojects\*.wrap - subprojects\packagecache -> subprojects\*.wrap
os: Visual Studio 2017 os: Visual Studio 2019
init: init:
# Appveyor defaults core.autocrlf to input instead of the default (true), but # Appveyor defaults core.autocrlf to input instead of the default (true), but
@@ -48,6 +48,7 @@ init:
- git config --global core.autocrlf true - git config --global core.autocrlf true
environment: environment:
Path: C:\Python38-x64;C:\Python38-x64\Scripts;%Path%
WINFLEXBISON_VERSION: 2.5.15 WINFLEXBISON_VERSION: 2.5.15
LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
matrix: matrix: