interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Part 2 of previous change

This commit is contained in:
Pietro Gagliardi 2019-04-06 23:56:05 -04:00
parent 26449f444f
commit 21d4ad54b6
6 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
azure-pipelines.yml
View File

@ -18,7 +18,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
@ -45,7 +44,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
@ -73,7 +71,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
@ -100,7 +97,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86

8
azure-pipelines/build-msbuild.yml
View File

@ -1,8 +0,0 @@
# 5 april 2019
steps:
- task: MSBuild@1
inputs:
solution: 'build/*.sln'
maximumCpuCount: true
displayName: 'Build'

0
azure-pipelines/build-ninja.yml → azure-pipelines/build.yml
View File

3
azure-pipelines/configure.yml
View File

@ -3,10 +3,9 @@
parameters: parameters:
beforeConfigure: '' beforeConfigure: ''
defaultLibrary: 'must-be-set' defaultLibrary: 'must-be-set'
backend: 'must-be-set'
steps: steps:
- script: | - script: |
${{ parameters.beforeConfigure }} ${{ parameters.beforeConfigure }}
meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }} --backend=${{ parameters.backend }} meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }}
displayName: 'Configure' displayName: 'Configure'

4
azure-pipelines_linux
View File

@ -19,7 +19,6 @@ jobs:
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
- template: azure-pipelines/darwinunix-artifacts.yml - template: azure-pipelines/darwinunix-artifacts.yml
parameters: parameters:
@ -44,7 +43,6 @@ jobs:
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
- template: azure-pipelines/darwinunix-artifacts.yml - template: azure-pipelines/darwinunix-artifacts.yml
parameters: parameters:
@ -75,7 +73,6 @@ jobs:
parameters: parameters:
beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
@ -101,7 +98,6 @@ jobs:
parameters: parameters:
beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)

8
azure-pipelines_main
View File

@ -18,7 +18,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
@ -37,7 +36,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
@ -60,7 +58,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
@ -79,7 +76,6 @@ jobs:
parameters: parameters:
beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
@ -102,7 +98,6 @@ jobs:
parameters: parameters:
beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
@ -121,7 +116,6 @@ jobs:
parameters: parameters:
beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
@ -140,7 +134,6 @@ jobs:
parameters: parameters:
beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
defaultLibrary: shared defaultLibrary: shared
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
@ -159,7 +152,6 @@ jobs:
parameters: parameters:
beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
defaultLibrary: static defaultLibrary: static
backend: ninja
- template: azure-pipelines/build.yml - template: azure-pipelines/build.yml
parameters: parameters:
beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)