Fix VS2015 build. Ugh.
This commit is contained in:
parent
8a090bd90b
commit
31970127b6
|
@ -40,6 +40,8 @@ jobs:
|
|||
|
||||
# TODO should it be "etc.bat" amd64 or "etc.bat amd64"?
|
||||
|
||||
# vs2015 {
|
||||
|
||||
- job: windows_386_msvc2015_shared_ninja
|
||||
displayName: 'Windows 386 MSVC2015 Shared Ninja'
|
||||
pool:
|
||||
|
@ -47,7 +49,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
choco install ninja
|
||||
displayName: 'Install Dependencies'
|
||||
|
@ -67,7 +69,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
choco install ninja
|
||||
displayName: 'Install Dependencies'
|
||||
|
@ -87,7 +89,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
|
||||
meson setup build --buildtype=release --default-library=shared --backend=vs2015
|
||||
|
@ -105,7 +107,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
|
||||
meson setup build --buildtype=release --default-library=static --backend=vs2015
|
||||
|
@ -123,7 +125,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
choco install ninja
|
||||
displayName: 'Install Dependencies'
|
||||
|
@ -143,7 +145,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
choco install ninja
|
||||
displayName: 'Install Dependencies'
|
||||
|
@ -163,7 +165,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
|
||||
meson setup build --buildtype=release --default-library=shared --backend=vs2015
|
||||
|
@ -181,7 +183,7 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
- template: azure-pipelines/install-latest-meson.yml
|
||||
- template: azure-pipelines/vs2015-install-latest-python3-meson.yml
|
||||
- script: |
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
|
||||
meson setup build --buildtype=release --default-library=static --backend=vs2015
|
||||
|
@ -192,6 +194,8 @@ jobs:
|
|||
maximumCpuCount: true
|
||||
displayName: 'Build'
|
||||
|
||||
# }
|
||||
|
||||
- job: windows_386_msvc2017_shared_ninja
|
||||
displayName: 'Windows 386 MSVC2017 Shared Ninja'
|
||||
pool:
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
# 4 april 2019
|
||||
# see https://github.com/Microsoft/azure-pipelines-image-generation/issues/374 for context and source
|
||||
steps:
|
||||
- powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe'
|
||||
displayName: 'Download Python 3'
|
||||
- script: |
|
||||
C:\py3-setup.exe /quiet PrependPath=0 InstallAllUsers=0 Include_launcher=0 InstallLauncherAllUsers=0 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37
|
||||
@echo ##vso[task.prependpath]C:\Python37
|
||||
@echo ##vso[task.prependpath]C:\Python37\Scripts
|
||||
displayName: 'Install Python 3'
|
||||
- script: |
|
||||
python -m pip install --upgrade pip setuptools wheel
|
||||
pip install meson
|
||||
displayName: 'Install Latest Meson'
|
Loading…
Reference in New Issue