Split the meson setp into its own template.

2019-04-05 01:42:23 -04:00 · 2019-04-05 01:42:23 -04:00 · ef7a341ec7
parent cd2d5ea78e
commit ef7a341ec7
2 changed files with 100 additions and 70 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -13,9 +13,10 @@ jobs:
  - script: |
      sudo apt-get install libgtk-3-dev ninja-build
    displayName: 'Install Dependencies'
-  - script: |
-      meson setup build --buildtype=release --default-library=shared --backend=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      defaultLibrary: shared
+      backend: ninja
  - template: azure-pipelines/build-ninja.yml

 - job: linux_amd64_static_ninja
@ -30,9 +31,10 @@ jobs:
  - script: |
      sudo apt-get install libgtk-3-dev ninja-build
    displayName: 'Install Dependencies'
-  - script: |
-      meson setup build --buildtype=release --default-library=static --backend=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      defaultLibrary: static
+      backend: ninja
  - template: azure-pipelines/build-ninja.yml

 # vs2015 {
@ -47,10 +49,11 @@ jobs:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.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=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+      defaultLibrary: shared
+      backend: ninja
  - template: azure-pipelines/build-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
@ -65,10 +68,11 @@ jobs:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.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=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+      defaultLibrary: static
+      backend: ninja
  - template: azure-pipelines/build-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
@ -82,10 +86,11 @@ jobs:
  steps:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-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
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+      defaultLibrary: shared
+      backend: vs2015
  - template: azure-pipelines/build-msbuild.yml

 - job: windows_386_msvc2015_static_msbuild
@ -97,10 +102,11 @@ jobs:
  steps:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-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
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+      defaultLibrary: static
+      backend: vs2015
  - template: azure-pipelines/build-msbuild.yml

 - job: windows_amd64_msvc2015_shared_ninja
@ -113,10 +119,11 @@ jobs:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.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=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+      defaultLibrary: shared
+      backend: ninja
  - template: azure-pipelines/build-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
@ -131,10 +138,11 @@ jobs:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.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=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+      defaultLibrary: static
+      backend: ninja
  - template: azure-pipelines/build-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
@ -148,10 +156,11 @@ jobs:
  steps:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-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
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+      defaultLibrary: shared
+      backend: vs2015
  - template: azure-pipelines/build-msbuild.yml

 - job: windows_amd64_msvc2015_static_msbuild
@ -163,10 +172,11 @@ jobs:
  steps:
  - template: azure-pipelines/vs2015-install-python3.yml
  - template: azure-pipelines/install-latest-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
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+      defaultLibrary: static
+      backend: vs2015
  - template: azure-pipelines/build-msbuild.yml

 # }
@ -183,10 +193,11 @@ jobs:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
-      meson setup build --buildtype=release --default-library=shared --backend=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    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-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
@ -201,10 +212,11 @@ jobs:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
-      meson setup build --buildtype=release --default-library=static --backend=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    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-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
@ -218,10 +230,11 @@ jobs:
  steps:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
-      meson setup build --buildtype=release --default-library=shared --backend=vs2017
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
+      defaultLibrary: shared
+      backend: vs2017
  - template: azure-pipelines/build-msbuild.yml

 - job: windows_386_msvc2017_static_msbuild
@ -233,10 +246,11 @@ jobs:
  steps:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
-      meson setup build --buildtype=release --default-library=static --backend=vs2017
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
+      defaultLibrary: static
+      backend: vs2017
  - template: azure-pipelines/build-msbuild.yml

 - job: windows_amd64_msvc2017_shared_ninja
@ -249,10 +263,11 @@ jobs:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-      meson setup build --buildtype=release --default-library=shared --backend=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    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-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
@ -267,10 +282,11 @@ jobs:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
  - template: azure-pipelines/windows-install-ninja.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-      meson setup build --buildtype=release --default-library=static --backend=ninja
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    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-ninja.yml
    parameters:
      beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
@ -284,10 +300,11 @@ jobs:
  steps:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-      meson setup build --buildtype=release --default-library=shared --backend=vs2017
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
+      defaultLibrary: shared
+      backend: vs2017
  - template: azure-pipelines/build-msbuild.yml

 - job: windows_amd64_msvc2017_static_msbuild
@ -299,10 +316,11 @@ jobs:
  steps:
  - template: azure-pipelines/setup-python3.yml
  - template: azure-pipelines/install-latest-meson.yml
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-      meson setup build --buildtype=release --default-library=static --backend=vs2017
-    displayName: 'Configure'
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
+      defaultLibrary: static
+      backend: vs2017
  - template: azure-pipelines/build-msbuild.yml

 # }
--- a/azure-pipelines/configure.yml
+++ b/azure-pipelines/configure.yml
@ -0,0 +1,12 @@
+# 5 april 2019
+
+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 }}
+  displayName: 'Configure'