[Lldb-commits] [lldb] r285356 - [CMake] Rename lldb-launcher to darwin-debug

[Chris Bieneman via lldb-commits]

Author: cbieneman
Date: Thu Oct 27 17:51:41 2016
New Revision: 285356

URL: http://llvm.org/viewvc/llvm-project?rev=285356&view=rev
Log:
[CMake] Rename lldb-launcher to darwin-debug

Summary: This tool is only built on Darwin, and the name darwin-debug matches the Xcode project. We should have this in sync unless there is a good reason not to.

Reviewers: zturner, tfiala, labath

Subscribers: labath, mgorny, lldb-commits

Differential Revision: https://reviews.llvm.org/D25745

Modified:
    lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
    lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
    lldb/trunk/tools/darwin-debug/CMakeLists.txt

Modified: lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh?rev=285356&r1=285355&r2=285356&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh (original)
+++ lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh Thu Oct 27 17:51:41 2016
@@ -179,7 +179,6 @@ then
             echo "Creating symlink for darwin-debug"
         fi
         cd "${framework_python_dir}"
-        ln -s "../../../../bin/lldb-launcher" darwin-debug
     else
         if [ $Debug -eq 1 ]
         then

Modified: lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/finishSwigPythonLLDB.py?rev=285356&r1=285355&r2=285356&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/finishSwigPythonLLDB.py (original)
+++ lldb/trunk/scripts/Python/finishSwigPythonLLDB.py Thu Oct 27 17:51:41 2016
@@ -452,39 +452,6 @@ def make_symlink_liblldb(
     return (bOk, strErrMsg)
 
 #++---------------------------------------------------------------------------
-# Details:  Make the symbolic link to the darwin-debug.
-# Args:     vDictArgs               - (R) Program input parameters.
-#           vstrFrameworkPythonDir  - (R) Python framework directory.
-#           vstrDarwinDebugFileName - (R) File name for darwin-debug.
-# Returns:  Bool - True = function success, False = failure.
-#           Str - Error description on task failure.
-# Throws:   None.
-#--
-
-
-def make_symlink_darwin_debug(
-        vDictArgs,
-        vstrFrameworkPythonDir,
-        vstrDarwinDebugFileName):
-    dbg = utilsDebug.CDebugFnVerbose(
-        "Python script make_symlink_darwin_debug()")
-    bOk = True
-    strErrMsg = ""
-    strTarget = vstrDarwinDebugFileName
-    strSrc = ""
-
-    bMakeFileCalled = "-m" in vDictArgs
-    if not bMakeFileCalled:
-        return (bOk, strErrMsg)
-    else:
-        strSrc = os.path.join("bin", "lldb-launcher")
-
-    bOk, strErrMsg = make_symlink(
-        vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget)
-
-    return (bOk, strErrMsg)
-
-#++---------------------------------------------------------------------------
 # Details:  Make the symbolic link to the lldb-argdumper.
 # Args:     vDictArgs               - (R) Program input parameters.
 #           vstrFrameworkPythonDir  - (R) Python framework directory.
@@ -550,13 +517,6 @@ def create_symlinks(vDictArgs, vstrFrame
                                               strLibLldbFileName,
                                               vstrLldbLibDir)
 
-    # 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:

Modified: lldb/trunk/tools/darwin-debug/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/darwin-debug/CMakeLists.txt?rev=285356&r1=285355&r2=285356&view=diff
==============================================================================
--- lldb/trunk/tools/darwin-debug/CMakeLists.txt (original)
+++ lldb/trunk/tools/darwin-debug/CMakeLists.txt Thu Oct 27 17:51:41 2016
@@ -1,6 +1,6 @@
-add_lldb_executable(lldb-launcher INCLUDE_IN_FRAMEWORK
+add_lldb_executable(darwin-debug INCLUDE_IN_FRAMEWORK
   darwin-debug.cpp
   )
 
-install(TARGETS lldb-launcher
+install(TARGETS darwin-debug
   RUNTIME DESTINATION bin)