[lldb] Calculate relative path for symbol links

[hhb]

Summary

This replaces the hard coded path.

[mgorny]

Yep, that's a change in the right direction. Have you (at least mentally) verified that it produces the correct path in all cases? I wouldn't trust the inputs being entirely correct.

[hhb]

In D67993#1681901, @mgorny wrote:

Yep, that's a change in the right direction. Have you (at least mentally) verified that it produces the correct path in all cases? I wouldn't trust the inputs being entirely correct.

So far I tested the easiest case in my Ubuntu. I'll do another round of tests on Windows and darwin before submit. But I'm afraid I don't have the right environment to test xcode case.

[labath]

This looks fine.

There is no xcode build. If you want to test building the framework, you just need to set LLDB_BUILD_FRAMEWORK cmake variable. I don't know if there's any other var than needs setting, but we have a cache file (cmake/caches/Apple-lldb-Xcode.cmake), which should build things the same way as the apple folks are building, so you could just use that.

lldb/scripts/Python/finishSwigPythonLLDB.py

383 ↗

(On Diff #221612)

I guess this is unused now.

lldb/trunk/scripts/Python/finishSwigPythonLLDB.py

 #           vstrFrameworkPythonDir  - (R) Python framework directory.
 #           vstrSrcFile             - (R) Source file name.
 #           vstrTargetFile          - (R) Destination file name.
 # Returns:  Bool - True = function success, False = failure.
 #           Str - Error description on task failure.
 # Throws:   None.
 #--
 
-
 def make_symlink(
         vDictArgs,
         vstrFrameworkPythonDir,
         vstrSrcFile,
         vstrTargetFile):
     dbg = utilsDebug.CDebugFnVerbose("Python script make_symlink()")
     bOk = True
     strErrMsg = ""
     bDbg = "-d" in vDictArgs
     strTarget = os.path.join(vstrFrameworkPythonDir, vstrTargetFile)
     strTarget = os.path.normcase(strTarget)
-    strSrc = ""
+    strPrefix = vDictArgs['--prefix']
 
     os.chdir(vstrFrameworkPythonDir)
     bMakeFileCalled = "-m" in vDictArgs
     eOSType = utilsOsType.determine_os_type()
-    if not bMakeFileCalled:
-        strBuildDir = os.path.join("..", "..", "..")
-    else:
-        # Resolve vstrSrcFile path relatively the build directory
-        if eOSType == utilsOsType.EnumOsType.Windows:
-            # On a Windows platform the vstrFrameworkPythonDir looks like:
-            # llvm\\build\\Lib\\site-packages\\lldb
-            strBuildDir = os.path.join("..", "..", "..")
-        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)
 
+    strSrc = os.path.normcase(os.path.join(strPrefix, vstrSrcFile))
+    strRelSrc = os.path.relpath(strSrc, os.path.dirname(strTarget))
+    return make_symlink_native(vDictArgs, strRelSrc, strTarget)
 
 #++---------------------------------------------------------------------------
 # 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.
 #           vstrLiblldbDir          - (R) liblldb directory.