This revision was automatically updated to reflect the committed changes.
Closed by commit rL285356: [CMake] Rename lldb-launcher to darwin-debug
(authored by cbieneman).
Changed prior to commit:
https://reviews.llvm.org/D25745?vs=75507&id=76121#toc
Repository:
rL LLVM
https://reviews.llvm.org/D25745
Files:
lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
lldb/trunk/tools/darwin-debug/CMakeLists.txt
Index: lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
+++ lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
@@ -452,39 +452,6 @@
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 @@
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:
Index: lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
===================================================================
--- lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
+++ lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
@@ -179,7 +179,6 @@
echo "Creating symlink for darwin-debug"
fi
cd "${framework_python_dir}"
- ln -s "../../../../bin/lldb-launcher" darwin-debug
else
if [ $Debug -eq 1 ]
then
Index: lldb/trunk/tools/darwin-debug/CMakeLists.txt
===================================================================
--- lldb/trunk/tools/darwin-debug/CMakeLists.txt
+++ lldb/trunk/tools/darwin-debug/CMakeLists.txt
@@ -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)
Index: lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
+++ lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
@@ -452,39 +452,6 @@
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 @@
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:
Index: lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
===================================================================
--- lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
+++ lldb/trunk/scripts/Python/finish-swig-Python-LLDB.sh
@@ -179,7 +179,6 @@
echo "Creating symlink for darwin-debug"
fi
cd "${framework_python_dir}"
- ln -s "../../../../bin/lldb-launcher" darwin-debug
else
if [ $Debug -eq 1 ]
then
Index: lldb/trunk/tools/darwin-debug/CMakeLists.txt
===================================================================
--- lldb/trunk/tools/darwin-debug/CMakeLists.txt
+++ lldb/trunk/tools/darwin-debug/CMakeLists.txt
@@ -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)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
