From abc82c075c4c590394aa33af2339168da3310770 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 4 Apr 2022 13:47:55 +0200 Subject: [PATCH] rename to third-party-licenses --- .gitignore | 4 ++-- Makefile | 6 +++--- accounts/package.json | 4 ++-- idp/package.json | 4 ++-- idp/ui/Makefile | 1 + settings/package.json | 4 ++-- web/Makefile | 1 - 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 1a8783c393..f02e6663ef 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,5 @@ vendor-bin/**/composer.lock # protogen autogenerated protogen/buf.sha1.lock -# licenses -/licenses +# third-party-licenses +/third-party-licenses diff --git a/Makefile b/Makefile index 3064c8e7fd..ff69dbde08 100644 --- a/Makefile +++ b/Makefile @@ -192,9 +192,9 @@ ci-node-check-licenses: .PHONY: ci-go-save-licenses ci-go-save-licenses: $(GO_LICENSES) - @mkdir -p ./licenses/go/ocis/licenses - $(GO_LICENSES) csv ./... > ./licenses/go/ocis/licenses.csv - $(GO_LICENSES) save ./... --force --save_path="./licenses/go/ocis/licenses" + @mkdir -p ./third-party-licenses/go/ocis/third-party-licenses + $(GO_LICENSES) csv ./... > ./third-party-licenses/go/ocis/third-party-licenses.csv + $(GO_LICENSES) save ./... --force --save_path="./third-party-licenses/go/ocis/third-party-licenses" .PHONY: ci-node-save-licenses ci-node-save-licenses: diff --git a/accounts/package.json b/accounts/package.json index 80cf7ce2d8..c7e2ee403b 100644 --- a/accounts/package.json +++ b/accounts/package.json @@ -19,8 +19,8 @@ "test": "echo 'Not implemented'", "watch": "rollup -c -w", "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'ocis-accounts@0.0.0'", - "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../licenses/node/accounts/licenses.csv", - "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../licenses/node/accounts/licenses" + "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../third-party-licenses/node/accounts/third-party-licenses.csv", + "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../third-party-licenses/node/accounts/third-party-licenses" }, "browserslist": [ "> 1%", diff --git a/idp/package.json b/idp/package.json index 65a556ae2e..2fb3098869 100644 --- a/idp/package.json +++ b/idp/package.json @@ -11,8 +11,8 @@ "start": "node scripts/start.js", "test": "node scripts/test.js --env=jsdom", "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL'", - "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../licenses/node/idp/licenses.csv", - "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../licenses/node/idp/licenses" + "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../third-party-licenses/node/idp/third-party-licenses.csv", + "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../third-party-licenses/node/idp/third-party-licenses" }, "babel": { "presets": [ diff --git a/idp/ui/Makefile b/idp/ui/Makefile index 851a360c14..7a30c315e7 100644 --- a/idp/ui/Makefile +++ b/idp/ui/Makefile @@ -48,6 +48,7 @@ vendor: .yarninstall .PHONY: licenses licenses: + # TODO: what's that??? echo "## Konnect identifier webapp\n" @$(YARN) run -s licenses diff --git a/settings/package.json b/settings/package.json index 52532fbf3e..342c004ad0 100644 --- a/settings/package.json +++ b/settings/package.json @@ -19,8 +19,8 @@ "test": "echo 'Not implemented'", "watch": "rollup -c -w", "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'ocis-settings@0.0.0'", - "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../licenses/node/settings/licenses.csv", - "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../licenses/node/settings/licenses" + "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../third-party-licenses/node/settings/third-party-licenses.csv", + "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../third-party-licenses/node/settings/third-party-licenses" }, "browserslist": [ "> 1%", diff --git a/web/Makefile b/web/Makefile index db353c12b3..7da6300e45 100644 --- a/web/Makefile +++ b/web/Makefile @@ -38,7 +38,6 @@ pull-assets: ############ licenses ############ .PHONY: ci-node-check-licenses ci-node-check-licenses: - # TODO: check again? probably not .PHONY: ci-node-save-licenses ci-node-save-licenses: