AppVeyor: switch to cmake/build

4 files changed, 6 insertions, 114 deletions

diff --git a/.appveyor/.gitattributes b/.appveyor/.gitattributes
deleted file mode 100644
index b086bda..0000000
--- a/.appveyor/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.ps1 text eol=crlf
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1
deleted file mode 100644
index d583e48..0000000
--- a/.appveyor/build.ps1
+++ /dev/null
@@ -1,110 +0,0 @@
-param(
-    [string] $BuildDir = $null,
-    [string] $ProjectDir = $null,
-    [string] $Generator = $null,
-    [string] $Platform = $null,
-    [string] $Configuration = $null,
-    [string] $BoostDir = $null,
-    [string] $BoostLibraryDir = $null
-)
-
-$ErrorActionPreference = "Stop";
-Set-PSDebug -Strict
-
-function Invoke-Exe {
-    param(
-        [ScriptBlock] $Cmd,
-        [int[]] $AllowedExitCodes = @(0)
-    )
-
-    $backupErrorActionPreference = $script:ErrorActionPreference
-    $script:ErrorActionPreference = 'Continue'
-
-    try {
-        & $Cmd
-        if ($AllowedExitCodes -notcontains $LastExitCode) {
-            throw "External command failed with exit code ${LastExitCode}: $Cmd"
-        }
-    } finally {
-        $script:ErrorActionPreference = $backupErrorActionPreference
-    }
-}
-
-function Test-AppVeyor {
-    return Test-Path env:APPVEYOR
-}
-
-function Set-AppVeyorDefaults {
-    $script:ProjectDir = $env:APPVEYOR_BUILD_FOLDER
-    $script:BuildDir = 'C:\Projects\build'
-    $script:Generator = switch ($env:APPVEYOR_BUILD_WORKER_IMAGE) {
-        'Visual Studio 2013' { 'Visual Studio 12 2013' }
-        'Visual Studio 2015' { 'Visual Studio 14 2015' }
-        'Visual Studio 2017' { 'Visual Studio 15 2017' }
-        'Visual Studio 2019' { 'Visual Studio 16 2019' }
-        default { throw "Unsupported AppVeyor image: $env:APPVEYOR_BUILD_WORKER_IMAGE" }
-    }
-    $script:Platform = $env:PLATFORM
-    $script:Configuration = $env:CONFIGURATION
-    $script:BoostDir = $env:appveyor_boost_root
-    $script:BoostLibraryDir = $env:appveyor_boost_librarydir
-}
-
-function Build-Project {
-    param(
-        [Parameter(Mandatory=$true)]
-        [string] $ProjectDir,
-        [Parameter(Mandatory=$true)]
-        [string] $BuildDir,
-        [Parameter(Mandatory=$true)]
-        [string] $Generator,
-        [Parameter(Mandatory=$true)]
-        [string] $Platform,
-        [Parameter(Mandatory=$true)]
-        [string] $Configuration,
-        [Parameter(Mandatory=$true)]
-        [string] $BoostDir,
-        [string] $BoostLibraryDir = $null
-    )
-
-    if (-not $BoostLibraryDir) {
-        $BoostLibraryDir = "$BoostDir\stage\lib"
-    }
-
-    mkdir $BuildDir
-    cd $BuildDir
-
-    Invoke-Exe { cmake.exe                     `
-        -G $Generator -A $Platform             `
-        -D "BOOST_ROOT=$BoostDir"              `
-        -D "BOOST_LIBRARYDIR=$BoostLibraryDir" `
-        $ProjectDir
-    }
-    
-    Invoke-Exe { cmake.exe --build . --config $Configuration -- /m }
-}
-
-function Build-ProjectAppVeyor {
-    if (Test-AppVeyor) {
-        Set-AppVeyorDefaults
-        $appveyor_cwd = pwd
-    }
-
-    try {
-        Build-Project                            `
-            -ProjectDir $script:ProjectDir       `
-            -BuildDir $script:BuildDir           `
-            -Generator $script:Generator         `
-            -Platform $script:Platform           `
-            -Configuration $script:Configuration `
-            -BoostDir $script:BoostDir           `
-            -BoostLibraryDir $script:BoostLibraryDir
-    } finally {
-        if (Test-AppVeyor) {
-            cd $appveyor_cwd
-            Set-PSDebug -Off
-        }
-    }
-}
-
-Build-ProjectAppVeyor
diff --git a/appveyor.yml b/appveyor.yml
index 908ff35..ffde1ad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,9 @@ image:
   - Visual Studio 2017
   - Visual Studio 2019
 
+environment:
+  python_exe: C:\Python36-x64\python.exe
+
 platform:
   - Win32
   - x64
@@ -13,12 +16,12 @@ configuration:
   - Debug
   - Release
 
-build_script:
-  - ps: .\.appveyor\build.ps1
-
 install:
   - git submodule update --init --recursive
 
+build_script:
+  - '"%python_exe%" cmake\build\build_appveyor.py --boost "%appveyor_boost_root%" --boost-librarydir "%appveyor_boost_librarydir%"'
+
 for:
 # Only build Release builds on master to speed things up:
 - branches:
diff --git a/cmake b/cmake
-Subproject 22ecbd5bdaec83f9714d21b1510ddc29d8596bc
+Subproject 77571d71ce48a68cbd6d3a931b89d07e298f3f3