Fix issue when building with Visual Studio

[tatyana-krasnukha]

Summary

The script failed to make a symlink for liblldb.dll because it tried to find it in build_root__/bin whereas Visual Studio places it in build_root__/Debug/bin (for Debug configuration).

[hhb]

I think this is caused by D68442. Can you check whether D68728 fixes it?

[tatyana-krasnukha]

Hi Haibo,

Sadly, D68728 doesn't fix the issue. It adds "Debug" to the python path, but the script still tries to find 'liblldb.dll' in the wrong location.

[tatyana-krasnukha]

finishSwigPythonLLDB.py

380

This command produces an incorrect path for Visual Studio since it concatenates the root build directory with 'bin/liblldb.dll' bypassing configuration name.

[hhb]

finishSwigPythonLLDB.py

380

Hmm understood. The origin change is reverted in rG958091c209d0. So I don't think this is relevant any more. I'll redo the change. Can you help test that time? I don't have a visual studio...

[hhb]

finishSwigPythonLLDB.py

380

Sorry rGc0da1282fc036908cc721ee74f574fbb99d5e506

[tatyana-krasnukha]

Fixed by reverting the initial commit.

finishSwigPythonLLDB.py

380

Yes, now it works well

[tatyana-krasnukha]

finishSwigPythonLLDB.py

380

Can you help test that time? I don't have a visual studio...

Yes, of course!

BTW, I suppose that '--cmakeBuildConfiguration' option can fix the issue for XCode too.

[hhb]

finishSwigPythonLLDB.py

380

It does. But we have some other issue when LLDB_BUILD_FRAMEWORK is enabled.

Sent D68858. Wish it goes well this me. 😊

finishSwigPythonLLDB.py

def make_symlink_other_platforms(vstrSrcPath, vstrTargetPath):
     return (bOk, strErrMsg)
 
 
 def make_symlink_native(vDictArgs, strSrc, strTarget):
     eOSType = utilsOsType.determine_os_type()
     bDbg = "-d" in vDictArgs
     bOk = True
     strErrMsg = ""
+    strPrefix = vDictArgs['--prefix']
 
     target_filename = os.path.basename(strTarget)
     if eOSType == utilsOsType.EnumOsType.Unknown:
         bOk = False
         strErrMsg = strErrMsgOsTypeUnknown
     elif eOSType == utilsOsType.EnumOsType.Windows:
+        strBuildCfgDir = vDictArgs['--cmakeBuildConfiguration']
+
+        strSrc = os.path.normcase(os.path.join(strPrefix, strBuildCfgDir, strSrc))
+        strSrc = os.path.relpath(strSrc, os.path.dirname(strTarget))
+
         if bDbg:
             print((strMsgSymlinkMk % (target_filename, strSrc, strTarget)))
         bOk, strErrMsg = make_symlink_windows(strSrc,
                                               strTarget)
     else:
         if os.path.islink(strTarget):
             if bDbg:
                 print((strMsgSymlinkExists % target_filename))
             return (bOk, strErrMsg)
+
+        strSrc = os.path.normcase(os.path.join(strPrefix, strSrc))
+        strSrc = os.path.relpath(strSrc, os.path.dirname(strTarget))
+
         if bDbg:
             print((strMsgSymlinkMk % (target_filename, strSrc, strTarget)))
         bOk, strErrMsg = make_symlink_other_platforms(strSrc,
                                                       strTarget)
 
     return (bOk, strErrMsg)
 
 #++---------------------------------------------------------------------------

 def make_symlink(
         vDictArgs,
         vstrFrameworkPythonDir,
         vstrSrcFile,
         vstrTargetFile):
     dbg = utilsDebug.CDebugFnVerbose("Python script make_symlink()")
     strTarget = os.path.join(vstrFrameworkPythonDir, vstrTargetFile)
     strTarget = os.path.normcase(strTarget)
-    strPrefix = vDictArgs['--prefix']
 
     os.chdir(vstrFrameworkPythonDir)
 
-    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)
+    return make_symlink_native(vDictArgs, vstrSrcFile, 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.