diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4aa5ec5e..8317c684 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 @@ -45,7 +44,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 @@ -73,7 +71,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 @@ -100,7 +97,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 diff --git a/azure-pipelines/build-msbuild.yml b/azure-pipelines/build-msbuild.yml deleted file mode 100644 index 69ab3598..00000000 --- a/azure-pipelines/build-msbuild.yml +++ /dev/null @@ -1,8 +0,0 @@ -# 5 april 2019 - -steps: -- task: MSBuild@1 - inputs: - solution: 'build/*.sln' - maximumCpuCount: true - displayName: 'Build' diff --git a/azure-pipelines/build-ninja.yml b/azure-pipelines/build.yml similarity index 100% rename from azure-pipelines/build-ninja.yml rename to azure-pipelines/build.yml diff --git a/azure-pipelines/configure.yml b/azure-pipelines/configure.yml index ec0c093e..aec307fe 100644 --- a/azure-pipelines/configure.yml +++ b/azure-pipelines/configure.yml @@ -3,10 +3,9 @@ parameters: beforeConfigure: '' defaultLibrary: 'must-be-set' - backend: 'must-be-set' steps: - script: | ${{ 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' diff --git a/azure-pipelines_linux b/azure-pipelines_linux index 6ed4cc61..05cb6cb6 100644 --- a/azure-pipelines_linux +++ b/azure-pipelines_linux @@ -19,7 +19,6 @@ jobs: - template: azure-pipelines/configure.yml parameters: defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml - template: azure-pipelines/darwinunix-artifacts.yml parameters: @@ -44,7 +43,6 @@ jobs: - template: azure-pipelines/configure.yml parameters: defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml - template: azure-pipelines/darwinunix-artifacts.yml parameters: @@ -75,7 +73,6 @@ jobs: parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) @@ -101,7 +98,6 @@ jobs: parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) diff --git a/azure-pipelines_main b/azure-pipelines_main index 40926063..e0c7b312 100644 --- a/azure-pipelines_main +++ b/azure-pipelines_main @@ -18,7 +18,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 @@ -37,7 +36,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 @@ -60,7 +58,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 @@ -79,7 +76,6 @@ jobs: parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 @@ -102,7 +98,6 @@ jobs: parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) @@ -121,7 +116,6 @@ jobs: parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) @@ -140,7 +134,6 @@ jobs: parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) defaultLibrary: shared - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) @@ -159,7 +152,6 @@ jobs: parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) defaultLibrary: static - backend: ninja - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)