From 6c4b464f14ed2851980da34e12df355cb8137ba7 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 14:34:05 +0200 Subject: [PATCH] Fix: SPDX-compliance --- .reuse/dep5 | 2 +- ...txt => LicenseRef-ALL-RIGHTS-RESERVED.txt} | 0 LICENSES/{LOGO.txt => LicenseRef-LOGO.txt} | 0 .../{TRIVIAL.txt => LicenseRef-TRIVIAL.txt} | 0 ...txt => LicenseRef-UBUNTU-FONT-LICENSE.txt} | 0 .../pump_example.png.license | 2 +- .../pump_example_round.jpg.license | 2 +- .../layers/food/Vegetarian-mark.svg.license | 2 +- assets/layers/nature_reserve/ANB.jpg.license | 2 +- .../nature_reserve/Natuurpunt.jpg.license | 2 +- .../nature_reserve/groen_logo.svg.license | 2 +- assets/layers/play_forest/icon.svg.license | 2 +- .../layers/questions/send_email.svg.license | 2 +- assets/svg/close.svg.license | 2 +- assets/svg/compass.svg.license | 2 +- assets/svg/cross_bottom_right.svg.license | 2 +- assets/svg/crosshair-locked.svg.license | 2 +- assets/svg/crosshair.svg.license | 2 +- assets/svg/direction_gradient.svg.license | 2 +- assets/svg/envelope.svg.license | 2 +- assets/svg/gear.svg.license | 2 +- assets/svg/help.svg.license | 2 +- assets/svg/layers.svg.license | 2 +- assets/svg/liberapay.svg.license | 2 +- assets/svg/loading.svg.license | 2 +- assets/svg/logo.svg.license | 2 +- assets/svg/logout.svg.license | 2 +- assets/svg/mapcomplete_logo.svg.license | 2 +- assets/svg/mapillary.svg.license | 2 +- assets/svg/mapillary_black.svg.license | 2 +- assets/svg/mastodon.svg.license | 2 +- assets/svg/min.svg.license | 2 +- assets/svg/no_checkmark.svg.license | 2 +- assets/svg/none.svg.license | 2 +- assets/svg/osm-logo-us.svg.license | 2 +- assets/svg/osm-logo.svg.license | 2 +- assets/svg/pin.svg.license | 2 +- assets/svg/plantnet_logo.svg.license | 2 +- assets/svg/plus.svg.license | 2 +- assets/svg/reload.svg.license | 2 +- assets/svg/ring.svg.license | 2 +- assets/svg/share.svg.license | 2 +- assets/svg/square.svg.license | 2 +- assets/svg/star.svg.license | 2 +- assets/svg/star_half.svg.license | 2 +- assets/svg/star_outline.svg.license | 2 +- assets/svg/star_outline_half.svg.license | 2 +- assets/svg/up.svg.license | 2 +- assets/svg/wikidata.svg.license | 2 +- .../svg/wikimedia-commons-white.svg.license | 2 +- assets/svg/wikipedia.svg.license | 2 +- assets/themes/buurtnatuur/ANB.jpg.license | 2 +- .../themes/buurtnatuur/Natuurpunt.jpg.license | 2 +- .../themes/buurtnatuur/groen_logo.svg.license | 2 +- assets/themes/buurtnatuur/logo.svg.license | 2 +- .../buurtnatuur/social_image.jpg.license | 2 +- .../themes/charging_stations/logo.svg.license | 2 +- .../themes/charging_stations/plug.svg.license | 2 +- .../fietssnelwegen-logo.svg.license | 2 +- .../fietsambassade_gent_logo.svg.license | 2 +- ...fietsambassade_gent_logo_small.svg.license | 2 +- ...tion of Education (ISCED) 2011.pdf.license | 2 +- ...epartement_Omgeving_Vlaanderen.png.license | 2 +- .../provincie_antwerpen.jpg.license | 2 +- .../speelplekken/shadow.geojson.license | 2 +- .../speelplekken/social_image.jpg.license | 2 +- .../themes/speelplekken/youtube.svg.license | 2 +- .../FlandersArtSans-Light.woff.license | 2 +- .../FlandersArtSerif-Medium.woff.license | 2 +- .../toerisme_vlaanderen/avatar.png.license | 2 +- .../toerisme_vlaanderen/logo.png.license | 2 +- assets/themes/width/icon.svg.license | 2 +- scripts/generateLicenseInfo.ts | 43 +++++++++++++------ 73 files changed, 98 insertions(+), 81 deletions(-) rename LICENSES/{ALL-RIGHTS-RESERVED.txt => LicenseRef-ALL-RIGHTS-RESERVED.txt} (100%) rename LICENSES/{LOGO.txt => LicenseRef-LOGO.txt} (100%) rename LICENSES/{TRIVIAL.txt => LicenseRef-TRIVIAL.txt} (100%) rename LICENSES/{UBUNTU-FONT-LICENSE.txt => LicenseRef-UBUNTU-FONT-LICENSE.txt} (100%) diff --git a/.reuse/dep5 b/.reuse/dep5 index 77c517fd6..7917d2bbf 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -30,7 +30,7 @@ License: GPL-3.0-or-later Files: public/assets/templates/*.js public/assets/fonts/*.js Copyright: MapComplete contributors Comment: fonts for exports -License: UBUNTU-FONT-LICENSE +License: LicenseRef-UBUNTU-FONT-LICENSE Files: public/assets/*.svg public/assets/*.png public/apple_touch_icon.png diff --git a/LICENSES/ALL-RIGHTS-RESERVED.txt b/LICENSES/LicenseRef-ALL-RIGHTS-RESERVED.txt similarity index 100% rename from LICENSES/ALL-RIGHTS-RESERVED.txt rename to LICENSES/LicenseRef-ALL-RIGHTS-RESERVED.txt diff --git a/LICENSES/LOGO.txt b/LICENSES/LicenseRef-LOGO.txt similarity index 100% rename from LICENSES/LOGO.txt rename to LICENSES/LicenseRef-LOGO.txt diff --git a/LICENSES/TRIVIAL.txt b/LICENSES/LicenseRef-TRIVIAL.txt similarity index 100% rename from LICENSES/TRIVIAL.txt rename to LICENSES/LicenseRef-TRIVIAL.txt diff --git a/LICENSES/UBUNTU-FONT-LICENSE.txt b/LICENSES/LicenseRef-UBUNTU-FONT-LICENSE.txt similarity index 100% rename from LICENSES/UBUNTU-FONT-LICENSE.txt rename to LICENSES/LicenseRef-UBUNTU-FONT-LICENSE.txt diff --git a/assets/layers/bike_repair_station/pump_example.png.license b/assets/layers/bike_repair_station/pump_example.png.license index 2f29b4e67..8253fd083 100644 --- a/assets/layers/bike_repair_station/pump_example.png.license +++ b/assets/layers/bike_repair_station/pump_example.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Turvec Solutions -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/bike_repair_station/pump_example_round.jpg.license b/assets/layers/bike_repair_station/pump_example_round.jpg.license index 696296a94..e9ffc3b41 100644 --- a/assets/layers/bike_repair_station/pump_example_round.jpg.license +++ b/assets/layers/bike_repair_station/pump_example_round.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: ©Altinnova -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/food/Vegetarian-mark.svg.license b/assets/layers/food/Vegetarian-mark.svg.license index 55f9e8ef7..fd14a6beb 100644 --- a/assets/layers/food/Vegetarian-mark.svg.license +++ b/assets/layers/food/Vegetarian-mark.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: European Vegetarian Union -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/ANB.jpg.license b/assets/layers/nature_reserve/ANB.jpg.license index 919f752bb..103696d37 100644 --- a/assets/layers/nature_reserve/ANB.jpg.license +++ b/assets/layers/nature_reserve/ANB.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Agentschap Natuur en Bos -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/Natuurpunt.jpg.license b/assets/layers/nature_reserve/Natuurpunt.jpg.license index e429d2683..908dc4041 100644 --- a/assets/layers/nature_reserve/Natuurpunt.jpg.license +++ b/assets/layers/nature_reserve/Natuurpunt.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Natuurpunt -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/groen_logo.svg.license b/assets/layers/nature_reserve/groen_logo.svg.license index 81a8cecc7..047a125bb 100644 --- a/assets/layers/nature_reserve/groen_logo.svg.license +++ b/assets/layers/nature_reserve/groen_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/play_forest/icon.svg.license b/assets/layers/play_forest/icon.svg.license index 919f752bb..103696d37 100644 --- a/assets/layers/play_forest/icon.svg.license +++ b/assets/layers/play_forest/icon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Agentschap Natuur en Bos -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/questions/send_email.svg.license b/assets/layers/questions/send_email.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/layers/questions/send_email.svg.license +++ b/assets/layers/questions/send_email.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/close.svg.license b/assets/svg/close.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/close.svg.license +++ b/assets/svg/close.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/compass.svg.license b/assets/svg/compass.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/compass.svg.license +++ b/assets/svg/compass.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/cross_bottom_right.svg.license b/assets/svg/cross_bottom_right.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/cross_bottom_right.svg.license +++ b/assets/svg/cross_bottom_right.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair-locked.svg.license b/assets/svg/crosshair-locked.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/crosshair-locked.svg.license +++ b/assets/svg/crosshair-locked.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair.svg.license b/assets/svg/crosshair.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/crosshair.svg.license +++ b/assets/svg/crosshair.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/direction_gradient.svg.license b/assets/svg/direction_gradient.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/direction_gradient.svg.license +++ b/assets/svg/direction_gradient.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/envelope.svg.license b/assets/svg/envelope.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/envelope.svg.license +++ b/assets/svg/envelope.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/gear.svg.license b/assets/svg/gear.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/gear.svg.license +++ b/assets/svg/gear.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/help.svg.license b/assets/svg/help.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/help.svg.license +++ b/assets/svg/help.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/layers.svg.license b/assets/svg/layers.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/layers.svg.license +++ b/assets/svg/layers.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/liberapay.svg.license b/assets/svg/liberapay.svg.license index 9a56f9841..9432bc4c7 100644 --- a/assets/svg/liberapay.svg.license +++ b/assets/svg/liberapay.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: LiberaPay -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/loading.svg.license b/assets/svg/loading.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/loading.svg.license +++ b/assets/svg/loading.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/logo.svg.license b/assets/svg/logo.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/logo.svg.license +++ b/assets/svg/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/logout.svg.license b/assets/svg/logout.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/logout.svg.license +++ b/assets/svg/logout.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/mapcomplete_logo.svg.license b/assets/svg/mapcomplete_logo.svg.license index 27072db67..12c9d0f66 100644 --- a/assets/svg/mapcomplete_logo.svg.license +++ b/assets/svg/mapcomplete_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Pieter Vander Vennet; OSM -SPDX-License-Identifier: LOGO AND CC-BY-SA-4.0 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO AND CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/mapillary.svg.license b/assets/svg/mapillary.svg.license index c0b41f41c..1f3f507b4 100644 --- a/assets/svg/mapillary.svg.license +++ b/assets/svg/mapillary.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mapillary -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/mapillary_black.svg.license b/assets/svg/mapillary_black.svg.license index c0b41f41c..1f3f507b4 100644 --- a/assets/svg/mapillary_black.svg.license +++ b/assets/svg/mapillary_black.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mapillary -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/mastodon.svg.license b/assets/svg/mastodon.svg.license index 734852b4d..8bb252597 100644 --- a/assets/svg/mastodon.svg.license +++ b/assets/svg/mastodon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mastodon -SPDX-License-Identifier: LOGO AND AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO AND AGPL-3.0-or-later \ No newline at end of file diff --git a/assets/svg/min.svg.license b/assets/svg/min.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/min.svg.license +++ b/assets/svg/min.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/no_checkmark.svg.license b/assets/svg/no_checkmark.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/no_checkmark.svg.license +++ b/assets/svg/no_checkmark.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/none.svg.license b/assets/svg/none.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/none.svg.license +++ b/assets/svg/none.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/osm-logo-us.svg.license b/assets/svg/osm-logo-us.svg.license index 0b7a3e969..10ae3e2e4 100644 --- a/assets/svg/osm-logo-us.svg.license +++ b/assets/svg/osm-logo-us.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: OpenStreetMap U.S. Chapter -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/osm-logo.svg.license b/assets/svg/osm-logo.svg.license index a8026aac0..ed63c50d5 100644 --- a/assets/svg/osm-logo.svg.license +++ b/assets/svg/osm-logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/pin.svg.license b/assets/svg/pin.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/pin.svg.license +++ b/assets/svg/pin.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/plantnet_logo.svg.license b/assets/svg/plantnet_logo.svg.license index 0c21c18ac..e173bf288 100644 --- a/assets/svg/plantnet_logo.svg.license +++ b/assets/svg/plantnet_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: https://plantnet.org -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/plus.svg.license b/assets/svg/plus.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/plus.svg.license +++ b/assets/svg/plus.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/reload.svg.license b/assets/svg/reload.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/reload.svg.license +++ b/assets/svg/reload.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/ring.svg.license b/assets/svg/ring.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/ring.svg.license +++ b/assets/svg/ring.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/share.svg.license b/assets/svg/share.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/share.svg.license +++ b/assets/svg/share.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/square.svg.license b/assets/svg/square.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/square.svg.license +++ b/assets/svg/square.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star.svg.license b/assets/svg/star.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star.svg.license +++ b/assets/svg/star.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_half.svg.license b/assets/svg/star_half.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star_half.svg.license +++ b/assets/svg/star_half.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_outline.svg.license b/assets/svg/star_outline.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star_outline.svg.license +++ b/assets/svg/star_outline.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_outline_half.svg.license b/assets/svg/star_outline_half.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star_outline_half.svg.license +++ b/assets/svg/star_outline_half.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/up.svg.license b/assets/svg/up.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/up.svg.license +++ b/assets/svg/up.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/wikidata.svg.license b/assets/svg/wikidata.svg.license index 5435f678e..48866d730 100644 --- a/assets/svg/wikidata.svg.license +++ b/assets/svg/wikidata.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikidata -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/wikimedia-commons-white.svg.license b/assets/svg/wikimedia-commons-white.svg.license index 744248e98..c60e74e61 100644 --- a/assets/svg/wikimedia-commons-white.svg.license +++ b/assets/svg/wikimedia-commons-white.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikimedia -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/wikipedia.svg.license b/assets/svg/wikipedia.svg.license index fd1a25c87..ac7f7ab98 100644 --- a/assets/svg/wikipedia.svg.license +++ b/assets/svg/wikipedia.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikipedia -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/ANB.jpg.license b/assets/themes/buurtnatuur/ANB.jpg.license index 919f752bb..103696d37 100644 --- a/assets/themes/buurtnatuur/ANB.jpg.license +++ b/assets/themes/buurtnatuur/ANB.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Agentschap Natuur en Bos -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/Natuurpunt.jpg.license b/assets/themes/buurtnatuur/Natuurpunt.jpg.license index e429d2683..908dc4041 100644 --- a/assets/themes/buurtnatuur/Natuurpunt.jpg.license +++ b/assets/themes/buurtnatuur/Natuurpunt.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Natuurpunt -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/groen_logo.svg.license b/assets/themes/buurtnatuur/groen_logo.svg.license index 81a8cecc7..047a125bb 100644 --- a/assets/themes/buurtnatuur/groen_logo.svg.license +++ b/assets/themes/buurtnatuur/groen_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/logo.svg.license b/assets/themes/buurtnatuur/logo.svg.license index 81a8cecc7..047a125bb 100644 --- a/assets/themes/buurtnatuur/logo.svg.license +++ b/assets/themes/buurtnatuur/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/social_image.jpg.license b/assets/themes/buurtnatuur/social_image.jpg.license index 537a9d776..58d41f37c 100644 --- a/assets/themes/buurtnatuur/social_image.jpg.license +++ b/assets/themes/buurtnatuur/social_image.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/charging_stations/logo.svg.license b/assets/themes/charging_stations/logo.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/themes/charging_stations/logo.svg.license +++ b/assets/themes/charging_stations/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/themes/charging_stations/plug.svg.license b/assets/themes/charging_stations/plug.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/themes/charging_stations/plug.svg.license +++ b/assets/themes/charging_stations/plug.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license b/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license index cc83736f4..c0db94e4b 100644 --- a/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license +++ b/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: De Vlaamse Provincies -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license b/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license index c56e036d8..394251dab 100644 --- a/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license +++ b/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: De Fietsambassade -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license index c56e036d8..394251dab 100644 --- a/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license +++ b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: De Fietsambassade -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license index 4ef5a8606..8e23570c5 100644 --- a/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license +++ b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: ©UNESCO-UIS 2012 http://www.uis.unesco.org -SPDX-License-Identifier: ALL-RIGHTS-RESERVED +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED diff --git a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license index 02d097f95..78dca0748 100644 --- a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license +++ b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Departement Omgeving, Vlaamse Overheid -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/provincie_antwerpen.jpg.license b/assets/themes/speelplekken/provincie_antwerpen.jpg.license index f10fdfff1..620bd9003 100644 --- a/assets/themes/speelplekken/provincie_antwerpen.jpg.license +++ b/assets/themes/speelplekken/provincie_antwerpen.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Provincie Antwerpen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/shadow.geojson.license b/assets/themes/speelplekken/shadow.geojson.license index 024e83464..1816f1b36 100644 --- a/assets/themes/speelplekken/shadow.geojson.license +++ b/assets/themes/speelplekken/shadow.geojson.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Vlaamse Overheid -SPDX-License-Identifier: ALL-RIGHTS-RESERVED +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED diff --git a/assets/themes/speelplekken/social_image.jpg.license b/assets/themes/speelplekken/social_image.jpg.license index 396c5a1ee..93a623f7c 100644 --- a/assets/themes/speelplekken/social_image.jpg.license +++ b/assets/themes/speelplekken/social_image.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Createlli -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/youtube.svg.license b/assets/themes/speelplekken/youtube.svg.license index 35f5b360a..430748aba 100644 --- a/assets/themes/speelplekken/youtube.svg.license +++ b/assets/themes/speelplekken/youtube.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Youtube -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license b/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license index 6348ee577..dec12c72d 100644 --- a/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license +++ b/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Jo De Baerdemaeker -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license b/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license index 6348ee577..dec12c72d 100644 --- a/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license +++ b/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Jo De Baerdemaeker -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/avatar.png.license b/assets/themes/toerisme_vlaanderen/avatar.png.license index 123463272..d78204695 100644 --- a/assets/themes/toerisme_vlaanderen/avatar.png.license +++ b/assets/themes/toerisme_vlaanderen/avatar.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Toerisme Vlaanderen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/logo.png.license b/assets/themes/toerisme_vlaanderen/logo.png.license index 123463272..d78204695 100644 --- a/assets/themes/toerisme_vlaanderen/logo.png.license +++ b/assets/themes/toerisme_vlaanderen/logo.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Toerisme Vlaanderen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/width/icon.svg.license b/assets/themes/width/icon.svg.license index 9c10d311a..c4b60c337 100644 --- a/assets/themes/width/icon.svg.license +++ b/assets/themes/width/icon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Pieter Vander Vennet -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts index 246e4c622..e2e711a3c 100644 --- a/scripts/generateLicenseInfo.ts +++ b/scripts/generateLicenseInfo.ts @@ -4,9 +4,15 @@ import ScriptUtils from "./ScriptUtils" import Script from "./Script" import { Utils } from "../src/Utils" -const prompt = require("prompt-sync")() - export class GenerateLicenseInfo extends Script { + private static readonly needsLicenseRef = new Set( + ScriptUtils.readDirRecSync("./LICENSES") + .map((p) => p.substring(p.lastIndexOf("/") + 1)) + .filter((p) => p.startsWith("LicenseRef-")) + .map((p) => p.substring("LicenseRef-".length)) + .map((p) => p.substring(0, p.lastIndexOf("."))) + ) + constructor() { super("Validates the licenses and compiles them into one single asset file") } @@ -193,11 +199,6 @@ export class GenerateLicenseInfo extends Script { */ toSPDXCompliantLicense(licenseId: string): string { licenseId = licenseId.trim() - licenseId = licenseId.replaceAll("-AND-", " AND ") - - if (!(licenseId.endsWith("-only") || licenseId.endsWith("-or-later"))) { - licenseId = licenseId.toUpperCase() - } // https://spdx.org/licenses/ const mappings: Record = { "CC-0": "CC0-1.0", @@ -362,11 +363,10 @@ export class GenerateLicenseInfo extends Script { let invalid = 0 for (const licenseInfo of licenseInfos) { - const isTrivial = - licenseInfo.license - .split(";") - .map((l) => l.trim().toLowerCase()) - .indexOf("trivial") >= 0 + const isTrivial = licenseInfo.license + .split(";") + .map((l) => l.trim().toLowerCase()) + .some((s) => s.endsWith("trivial")) if (licenseInfo.sources.length + licenseInfo.authors.length == 0 && !isTrivial) { invalid++ invalidLicenses.push( @@ -393,7 +393,11 @@ export class GenerateLicenseInfo extends Script { const spdxContent = [ "SPDX-FileCopyrightText: " + licenseInfo.authors.join("; "), - "SPDX-License-Identifier: " + licenseInfo.license, + "SPDX-License-Identifier: " + + licenseInfo.license + .split(" AND ") + .map((s) => this.addLicenseRef(s)) + .join(" AND "), ] writeFileSync(spdxPath, spdxContent.join("\n")) } @@ -410,6 +414,19 @@ export class GenerateLicenseInfo extends Script { this.cleanLicenseInfo(licensePaths, licenseInfos) this.createFullLicenseOverview(licensePaths) } + + /** + * Some licenses need "LicenseRef-" to be added to make reuse lint work + * @param s + * @private + */ + private addLicenseRef(s: string): string { + if (GenerateLicenseInfo.needsLicenseRef.has(s)) { + console.log("Mapping ", s, Array.from(GenerateLicenseInfo.needsLicenseRef)) + return "LicenseRef-" + s + } + return s + } } new GenerateLicenseInfo().run()