BUGFIX: SPDX works a bit differently than expected

ArduPilot · Jun 12, 2024 · d10464d · d10464d
1 parent 6ddfaf0
commit d10464d
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 3 deletions.
diff --git a/MethodicConfigurator/frontend_tkinter_parameter_editor.py b/MethodicConfigurator/frontend_tkinter_parameter_editor.py
@@ -147,7 +147,7 @@ def show_about_window(root, version: str):
                                       "https://github.com/ArduPilot/MethodicConfigurator/issues/new"))
     licenses_button = ttk.Button(main_frame, text="Licenses",
                                 command=lambda: webbrowser_open(
-                                   "https://github.com/ArduPilot/MethodicConfigurator/blob/master/LICENSES/CREDITS.md"))
+                                   "https://github.com/ArduPilot/MethodicConfigurator/blob/master/credits/CREDITS.md"))
     source_button = ttk.Button(main_frame, text="Source Code",
                                command=lambda: webbrowser_open(
                                   "https://github.com/ArduPilot/MethodicConfigurator"))

diff --git a/README.md b/README.md
@@ -59,4 +59,4 @@ To use and develop this software you must obey the [ArduPilot Methodic Configura
 ## License
 
 This project is licensed under the [GNU General Public License v3.0](LICENSE.md).
-It builds upon other [opensource software packages](LICENSES/CREDITS.md)
+It builds upon other [opensource software packages](credits/CREDITS.md)
diff --git a/...NSES/ArduPilot_tempcal_IMU.py-COPYING.txt → credits/ArduPilot_tempcal_IMU.py-COPYING.txt b/...NSES/ArduPilot_tempcal_IMU.py-COPYING.txt → credits/ArduPilot_tempcal_IMU.py-COPYING.txt
diff --git a/LICENSES/CREDITS.md → credits/CREDITS.md b/LICENSES/CREDITS.md → credits/CREDITS.md
diff --git a/...x-Mozilla_Public_License_version_2.0.html → ...x-Mozilla_Public_License_version_2.0.html b/...x-Mozilla_Public_License_version_2.0.html → ...x-Mozilla_Public_License_version_2.0.html
diff --git a/...e-Mozilla_Public_License_version_2.0.html → ...e-Mozilla_Public_License_version_2.0.html b/...e-Mozilla_Public_License_version_2.0.html → ...e-Mozilla_Public_License_version_2.0.html
diff --git a/LICENSES/certifi-LICENSE → credits/certifi-LICENSE b/LICENSES/certifi-LICENSE → credits/certifi-LICENSE
diff --git a/LICENSES/charset-normalizer-LICENSE → credits/charset-normalizer-LICENSE b/LICENSES/charset-normalizer-LICENSE → credits/charset-normalizer-LICENSE
diff --git a/LICENSES/future-LICENSE.txt → credits/future-LICENSE.txt b/LICENSES/future-LICENSE.txt → credits/future-LICENSE.txt
diff --git a/LICENSES/idna-LICENSE.md → credits/idna-LICENSE.md b/LICENSES/idna-LICENSE.md → credits/idna-LICENSE.md
diff --git a/LICENSES/lxml-LICENSE.txt → credits/lxml-LICENSE.txt b/LICENSES/lxml-LICENSE.txt → credits/lxml-LICENSE.txt
diff --git a/LICENSES/platformdirs-LICENSE → credits/platformdirs-LICENSE b/LICENSES/platformdirs-LICENSE → credits/platformdirs-LICENSE
diff --git a/LICENSES/pymavlink-COPYING → credits/pymavlink-COPYING b/LICENSES/pymavlink-COPYING → credits/pymavlink-COPYING
diff --git a/LICENSES/pyserial-LICENSE.txt → credits/pyserial-LICENSE.txt b/LICENSES/pyserial-LICENSE.txt → credits/pyserial-LICENSE.txt
diff --git a/LICENSES/python-certifi-LICENSE → credits/python-certifi-LICENSE b/LICENSES/python-certifi-LICENSE → credits/python-certifi-LICENSE
diff --git a/LICENSES/python-future-LICENSE.txt → credits/python-future-LICENSE.txt b/LICENSES/python-future-LICENSE.txt → credits/python-future-LICENSE.txt
diff --git a/LICENSES/update_credits_licenses.py → credits/update_credits_licenses.py b/LICENSES/update_credits_licenses.py → credits/update_credits_licenses.py
diff --git a/LICENSES/urllib3-LICENSE.txt → credits/urllib3-LICENSE.txt b/LICENSES/urllib3-LICENSE.txt → credits/urllib3-LICENSE.txt
diff --git a/setup.py b/setup.py
@@ -50,7 +50,7 @@
     long_description = long_description.replace("(ARCHITECTURE.md", f"({PRJ_URL}/blob/master/ARCHITECTURE.md")
     long_description = long_description.replace("(CODE_OF_CONDUCT.md", f"({PRJ_URL}/blob/master/CODE_OF_CONDUCT.md")
     long_description = long_description.replace("(LICENSE.md", f"({PRJ_URL}/blob/master/LICENSE.md")
-    long_description = long_description.replace("(LICENSES/CREDITS.md", f"({PRJ_URL}/blob/master/LICENSES/CREDITS.md")
+    long_description = long_description.replace("(credits/CREDITS.md", f"({PRJ_URL}/blob/master/credits/CREDITS.md")
     long_description = long_description.replace("images/App_screenshot1.png",
                                                 f"{PRJ_URL}/raw/master/images/App_screenshot1.png")
 

diff --git a/windows/ardupilot_methodic_configurator.iss b/windows/ardupilot_methodic_configurator.iss
@@ -59,6 +59,7 @@ Source: "..\MethodicConfigurator\ArduPilot_logo.png"; DestDir: "{app}\_internal\
 Source: "..\MethodicConfigurator\ArduCopter_configuration_steps.json"; DestDir: "{app}\_internal\MethodicConfigurator"; Flags: ignoreversion
 Source: "..\MethodicConfigurator\ArduPlane_configuration_steps.json"; DestDir: "{app}\_internal\MethodicConfigurator"; Flags: ignoreversion
 Source: "..\LICENSES\*.*"; DestDir: "{app}\LICENSES"; Flags: ignoreversion
+Source: "..\credits\*.*"; DestDir: "{app}\credits"; Flags: ignoreversion
 
 [Dirs]
 Name: "{userappdata}\.ardupilot_methodic_configurator\vehicles"; Flags: uninsneveruninstall