Change finishSwigPythonLLDB.py to copy six.py instead of simlink it

[ted]

Summary

If six.py is simlink'd, an installation won't be able to find it unless it has access to the source tree that lldb was built from.

[zturner]

Looks fine. In the future make sure to add lldb-commits to the subscribers :)

[ted]

This comment was removed by ted.

scripts/Python/finishSwigPythonLLDB.py

 strErrMsgCreateFrmWkPyDirFailed = "Unable to create directory '%s' error: %s"
 strMsgSymlinkExists = "Symlink for '%s' already exists"
 strMsgSymlinkMk = "Creating symlink for %s  (%s -> %s)"
 strErrMsgCpLldbpy = "copying lldb to lldb package directory"
 strErrMsgCreatePyPkgMissingSlash = "Parameter 3 fn create_py_pkg() missing slash"
 strErrMsgMkLinkExecute = "Command mklink failed: %s"
 strErrMsgMakeSymlink = "creating symbolic link"
 strErrMsgUnexpected = "Unexpected error: %s"
+strMsgCopySixPy = "Copying six.py from '%s' to '%s'"
+strErrMsgCopySixPyFailed = "Unable to copy '%s' to '%s'"
 
 def is_debug_interpreter():
     return hasattr(sys, 'gettotalrefcount')
 
 #++---------------------------------------------------------------------------
 # Details:  Copy files needed by lldb/macosx/heap.py to build libheap.dylib.
 # Args:     vDictArgs               - (R) Program input parameters.
 #           vstrFrameworkPythonDir  - (R) Python framework directory.
else:
         else:
             # On a UNIX style platform the vstrFrameworkPythonDir looks like:
             # llvm/build/lib/python2.7/site-packages/lldb
             strBuildDir = os.path.join("..", "..", "..", "..")
         strSrc = os.path.normcase(os.path.join(strBuildDir, vstrSrcFile))
 
     return make_symlink_native(vDictArgs, strSrc, strTarget)
 
-def make_symlink_six(vDictArgs, vstrFrameworkPythonDir):
-    dbg = utilsDebug.CDebugFnVerbose("Python script make_symlink_six()")
-    site_packages_dir = os.path.dirname(vstrFrameworkPythonDir)
-    six_module_filename = "six.py"
-    src_file = os.path.join(vDictArgs['--srcRoot'], "third_party", "Python", "module", "six", six_module_filename)
-    src_file = os.path.normpath(src_file)
-    target = os.path.join(site_packages_dir, six_module_filename)
-    return make_symlink_native(vDictArgs, src_file, target)
 
 #++---------------------------------------------------------------------------
 # Details:  Make the symbolic that the script bridge for Python will need in
 #           the Python framework directory.
 # Args:     vDictArgs               - (R) Program input parameters.
 #           vstrFrameworkPythonDir  - (R) Python framework directory.
 #           vstrLiblldbName         - (R) File name for _lldb library.
 # Returns:  Bool - True = function success, False = failure.
def create_symlinks(vDictArgs, vstrFrameworkPythonDir):
 
     # Make symlink for _lldb
     strLibLldbFileName = "_lldb"
     if bOk:
         bOk, strErrMsg = make_symlink_liblldb(vDictArgs,
                                               vstrFrameworkPythonDir,
                                               strLibLldbFileName)
 
-    if bOk:
-        bOk, strErrMsg = make_symlink_six(vDictArgs, vstrFrameworkPythonDir)
-
     # Make symlink for darwin-debug on Darwin
     strDarwinDebugFileName = "darwin-debug"
     if bOk and eOSType == utilsOsType.EnumOsType.Darwin:
         bOk, strErrMsg = make_symlink_darwin_debug(vDictArgs,
                                                    vstrFrameworkPythonDir,
                                                    strDarwinDebugFileName)
 
     # Make symlink for lldb-argdumper
     strArgdumperFileName = "lldb-argdumper"
     if bOk:
         bOk, strErrMsg = make_symlink_lldb_argdumper(vDictArgs,
                                                      vstrFrameworkPythonDir,
                                                      strArgdumperFileName)
 
     return (bOk, strErrMsg)
 
+def copy_six(vDictArgs, vstrFrameworkPythonDir):
+    dbg = utilsDebug.CDebugFnVerbose("Python script copy_six()")
+    bDbg = "-d" in vDictArgs
+    bOk = True
+    strMsg = ""
+    site_packages_dir = os.path.dirname(vstrFrameworkPythonDir)
+    six_module_filename = "six.py"
+    src_file = os.path.join(vDictArgs['--srcRoot'], "third_party", "Python", "module", "six", six_module_filename)
+    src_file = os.path.normpath(src_file)
+    target = os.path.join(site_packages_dir, six_module_filename)
+
+    if bDbg:
+        print((strMsgCopySixPy % (src_file, target)))
+    try:
+        shutil.copyfile(src_file, target)
+    except:
+        bOk = False
+        strMsg = strErrMsgCopySixPyFailed % (src_file, target)
+
+    return (bOk, strMsg)
+
 #++---------------------------------------------------------------------------
 # Details:  Look for the directory in which to put the Python files if it
 #           does not already exist, attempt to make it.
 # Args:     vDictArgs               - (R) Program input parameters.
 #           vstrFrameworkPythonDir  - (R) Python framework directory.
 # Returns:  Bool - True = function success, False = failure.
 #           Str - Error description on task failure.
 # Throws:   None.
def main(vDictArgs):
 
     if bOk:
         bOk, strMsg = find_or_create_python_dir(vDictArgs, strFrameworkPythonDir)
 
     if bOk:
         bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir)
 
     if bOk:
+        bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
+
+    if bOk:
         bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs,
                                                        strFrameworkPythonDir,
                                                        strCfgBldDir)
     strRoot = os.path.normpath(vDictArgs["--srcRoot"])
     if bOk:
         # lldb
         listPkgFiles = [os.path.join(strRoot, "source", "Interpreter", "embedded_interpreter.py")]
         bOk, strMsg = create_py_pkg(vDictArgs, strFrameworkPythonDir, "", listPkgFiles)