Skip to content

Commit

Permalink
[CMake] Rename lldb-launcher to darwin-debug
Browse files Browse the repository at this point in the history
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

llvm-svn: 285356
  • Loading branch information
Chris Bieneman committed Oct 27, 2016
1 parent 0b82459 commit 91967bd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 43 deletions.
1 change: 0 additions & 1 deletion lldb/scripts/Python/finish-swig-Python-LLDB.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 0 additions & 40 deletions lldb/scripts/Python/finishSwigPythonLLDB.py
Original file line number Diff line number Diff line change
Expand Up @@ -451,39 +451,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.
Expand Down Expand Up @@ -550,13 +517,6 @@ def create_symlinks(vDictArgs, vstrFrameworkPythonDir, vstrLldbLibDir):
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:
Expand Down
4 changes: 2 additions & 2 deletions lldb/tools/darwin-debug/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 91967bd

Please sign in to comment.