]> _ Git - alire.git/commit
Alire.Properties.Licenses: Add support of SPDX expression (#629)
authorFabien Chouteau <Fabien-Chouteau@users.noreply.github.com>
Wed, 13 Jan 2021 13:11:11 +0000 (14:11 +0100)
committerGitHub <noreply@github.com>
Wed, 13 Jan 2021 13:11:11 +0000 (14:11 +0100)
commitb9e8a6425e9ac330f66feba8f1577c5f72f8d7ae
tree3d51a830e8a6493969df3916b475a0b2cc61dff7
parentccab13317b0fc1eced8017424f7c4e4e655d8ab5
Alire.Properties.Licenses: Add support of SPDX expression  (#629)

* Alire.Properties.Licenses: Add support of SPDX expression

The legacy license support is still available but will trigger warning
messages.

* Update catalog-format-spec.md

* Add support for custom license ID

* Update catalog-format-spec.md

* Update alire.toml

* tests/index/bad-license-too-long: fix index version
114 files changed:
.gitmodules
alire.gpr
alire.toml
alr_env.gpr
deps/spdx [new submodule]
doc/catalog-format-spec.md
src/alire/alire-licensing.ads
src/alire/alire-properties-licenses.adb
src/alire/alire-properties-licenses.ads
testsuite/fixtures/basic_index/he/hello/hello-1.0.0.toml
testsuite/fixtures/basic_index/he/hello/hello-1.0.1.toml
testsuite/fixtures/basic_index/li/libhello/libhello-1.0.0.toml
testsuite/fixtures/basic_index/ma/make/make-external.toml
testsuite/fixtures/cases_index/he/hello/hello-1.0.1.toml
testsuite/fixtures/cases_index/li/libhello/libhello-1.0.0-linuxonly.toml
testsuite/fixtures/cases_index/li/libhello/libhello-1.0.0-unavail.toml
testsuite/fixtures/cases_index/li/libhello/libhello-1.0.0.toml
testsuite/fixtures/cases_index/li/libhello/libhello-external.toml
testsuite/fixtures/checked_index/li/libhello/libhello-1.0.0-git.toml
testsuite/fixtures/checked_index/li/libhello/libhello-1.0.0-gitbad.toml
testsuite/fixtures/checked_index/li/libhello/libhello-1.0.0-tarball.toml
testsuite/fixtures/git_index/li/libfoo/libfoo-1.0.0-git.toml
testsuite/fixtures/native_index/li/libhello/libhello-0.9.0-test-unav-native.toml
testsuite/fixtures/native_index/li/libhello/libhello-1.0.0.toml
testsuite/fixtures/native_index/ma/make/make-external.toml
testsuite/fixtures/run_index/no/noop/noop-1.0.0-default.toml
testsuite/fixtures/run_index/no/noop/noop-1.0.0-multi.toml
testsuite/fixtures/run_index/no/noop/noop-1.0.0-nondef.toml
testsuite/fixtures/solver_index/he/hello/hello-1.0.0.toml
testsuite/fixtures/solver_index/he/hello/hello-1.0.1.toml
testsuite/fixtures/solver_index/he/hello/hello-2.0.0.toml
testsuite/fixtures/solver_index/he/hello/hello-3.0.0.toml
testsuite/fixtures/solver_index/he/hello/hello-4.0.0.toml
testsuite/fixtures/solver_index/li/libhello/libhello-1.0.0.toml
testsuite/fixtures/solver_index/li/libhello/libhello-1.0.1.toml
testsuite/fixtures/solver_index/li/libhello/libhello-1.1.0.toml
testsuite/fixtures/solver_index/li/libhello/libhello-2.0.0.toml
testsuite/fixtures/solver_index/ma/make/make-external.toml
testsuite/fixtures/solver_index/su/superhello/superhello-1.0.0.toml
testsuite/run.py
testsuite/tests/get/backup-user-manifest/my_index/index/cr/crate/crate-1.0.0.toml
testsuite/tests/get/build/my_index/index/ba/bad/bad-1.0.0.toml
testsuite/tests/get/build/my_index/index/go/good/good-1.0.0.toml
testsuite/tests/get/external-tool-dependency/my_index/ma/main/main-1.0.0.toml
testsuite/tests/get/external-tool-dependency/my_index/ma/make/make-external.toml
testsuite/tests/get/indirect-link/my_index/index/ti/tier1/tier1-1.0.0.toml
testsuite/tests/get/indirect-link/my_index/index/ti/tier2/tier2-1.0.0.toml
testsuite/tests/get/indirect-link/my_index/index/ti/tier3/tier3-1.0.0.toml
testsuite/tests/index/bad-action-command/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/bad-license-too-long/my_index/index/he/hello_world/hello_world-0.1.0.toml [new file with mode: 0644]
testsuite/tests/index/bad-license-too-long/my_index/index/index.toml [new file with mode: 0644]
testsuite/tests/index/bad-license-too-long/test.py [new file with mode: 0644]
testsuite/tests/index/bad-license-too-long/test.yaml [new file with mode: 0644]
testsuite/tests/index/bad-license/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/bad-license/test.py
testsuite/tests/index/bad-tag/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/empty-tag/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/environment/my_index/index/he/hello/hello-1.0.0.toml
testsuite/tests/index/external-available/my_index/cr/crate/crate-external.toml
testsuite/tests/index/external-from-output/my_index/index/ma/make/make-external.toml
testsuite/tests/index/external-hint/my_index/cr/crate/crate-external.toml
testsuite/tests/index/external-hint/my_index/cr/crate_master/crate_master-1.0.0.toml
testsuite/tests/index/external-msys2/my_index/di/dialog/dialog-external.toml
testsuite/tests/index/external-msys2/my_index/ma/main/main-1.0.0.toml
testsuite/tests/index/external-unindexed/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/external-unindexed/my_index/index/he/hello_world/hello_world-external.toml
testsuite/tests/index/long-description/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/long-tag/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/maint-bad-email/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/maint-bad-login/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/mismatched-crate/my_index/index/cr/crate/misplaced_crate-1.0.0.toml
testsuite/tests/index/mismatched-parent/my_index/index/cr/bad_parent/crate-1.0.0.toml
testsuite/tests/index/origin-filesystem-bad-path/bad_index_1/he/hello/hello-1.0.0.toml
testsuite/tests/index/origin-filesystem-bad-path/bad_index_2/he/hello/hello-1.0.0.toml
testsuite/tests/index/origin-no-archive-name/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/origin-unknown-kind/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/too-long-short-description/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/index/unexpected-contents/my_index/index/cr/crate/crate-1.0.0.toml
testsuite/tests/pin/all/my_index/index/he/hello1/hello1-0.1.0.toml
testsuite/tests/pin/all/my_index/index/he/hello2/hello2-0.1.0.toml
testsuite/tests/pin/change-type/my_index/li/libhello/libhello-1.0.0.toml
testsuite/tests/pin/downgrade/my_index/index/li/libchild/libchild-0.1.0.toml
testsuite/tests/pin/downgrade/my_index/index/li/libchild/libchild-0.2.0.toml
testsuite/tests/pin/downgrade/my_index/index/li/libparent/libparent-1.0.0.toml
testsuite/tests/pin/pin-dir-with-regular/my_index/li/libhello/libhello-1.0.0.toml
testsuite/tests/pin/pin-dir/my_index/li/libhello/libhello-1.0.0.toml
testsuite/tests/pin/post-update/my_index/index/li/libchild/libchild-0.1.0.toml
testsuite/tests/pin/post-update/my_index/index/li/libchild/libchild-0.2.0.toml
testsuite/tests/pin/post-update/my_index/index/li/libparent/libparent-1.0.0.toml
testsuite/tests/pin/unneeded-held/my_index/index/li/libchild/libchild-0.1.0.toml
testsuite/tests/pin/unneeded-held/my_index/index/li/libchild/libchild-0.2.0.toml
testsuite/tests/pin/unneeded-held/my_index/index/li/libparent/libparent-1.0.0.toml
testsuite/tests/printenv/double-set/my_index/index/ch/checkenv/checkenv-1.0.0.toml
testsuite/tests/printenv/double-set/my_index/index/ch/checkparent/checkparent-1.0.0.toml
testsuite/tests/printenv/env-during-fetch/my_index/index/ch/checkenv/checkenv-1.0.0.toml
testsuite/tests/printenv/env-during-fetch/my_index/index/ch/checkparent/checkparent-1.0.0.toml
testsuite/tests/publish/check-build/my_index/index/cr/crate/crate-1.0.0.toml
testsuite/tests/publish/check-properties/my_index/index/cr/crate/crate-1.0.0.toml
testsuite/tests/publish/tarball-plaindir/my_index/index/cr/crate/crate-1.0.0.toml
testsuite/tests/publish/tarball-repo/my_index/index/cr/crate/crate-1.0.0.toml
testsuite/tests/show/jekyll/test.py
testsuite/tests/test/action-test/my_index/index/he/hello/hello-1.0.0.toml
testsuite/tests/update/selective/my_index/index/he/hello1/hello1-0.1.0.toml
testsuite/tests/update/selective/my_index/index/he/hello2/hello2-0.1.0.toml
testsuite/tests/update/selective/my_index/updated/index/he/hello1/hello1-0.1.0.toml
testsuite/tests/update/selective/my_index/updated/index/he/hello1/hello1-0.2.0.toml
testsuite/tests/update/selective/my_index/updated/index/he/hello2/hello2-0.1.0.toml
testsuite/tests/update/selective/my_index/updated/index/he/hello2/hello2-0.2.0.toml
testsuite/tests/with/auto-gpr-with/basic/my_index/ex/extern/extern-external.toml
testsuite/tests/with/auto-gpr-with/basic/my_index/li/libhello_nogprwith/libhello_nogprwith-1.0.0.toml
testsuite/tests/with/auto-gpr-with/gpr_in_subdir/my_index/gp/gpr_in_subdir/gpr_in_subdir-1.0.0.toml
testsuite/tests/with/pin-dir/my_index/index/li/libhello/libhello-1.0.0.toml
testsuite/tests/workflows/action-command/my_index/index/he/hello_world/hello_world-0.1.0.toml
testsuite/tests/workflows/edit/my_index/li/libhello/libhello-1.0.0.toml