Skip to content

Commit

Permalink
Clean up range support and make distinct notices
Browse files Browse the repository at this point in the history
  • Loading branch information
idavis committed May 31, 2024
1 parent 32377f2 commit 4494a2d
Show file tree
Hide file tree
Showing 8 changed files with 5,947 additions and 146 deletions.
2 changes: 1 addition & 1 deletion .ado/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
- pwsh: |
New-Item -Path $(Build.SourcesDirectory)/target/stdlib -ItemType Directory -Force
Copy-Item -Path $(Build.SourcesDirectory)/stdlib/include/qir_stdlib.h -Destination $(Build.SourcesDirectory)/target/stdlib -Force
Copy-Item -Path $(Build.SourcesDirectory)/pip/NOTICE.txt -Destination $(Build.SourcesDirectory)/target/stdlib -Force
Copy-Item -Path $(Build.SourcesDirectory)/stdlib/NOTICE.txt -Destination $(Build.SourcesDirectory)/target/stdlib -Force
Copy-Item -Path $(Build.SourcesDirectory)/LICENSE -Destination $(Build.SourcesDirectory)/target/stdlib -Force
displayName: Organize qir-stdlib artifacts (all platforms)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
run: |
New-Item -Path ./target/stdlib -ItemType Directory -Force
Copy-Item -Path ./stdlib/include/qir_stdlib.h -Destination ./target/stdlib -Force
Copy-Item -Path ./pip/NOTICE.txt -Destination ./target/stdlib -Force
Copy-Item -Path ./stdlib/NOTICE.txt -Destination ./target/stdlib -Force
Copy-Item -Path LICENSE -Destination ./target/stdlib -Force
shell: pwsh

Expand Down
4 changes: 2 additions & 2 deletions notice.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ function update-noticefiles {
# as it is a hidden transitive dependency.
# https://github.com/EmbarkStudios/cargo-about
$config = Join-Path $PSScriptRoot notice.toml
$template = Join-Path $PSScriptRoot notice.hbs
foreach ($project in @("runner")) {
foreach ($project in @("pip", "stdlib")) {
Push-Location $project
try {
$template = Join-Path $PSScriptRoot $project notice.hbs
$notice = Join-Path $PSScriptRoot $project NOTICE.txt
cargo about generate --config $config --all-features --output-file $notice $template
$contents = Get-Content -Raw $notice
Expand Down
3,828 changes: 3,687 additions & 141 deletions pip/NOTICE.txt

Large diffs are not rendered by default.

File renamed without changes.
2 changes: 1 addition & 1 deletion runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ default-features = false
features = ["llvm14-0"]

[dependencies]
qir-stdlib = { path = "../stdlib", features = ["range-support"] }
qir-stdlib = { path = "../stdlib" }
qir-backend = { path = "../backend" }
clap = { version = "4.5.4", features = [ "cargo" ] }
msvc_spectre_libs = { version = "0.1", features = ["error"] }
Expand Down
2,239 changes: 2,239 additions & 0 deletions stdlib/NOTICE.txt

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions stdlib/notice.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
THIRD PARTY SOFTWARE NOTICES AND INFORMATION
Do Not Translate or Localize

This software incorporates material from third parties.
-------------------------------------------------------------------
This work contains work released under the following licenses:
{{#each overview}}- {{id}} ({{count}})
{{/each}}
{{#each licenses}}{{#each used_by}}{{crate.name}} {{crate.version}} - SPDX: {{../id}} - {{../name}}
{{#if crate.repository}}{{crate.repository}}{{else}}https://crates.io/crates/{{crate.name}}{{/if}}
{{../text}}
{{/each}}{{/each}}

0 comments on commit 4494a2d

Please sign in to comment.