Make GetWindowsPythonLibFile() more robust and output error if lib not found

ikrima · ikrima · commit a56692e0cc96 · 2018-08-04T19:44:08.000-07:00
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs
@@ -398,23 +398,25 @@ private string GetWindowsPythonLibFile(string basePath)
         // just for usability, report if the pythonHome is not in the system path
         string[] allPaths = System.Environment.GetEnvironmentVariable("PATH").Split(';');
         // this will transform the slashes in backslashes...
-        string checkedPath = Path.GetFullPath(basePath);
-        if (checkedPath.EndsWith("\\"))
-        {
-            checkedPath = checkedPath.Remove(checkedPath.Length - 1);
-        }
+        string checkedPath = !string.IsNullOrWhiteSpace(basePath) 
+            ? new System.Uri(Path.GetFullPath(basePath).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)).LocalPath
+            : basePath;
+        
         bool found = false;
         foreach (string item in allPaths)
         {
-            if (item == checkedPath || item == checkedPath + "\\")
+            string checkedItem = !string.IsNullOrWhiteSpace(item)
+                ? new System.Uri(item.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)).LocalPath
+                : item;
+            if (checkedItem == checkedPath)
             {
                 found = true;
                 break;
             }
         }
         if (!found)
         {
-            System.Console.WriteLine("[WARNING] Your Python installation is not in the system PATH environment variable.");
+            System.Console.WriteLine("[WARNING] Your Python installation ({0}) is not in the system PATH environment variable.", checkedPath);
             System.Console.WriteLine("[WARNING] Ensure your python paths are set in GlobalConfig (DefaultEngine.ini) so the path can be corrected at runtime.");
         }
         // first try with python3

Original file line number	Diff line number	Diff line change
`@@ -398,23 +398,25 @@ private string GetWindowsPythonLibFile(string basePath)`
`398`	`398`	`// just for usability, report if the pythonHome is not in the system path`
`399`	`399`	`string[] allPaths = System.Environment.GetEnvironmentVariable("PATH").Split(';');`
`400`	`400`	`// this will transform the slashes in backslashes...`
`401`		`- string checkedPath = Path.GetFullPath(basePath);`
`402`		`- if (checkedPath.EndsWith("\\"))`
`403`		`- {`
`404`		`- checkedPath = checkedPath.Remove(checkedPath.Length - 1);`
`405`		`- }`
	`401`	`+ string checkedPath = !string.IsNullOrWhiteSpace(basePath)`
	`402`	`+ ? new System.Uri(Path.GetFullPath(basePath).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)).LocalPath`
	`403`	`+ : basePath;`
	`404`	`+`
`406`	`405`	`bool found = false;`
`407`	`406`	`foreach (string item in allPaths)`
`408`	`407`	`{`
`409`		`- if (item == checkedPath \|\| item == checkedPath + "\\")`
	`408`	`+ string checkedItem = !string.IsNullOrWhiteSpace(item)`
	`409`	`+ ? new System.Uri(item.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)).LocalPath`
	`410`	`+ : item;`
	`411`	`+ if (checkedItem == checkedPath)`
`410`	`412`	`{`
`411`	`413`	`found = true;`
`412`	`414`	`break;`
`413`	`415`	`}`
`414`	`416`	`}`
`415`	`417`	`if (!found)`
`416`	`418`	`{`
`417`		`- System.Console.WriteLine("[WARNING] Your Python installation is not in the system PATH environment variable.");`
	`419`	`+ System.Console.WriteLine("[WARNING] Your Python installation ({0}) is not in the system PATH environment variable.", checkedPath);`
`418`	`420`	`System.Console.WriteLine("[WARNING] Ensure your python paths are set in GlobalConfig (DefaultEngine.ini) so the path can be corrected at runtime.");`
`419`	`421`	`}`
`420`	`422`	`// first try with python3`