From 2445e959d023f7017d79348590393da1446cca60 Mon Sep 17 00:00:00 2001 From: "Stefan J. Wernli" Date: Wed, 31 Mar 2021 11:30:01 -0700 Subject: [PATCH 1/3] Minor build script clean-up --- .gitignore | 3 +++ bootstrap.ps1 | 1 + src/QirRuntime/build-qir-runtime.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f77b7e72b01..e9d27d405c8 100644 --- a/.gitignore +++ b/.gitignore @@ -339,3 +339,6 @@ ASALocalRun/ /src/Simulation/Simulators.Tests/TestProjects/QSharpExe/built /src/Simulation/Simulators.Tests/TestProjects/TargetedExe/built dbw_test + +# Generated Q# docs +**/docs \ No newline at end of file diff --git a/bootstrap.ps1 b/bootstrap.ps1 index 15982134618..0365a9f856b 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -22,6 +22,7 @@ if (-not (Test-Path Env:AGENT_OS)) { Push-Location (Join-Path $PSScriptRoot "src/Simulation/Native") .\build-native-simulator.ps1 Pop-Location + $Env:BUILD_CONFIGURATION = $null } Write-Host "Build simulation solution" diff --git a/src/QirRuntime/build-qir-runtime.ps1 b/src/QirRuntime/build-qir-runtime.ps1 index c9ef084f33b..864b216a59a 100644 --- a/src/QirRuntime/build-qir-runtime.ps1 +++ b/src/QirRuntime/build-qir-runtime.ps1 @@ -71,7 +71,7 @@ elseif (($IsWindows) -or ((Test-Path Env:AGENT_OS) -and ($Env:AGENT_OS.StartsWit Write-Host "##vso[task.logissue type=error;]Failed to identify the OS. Will use default CXX compiler" } -$qirRuntimeBuildFolder = (Join-Path $PSScriptRoot "build\$Env:BUILD_CONFIGURATION") +$qirRuntimeBuildFolder = (Join-Path $PSScriptRoot build $Env:BUILD_CONFIGURATION) if (-not (Test-Path $qirRuntimeBuildFolder)) { New-Item -Path $qirRuntimeBuildFolder -ItemType "directory" } @@ -105,7 +105,7 @@ $osQirDropFolder = Join-Path $Env:DROPS_DIR QIR $os if (!(Test-Path $osQirDropFolder)) { New-Item -Path $osQirDropFolder -ItemType "directory" } -$pattern | Foreach-Object { Copy-Item (Join-Path . bin $_) $osQirDropFolder } +$pattern | Foreach-Object { Copy-Item (Join-Path . bin $_) $osQirDropFolder -ErrorAction SilentlyContinue} Pop-Location From 70e10fec7210bd2de25d150910613ca9059db277 Mon Sep 17 00:00:00 2001 From: "Stefan J. Wernli" Date: Thu, 1 Apr 2021 11:55:19 -0700 Subject: [PATCH 2/3] Update gitignore for PR comments --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e9d27d405c8..27c0297d074 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ bld/ [Oo]bj/ [Ll]og/ [Dd]rops/ +[Dd]ocs/ **/qir-gen.ll # Visual Studio 2015/2017 cache/options directory @@ -339,6 +340,3 @@ ASALocalRun/ /src/Simulation/Simulators.Tests/TestProjects/QSharpExe/built /src/Simulation/Simulators.Tests/TestProjects/TargetedExe/built dbw_test - -# Generated Q# docs -**/docs \ No newline at end of file From a639141b90110ab5b91295be26032ef732cbbe49 Mon Sep 17 00:00:00 2001 From: "Stefan J. Wernli" Date: Thu, 1 Apr 2021 12:45:12 -0700 Subject: [PATCH 3/3] Update src/Qir/Runtime/build-qir-runtime.ps1 Co-authored-by: Sarah Marshall <33814365+samarsha@users.noreply.github.com> --- src/Qir/Runtime/build-qir-runtime.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Qir/Runtime/build-qir-runtime.ps1 b/src/Qir/Runtime/build-qir-runtime.ps1 index 1921db6826d..fbca1e2c047 100644 --- a/src/Qir/Runtime/build-qir-runtime.ps1 +++ b/src/Qir/Runtime/build-qir-runtime.ps1 @@ -105,7 +105,7 @@ $osQirDropFolder = Join-Path $Env:DROPS_DIR QIR $os if (!(Test-Path $osQirDropFolder)) { New-Item -Path $osQirDropFolder -ItemType "directory" } -$pattern | Foreach-Object { Copy-Item (Join-Path . bin $_) $osQirDropFolder -ErrorAction SilentlyContinue} +$pattern | Foreach-Object { Copy-Item (Join-Path . bin $_) $osQirDropFolder -ErrorAction SilentlyContinue } Pop-Location @@ -115,4 +115,4 @@ $env:RC = $oldRC if (-not $all_ok) { throw "At least one project failed to compile. Check the logs." -} \ No newline at end of file +}