From ebd9daaca4210f21ff0f911dc5bdc208b4646ac2 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 10 Dec 2019 15:35:10 +0300 Subject: AppVeyor/Travis: switch to cmake/build --- .appveyor/.gitattributes | 1 - .appveyor/build.ps1 | 121 ----------------------------------------------- .appveyor/test.ps1 | 102 --------------------------------------- 3 files changed, 224 deletions(-) delete mode 100644 .appveyor/.gitattributes delete mode 100644 .appveyor/build.ps1 delete mode 100644 .appveyor/test.ps1 (limited to '.appveyor') 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 208fab8..0000000 --- a/.appveyor/build.ps1 +++ /dev/null @@ -1,121 +0,0 @@ -param( - [string] $BuildDir = $null, - [string] $ProjectDir = $null, - [string] $Platform = $null, - [string] $Generator = $null, - [string] $Configuration = $null, - [string] $BoostDir = $null, - [string] $BoostLibraryDir = $null, - [bool] $UseAsm = $false -) - -$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 - $script:UseAsm = -not ($env:appveyor_asm -eq '0') -} - -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, - [bool] $UseAsm = $false - ) - - if (-not $BoostLibraryDir) { - $BoostLibraryDir = "$BoostDir\stage\lib" - } - - if ($UseAsm) { - $cmake_asm = 'ON' - } else { - $cmake_asm = 'OFF' - } - - mkdir $BuildDir - cd $BuildDir - - Invoke-Exe { cmake.exe ` - -G $Generator -A $Platform ` - -D "AES_TOOLS_ASM=$cmake_asm" ` - -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 ` - -UseAsm $UseAsm - } finally { - if (Test-AppVeyor) { - cd $appveyor_cwd - Set-PSDebug -Off - } - } -} - -Build-ProjectAppVeyor diff --git a/.appveyor/test.ps1 b/.appveyor/test.ps1 deleted file mode 100644 index 92212b2..0000000 --- a/.appveyor/test.ps1 +++ /dev/null @@ -1,102 +0,0 @@ -param( - [string] $ProjectDir = $null, - [string] $UtilsDir = $null, - [string] $PythonDir = $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 Get-AppVeyorBuildDir { - return 'C:\Projects\build' -} - -function Get-AppVeyorUtilsDir { - $configuration = $env:CONFIGURATION - return "$(Get-AppVeyorBuildDir)\utils\$configuration" -} - -function Get-AppVeyorPythonDir { - $platform = $env:PLATFORM - if ($platform -eq 'x64') { - return 'C:\Python36-x64' - } else { - return 'C:\Python36' - } -} - -function Set-AppVeyorDefaults { - $script:ProjectDir = $env:APPVEYOR_BUILD_FOLDER - $script:UtilsDir = Get-AppVeyorUtilsDir - $script:PythonDir = Get-AppVeyorPythonDir -} - -function Run-ProjectTests { - param( - [Parameter(Mandatory=$true)] - [string] $ProjectDir, - [Parameter(Mandatory=$true)] - [string] $UtilsDir - ) - - $test_dir = "$ProjectDir\test" - cd $test_dir - - Invoke-Exe { python.exe nist.py --path $UtilsDir --log nist.log } - Get-Content nist.log -Tail 5 - Invoke-Exe { python.exe cavp.py --path $UtilsDir --log cavp.log } - Get-Content cavp.log -Tail 5 - Invoke-Exe { python.exe nist.py --path $UtilsDir --log nist_boxes.log --boxes } - Get-Content nist_boxes.log -Tail 5 - Invoke-Exe { python.exe cavp.py --path $UtilsDir --log cavp_boxes.log --boxes } - Get-Content cavp_boxes.log -Tail 5 - Invoke-Exe { python.exe file.py --path $UtilsDir --log file.log } - Get-Content file.log -Tail 5 -} - -function Run-ProjectTestsAppVeyor { - if (Test-AppVeyor) { - Set-AppVeyorDefaults - $appveyor_cwd = pwd - } - - try { - if ($script:PythonDir) { - $env:PATH = "${script:PythonDir};${env:PATH}" - } - - Run-ProjectTests ` - -ProjectDir $script:ProjectDir ` - -UtilsDir $script:UtilsDir - } finally { - if (Test-AppVeyor) { - cd $appveyor_cwd - Set-PSDebug -Off - } - } -} - -Run-ProjectTestsAppVeyor -- cgit v1.2.3