Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect the case where GameData is uncompressed at the wrong place #4034

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Detect the case where GameData is uncompressed at the wrong place #4034

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3f381b
Detect misplaced DLL.
pleroy Jul 2, 2024
f5ee751
Make it work on all OSes.
pleroy Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions ksp_plugin_adapter/loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ internal static string LoadPrincipiaDllAndInitGoogleLogging() {
"use the 64-bit KSP executable.";
}
string[] possible_dll_paths;
string dll_filename;
bool? is_cxx_installed;
string required_cxx_packages;
switch (Environment.OSVersion.Platform) {
Expand All @@ -26,15 +27,18 @@ internal static string LoadPrincipiaDllAndInitGoogleLogging() {
required_cxx_packages =
"the Microsoft Visual C++ 2015-2022 Redistributable (x64) - " +
"14.38.33130";
possible_dll_paths = new [] {@"GameData\Principia\x64\principia.dll"};
dll_filename = "principia.dll";
possible_dll_paths = new []
{ @"GameData\Principia\x64\" + dll_filename };
break;
// Both Mac and Linux report |PlatformID.Unix|, so we treat them together
// (we probably don't actually encounter |PlatformID.MacOSX|).
case PlatformID.Unix:
case PlatformID.MacOSX:
dll_filename = "principia.so";
possible_dll_paths = new [] {
@"GameData/Principia/Linux64/principia.so",
@"GameData/Principia/MacOS64/principia.so"
@"GameData/Principia/Linux64/" + dll_filename,
@"GameData/Principia/MacOS64/" + dll_filename,
};
is_cxx_installed = null;
required_cxx_packages = "libc++abi1-17, libc++1-17, and libunwind-17 " +
Expand All @@ -47,11 +51,23 @@ internal static string LoadPrincipiaDllAndInitGoogleLogging() {
" is not supported at this time.";
}
if (!possible_dll_paths.Any(File.Exists)) {
string[] where_did_they_put_the_dll = Directory.GetFiles(
Directory.GetCurrentDirectory(),
dll_filename,
SearchOption.AllDirectories);
string incorrectly_installed_in = "";
if (where_did_they_put_the_dll.Any()) {
incorrectly_installed_in = " It was incorrectly installed in " +
string.Join(", ",
where_did_they_put_the_dll) +
".";
}
return "The principia DLL was not found at '" +
string.Join("', '", possible_dll_paths) +
"' in directory '" +
Directory.GetCurrentDirectory() +
"'.";
"'." +
incorrectly_installed_in;
}
string non_ascii_path_error = null;
foreach (char c in Directory.GetCurrentDirectory()) {
Expand Down