Don't use literal slashes when concatenating paths in Python.
This patch fixes the swig generation scripts to use os.path.join
instead, which produces correctly normalized paths for platforms
that don't use the standard forward slash separator.
llvm-svn: 234030
diff --git a/lldb/scripts/finishSwigWrapperClasses.py b/lldb/scripts/finishSwigWrapperClasses.py
index 75f7d46..ca2cbc3 100644
--- a/lldb/scripts/finishSwigWrapperClasses.py
+++ b/lldb/scripts/finishSwigWrapperClasses.py
@@ -199,9 +199,8 @@
nResult = 0;
strStatusMsg = "";
strScriptFile = vstrFinishFileName % vStrScriptLang;
- strScriptFileDir = "%s%s/%s" % (vDictArgs[ "--srcRoot" ], "/scripts",
- vStrScriptLang);
- strScriptFilePath = "%s/%s" % (strScriptFileDir, strScriptFile);
+ strScriptFileDir = os.path.normpath(os.path.join(vDictArgs["--srcRoot"], "scripts", vStrScriptLang));
+ strScriptFilePath = os.path.join(strScriptFileDir, strScriptFile);
# Check for the existence of the script file
strPath = os.path.normcase( strScriptFilePath );
@@ -245,7 +244,7 @@
dbg = utilsDebug.CDebugFnVerbose( "run_post_process_for_each_script_supported()" );
nResult = 0;
strStatusMsg = "";
- strScriptDir = vDictArgs[ "--srcRoot" ] + "/scripts";
+ strScriptDir = os.path.normpath(os.path.join(vDictArgs["--srcRoot"], "scripts"));
strFinishFileName = "finishSwig%sLLDB.py";
# Check for the existence of the scripts folder