From 173bfbf7886608a4a7abbfac6a42ac4bf4a3432d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 20 Sep 2020 16:14:20 +0100 Subject: New upstream version 1.5.0 --- windows/build.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'windows/build.ps1') diff --git a/windows/build.ps1 b/windows/build.ps1 index aaa848d..a65fdd9 100644 --- a/windows/build.ps1 +++ b/windows/build.ps1 @@ -12,11 +12,11 @@ $ErrorActionPreference = "Continue" # LibreSSL coordinates. New-Variable -Name 'LIBRESSL_URL' ` -Value 'https://ftp.openbsd.org/pub/OpenBSD/LibreSSL' -Option Constant -New-Variable -Name 'LIBRESSL' -Value 'libressl-3.0.2' -Option Constant +New-Variable -Name 'LIBRESSL' -Value 'libressl-3.1.4' -Option Constant # libcbor coordinates. -New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.5.0' -Option Constant -New-Variable -Name 'LIBCBOR_BRANCH' -Value 'v0.5.0' -Option Constant +New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.7.0' -Option Constant +New-Variable -Name 'LIBCBOR_BRANCH' -Value 'v0.7.0' -Option Constant New-Variable -Name 'LIBCBOR_GIT' -Value 'https://github.com/pjk/libcbor' ` -Option Constant @@ -149,7 +149,7 @@ Function Build(${OUTPUT}, ${GENERATOR}, ${ARCH}) { -DCMAKE_INSTALL_PREFIX="${OUTPUT}" & $CMake --build . --config Release & $CMake --build . --config Release --target install - "cbor.dll", "crypto-45.dll" | %{ Copy-Item "${OUTPUT}\bin\$_" ` + "cbor.dll", "crypto-46.dll" | %{ Copy-Item "${OUTPUT}\bin\$_" ` -Destination "examples\Release" } } @@ -161,15 +161,15 @@ Function Package-Headers() { Function Package-Libraries(${SRC}, ${DEST}) { Copy-Item "${SRC}\bin\cbor.dll" "${DEST}" -ErrorAction Stop Copy-Item "${SRC}\lib\cbor.lib" "${DEST}" -ErrorAction Stop - Copy-Item "${SRC}\bin\crypto-45.dll" "${DEST}" -ErrorAction Stop - Copy-Item "${SRC}\lib\crypto-45.lib" "${DEST}" -ErrorAction Stop + Copy-Item "${SRC}\bin\crypto-46.dll" "${DEST}" -ErrorAction Stop + Copy-Item "${SRC}\lib\crypto-46.lib" "${DEST}" -ErrorAction Stop Copy-Item "${SRC}\lib\fido2.dll" "${DEST}" -ErrorAction Stop Copy-Item "${SRC}\lib\fido2.lib" "${DEST}" -ErrorAction Stop } Function Package-PDBs(${SRC}, ${DEST}) { Copy-Item "${SRC}\${LIBRESSL}\crypto\crypto.dir\Release\vc142.pdb" ` - "${DEST}\crypto-45.pdb" -ErrorAction Stop + "${DEST}\crypto-46.pdb" -ErrorAction Stop Copy-Item "${SRC}\${LIBCBOR}\src\cbor_shared.dir\Release\vc142.pdb" ` "${DEST}\cbor.pdb" -ErrorAction Stop Copy-Item "${SRC}\src\fido2_shared.dir\Release\vc142.pdb" ` -- cgit v1.2.3