Skip to content

Commit

Permalink
Fixed Steam version not being able to show the used library licenses (R…
Browse files Browse the repository at this point in the history
…evolutionary-Games#4437)

this is fixed by now including the top level LICENSE.txt file and also by adding an extra clarification file to say that the license file doesn't apply to the Steam version in its entirety
  • Loading branch information
hhyyrylainen authored Aug 2, 2023
1 parent 8f57388 commit 7ba3c8d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
3 changes: 3 additions & 0 deletions assets/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ The following fonts are licensed under the SIL Open Font License

SIL license text is included in "OFL.txt" file.

In a packaged version of the game the assets may be included inside an
archive file format instead of as separate plain files.


Social License Info
-------------------
Expand Down
6 changes: 6 additions & 0 deletions doc/steam_license_notice.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
The Steam release of Thrive may contain LICENSE.txt file at the root
of the game data archive(s) or the game's folder. This file is
included as it includes licensing information of the libraries used by
Thrive, which is used when the effective license text is shown by the
game program. However, the licensing terms for Thrive contained in that
file are overwritten by what is said in steam_license_readme.txt file.
4 changes: 2 additions & 2 deletions export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ platform="Linux/X11"
runnable=false
custom_features="steam"
export_filter="all_resources"
include_filter="*.json, doc/*.txt, assets/*.txt, *.yml"
include_filter="*.json, doc/*.txt, assets/*.txt, *.yml, LICENSE.txt"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.x86_64"
script_export_mode=1
Expand All @@ -215,7 +215,7 @@ platform="Windows Desktop"
runnable=false
custom_features="steam"
export_filter="all_resources"
include_filter="*.json, doc/*.txt, assets/*.txt, *.yml"
include_filter="*.json, doc/*.txt, assets/*.txt, *.yml, LICENSE.txt"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.exe"
script_export_mode=1
Expand Down
5 changes: 4 additions & 1 deletion src/gui_common/dialogs/LicensesDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public static string LoadSteamLicenseFile()
var steam = LoadFile(Constants.STEAM_LICENSE_FILE);
var normal = LoadFile(Constants.LICENSE_FILE);

// var regex = new Regex(".*(^In addition to Godot Engine, Thrive uses the following.+\\z)",
var regex = new Regex(".*(In addition to Godot Engine, Thrive uses the following.+)$",
RegexOptions.Singleline | RegexOptions.IgnoreCase);

Expand All @@ -39,6 +38,10 @@ public static string LoadSteamLicenseFile()
{
extraText = match.Groups[1].Value;
}
else
{
GD.PrintErr("Failed to insert Steam version used library licenses list");
}

return steam + extraText;
}
Expand Down

0 comments on commit 7ba3c8d

Please sign in to comment.