[NEW] Fix argdumper build in cmake (OS X) after r228636

[zturner]

Summary

The previous diff in Phabricator got screwed up, presumably because I tried to commandeer the revision and upload a fixed patch. So this is my attempt to fix things. The latest version uploaded by Ilia K is the original patch to this review. I then fixed some issues with that patch, which will be uploaded as the second patch set to this review. Hopefully this will fix things and make Phabricator happy.

[zturner]

This is the patchset that contains my fixes to the python script.

[ki.stfu]

Sorry for tabs and other mistakes. I'll check it today.

[ki.stfu]

it will be committed via http://reviews.llvm.org/D7550

scripts/Python/finish-swig-Python-LLDB.sh

else
     fi
 else
     if [ $Debug -eq 1 ]
     then
         echo "${framework_python_dir}/_lldb.so already exists."
     fi
 fi
 
+# Make symlink for darwin-debug on Darwin
 if [ ${OS_NAME} = "Darwin" ] && [ $MakefileCalled -ne 0 ]
 then
     # We are being built by CMake on Darwin
 
     if [ ! -L "${framework_python_dir}/darwin-debug" ]
     then
         if [ $Debug -eq 1 ]
         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
             echo "${framework_python_dir}/darwin-debug already exists."
         fi
     fi
 fi
 
+# Make symlink for argdumper on any platform
+if [ $MakefileCalled -ne 0 ]
+then
+    # We are being built by CMake
+
+    if [ ! -L "${framework_python_dir}/argdumper" ]
+    then
+        if [ $Debug -eq 1 ]
+        then
+            echo "Creating symlink for argdumper"
+        fi
+        cd "${framework_python_dir}"
+        ln -s "../../../../bin/argdumper" argdumper
+    else
+        if [ $Debug -eq 1 ]
+        then
+            echo "${framework_python_dir}/argdumper already exists."
+        fi
+    fi
+fi
+
 create_python_package () {
     package_dir="${framework_python_dir}$1"
     package_files="$2"
     package_name=`echo $1 | tr '/' '.'`
     package_name="lldb${package_name}"
 
     if [ ! -d "${package_dir}" ]
     then

scripts/Python/finishSwigPythonLLDB.py

 strMsgCreatePyPkgInitFile = "create_py_pkg: Creating pakage init file '%s'";
 strMsgCreatePyPkgMkDir = "create_py_pkg: Created folder '%s'";
 strMsgConfigBuildDir = "Configuration build directory located at '%s'";
 strMsgFoundLldbFrameWkDir = "Found '%s'";
 strMsgPyFileLocatedHere = "Python file will be put in '%s'";
 strMsgFrameWkPyExists = "Python output folder '%s' already exists";
 strMsgFrameWkPyMkDir = "Python output folder '%s' will be created";
 strErrMsgCreateFrmWkPyDirFailed = "Unable to create directory '%s' error: %s";
-strMsglldbsoExists = "Symlink '%s' already exists";
-strMsglldbsoMk = "Creating symlink for _lldb.so  (%s -> %s)";
+strMsgSymlinkExists = "Symlink for '%s' already exists";
+strMsgSymlinkMk = "Creating symlink for %s  (%s -> %s)";
 strErrMsgCpLldbpy = "copying lldb to lldb package directory";
 strErrMsgCreatePyPkgMissingSlash = "Parameter 3 fn create_py_pkg() missing slash"; 
 strErrMsgMkLinkExecute = "Command mklink failed: %s";
 strErrMsgMakeSymlink = "creating symbolic link";
 strErrMsgUnexpected = "Unexpected error: %s";
   
 #++---------------------------------------------------------------------------
 # Details:  Copy files needed by lldb/macosx/heap.py to build libheap.dylib.
except IOError as e:
     strMsg = "I/O error( %d ): %s %s" % (e.errno, e.strerror, strErrMsgCpLldbpy);
     if e.errno == 2:
       strMsg += " Src:'%s' Dst:'%s'" % (strSrc, strDst);
   except:
     bOk = False;
     strMsg = strErrMsgUnexpected % sys.exec_info()[ 0 ];
   
   return (bOk, strMsg);
   
 #++---------------------------------------------------------------------------
-# Details:  Make the symbolic that the script bridge for Python will need in 
-#       the Python framework directory. Code for specific to Windows.
-# Args:   vDictArgs       - (R) Program input parameters.
-#     vstrFrameworkPythonDir  - (R) Python framework directory.
-#     vstrDllName       - (R) File name for _lldb.dll.
+# Details:  Make the symbolic link on a Windows platform.
+# Args:   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_windows( vDictArgs, vstrFrameworkPythonDir, vstrDllName ):
+def make_symlink_windows( vstrSrcPath, vstrTargetPath ):
+  print "Making symlink from %s to %s" % (vstrSrcPath, vstrTargetPath);
   dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_windows()" );
   bOk = True;
-  strMsg = "";
+  strErrMsg = "";
+
+  try:
+    csl = ctypes.windll.kernel32.CreateHardLinkW
+    csl.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
+    csl.restype = ctypes.c_ubyte
+    if csl(vstrTargetPath, vstrSrcPath, 0) == 0:
+      raise ctypes.WinError()
+  except Exception as e:
+    if e.errno != 17:
+      bOk = False;
+      strErrMsg = "WinError( %d ): %s %s" % (e.errno, e.strerror, strErrMsgMakeSymlink);
+      strErrMsg += " Src:'%s' Target:'%s'" % (vstrSrcPath, vstrTargetPath);
+
+  return (bOk, strErrMsg);
 
+#++---------------------------------------------------------------------------
+# Details:  Make the symbolic link on a UNIX style platform.
+# Args:   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_other_platforms( vstrSrcPath, vstrTargetPath ):
+  dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_other_platforms()" );
+  bOk = True;
+  strErrMsg = "";
+
+  try:
+    os.symlink( vstrSrcPath, vstrTargetPath );
+  except OSError as e:
+    bOk = False;
+    strErrMsg = "OSError( %d ): %s %s" % (e.errno, e.strerror, strErrMsgMakeSymlink);
+    strErrMsg += " Src:'%s' Target:'%s'" % (vstrSrcPath, vstrTargetPath);
+  except:
+    bOk = False;
+    strErrMsg = strErrMsgUnexpected % sys.exec_info()[ 0 ];
+
+  return (bOk, strErrMsg);
+
+#++---------------------------------------------------------------------------
+# Details:  Make the symbolic link.
+# Args:   vDictArgs       - (R) Program input parameters.
+#     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 = vDictArgs.has_key( "-d" );
-  strTarget = vstrDllName;
-  # When importing an extension module using a debug version of python, you
-  # write, for example, "import foo", but the interpreter searches for
-  # "foo_d.pyd"
-  if vDictArgs["--buildConfig"].lower() == "debug":
-    strTarget += "_d";
-  strTarget += ".pyd";
-  strDLLPath = "%s\\%s" % (vstrFrameworkPythonDir, strTarget);
-  strTarget = os.path.normcase( strDLLPath );
+  strTarget = "%s/%s" % (vstrFrameworkPythonDir, vstrTargetFile);
+  strTarget = os.path.normcase( strTarget );
   strSrc = "";
 
   os.chdir( vstrFrameworkPythonDir );
   bMakeFileCalled = vDictArgs.has_key( "-m" );
+  eOSType = utilsOsType.determine_os_type();
   if not bMakeFileCalled:
-    strSrc = os.path.normcase( "../../../LLDB" );
+    return (bOk, strErrMsg);
   else:
-    strLibFileExtn = ".dll";
-    strSrc = os.path.normcase( "../../../bin/liblldb%s" % strLibFileExtn );
+    strSrc = os.path.normcase( "../../../%s" % vstrSrcFile );
 
+  if eOSType == utilsOsType.EnumOsType.Unknown:
+    bOk = False;
+    strErrMsg = strErrMsgOsTypeUnknown;
+  elif eOSType == utilsOsType.EnumOsType.Windows:
     if os.path.isfile( strTarget ):
       if bDbg:
-      print strMsglldbsoExists % strTarget;
-    return (bOk, strMsg);
-
+        print strMsgSymlinkExists % vstrTargetFile;
     if bDbg:
-    print strMsglldbsoMk % (os.path.abspath(strSrc), os.path.abspath(strTarget));
-    
-  try:
-    csl = ctypes.windll.kernel32.CreateHardLinkW
-    csl.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
-    csl.restype = ctypes.c_ubyte
-    if csl(strTarget, strSrc, 0) == 0:
-      raise ctypes.WinError()
-  except Exception as e:
-    bOk = False;
-    strMsg = "WinError( %d ): %s %s" % (e.errno, e.strerror, strErrMsgMakeSymlink);
-    strMsg += " Src:'%s' Target:'%s'" % (strSrc, strTarget);
+      print strMsgSymlinkMk % (vstrTargetFile, strSrc, strTarget);
+    bOk, strErrMsg = make_symlink_windows( strSrc,
+                                               strTarget );
+  else:
+    if os.path.islink( strTarget ):
+      if bDbg:
+        print strMsgSymlinkExists % vstrTargetFile;
+    if bDbg:
+      print strMsgSymlinkMk % (vstrTargetFile, strSrc, strTarget);
+    return (bOk, strErrMsg);
+    bOk, strErrMsg = make_symlink_other_platforms( strSrc,
+                             strTarget );   
 
-  return (bOk, strMsg);
-  
+  return (bOk, strErrMsg);
 #++---------------------------------------------------------------------------
-# Details:  Make the symbolic link that the script bridge for Python will need in 
-#       the Python framework directory. Code for all platforms apart from
-#     Windows.
+# 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.
-#     vstrSoName        - (R) File name for _lldb.so.
+#     vstrLiblldbName     - (R) File name for _lldb library.
 # Returns:  Bool - True = function success, False = failure.
 #     Str - Error description on task failure.
 # Throws: None.
 #--
-def make_symlink_other_platforms( vDictArgs, vstrFrameworkPythonDir, vstrSoPath ):
-  dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_other_platforms()" );
+def make_symlink_liblldb( vDictArgs, vstrFrameworkPythonDir, vstrLiblldbFileName ):
+  dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_liblldb()" );
   bOk = True;
-  strMsg = "";
-  bDbg = vDictArgs.has_key( "-d" );
-  strTarget = vstrSoPath + ".so";
-  strSoPath = "%s/%s" % (vstrFrameworkPythonDir, strTarget);
-  strTarget = os.path.normcase( strSoPath );
+  strErrMsg = "";
+  strTarget = vstrLiblldbFileName
   strSrc = "";
-      
-  os.chdir( vstrFrameworkPythonDir );
+  eOSType = utilsOsType.determine_os_type();
+  if eOSType == utilsOsType.EnumOsType.Windows:
+    # When importing an extension module using a debug version of python, you
+    # write, for example, "import foo", but the interpreter searches for
+    # "foo_d.pyd"
+    if vDictArgs["--buildConfig"].lower() == "debug":
+      strTarget += "_d";
+    strTarget += ".pyd";
+  else:
+    strTarget += ".so";
+
   bMakeFileCalled = vDictArgs.has_key( "-m" );
   if not bMakeFileCalled:
-    strSrc = os.path.normcase( "../../../LLDB" );
+    strSrc = "lib/LLDB";
   else:
     strLibFileExtn = "";
-    eOSType = utilsOsType.determine_os_type();
+    if eOSType == utilsOsType.EnumOsType.Windows:
+      strLibFileExtn = ".dll";
+      strSrc = "bin/liblldb%s" % strLibFileExtn;
+    else:
       if eOSType == utilsOsType.EnumOsType.Linux:
-      strLibFileExtn = ".so";
+          strLibFileExtn = ".so";
       elif eOSType == utilsOsType.EnumOsType.Darwin:
-      strLibFileExtn = ".dylib";
-    strSrc = os.path.normcase( "../../../liblldb%s" % strLibFileExtn );
-
-  if os.path.islink( strTarget ):
-    if bDbg:
-      print strMsglldbsoExists % strTarget;
-    return (bOk, strMsg);
-  
-  if bDbg:
-    print strMsglldbsoMk;
-    
-  try:
-    os.symlink( strSrc, strTarget );
-  except OSError as e:
-    bOk = False;
-    strMsg = "OSError( %d ): %s %s" % (e.errno, e.strerror, strErrMsgMakeSymlink);
-    strMsg += " Src:'%s' Target:'%s'" % (strSrc, strTarget);
-  except:
-    bOk = False;
-    strMsg = strErrMsgUnexpected % sys.exec_info()[ 0 ];
-  
-  return (bOk, strMsg);
-  
+          strLibFileExtn = ".dylib";
+      strSrc = "lib/liblldb%s" % strLibFileExtn;
+  bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
+  return (bOk, strErrMsg);
 #++---------------------------------------------------------------------------
-# Details:  Make the symbolic link to the darwin-debug. Code for all platforms
-#           apart from Windows.
+# 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_other_platforms()" );
+  dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_darwin_debug()" );
   bOk = True;
-  strMsg = "";
-  bDbg = vDictArgs.has_key( "-d" );
-  strTarget = vstrDarwinDebugFileName
-  strDarwinDebugPath = "%s/%s" % (vstrFrameworkPythonDir, strTarget);
-  strTarget = os.path.normcase( strDarwinDebugPath );
+  strErrMsg = "";
+  strTarget = vstrDarwinDebugFileName;
   strSrc = "";
       
-  os.chdir( vstrFrameworkPythonDir );
   bMakeFileCalled = vDictArgs.has_key( "-m" );
   if not bMakeFileCalled:
-      return (bOk, strMsg);
+      return (bOk, strErrMsg);
   else:
-    strSrc = os.path.normcase( "../../../../bin/lldb-launcher" );
+    strSrc = "bin/lldb-launcher";
 
-  if os.path.islink( strTarget ):
-    if bDbg:
-      print strMsglldbsoExists % strTarget;
-    return (bOk, strMsg);
-  
-  if bDbg:
-    print strMsglldbsoMk;
-    
-  try:
-    os.symlink( strSrc, strTarget );
-  except OSError as e:
-    bOk = False;
-    strMsg = "OSError( %d ): %s %s" % (e.errno, e.strerror, strErrMsgMakeSymlink);
-    strMsg += " Src:'%s' Target:'%s'" % (strSrc, strTarget);
-  except:
-    bOk = False;
-    strMsg = strErrMsgUnexpected % sys.exec_info()[ 0 ];
+  bOk, strErrMsg = make_symlink( strSrc, strTarget );
+  return (bOk, strErrMsg);
+#++---------------------------------------------------------------------------
+# Details:  Make the symbolic link to the argdumper.
+# Args:   vDictArgs       - (R) Program input parameters.
+#     vstrFrameworkPythonDir  - (R) Python framework directory.
+#     vstrArgdumperFileName - (R) File name for argdumper.
+# Returns:  Bool - True = function success, False = failure.
+#     Str - Error description on task failure.
+# Throws: None.
+#--
+def make_symlink_argdumper( vDictArgs, vstrFrameworkPythonDir, vstrArgdumperFileName ):
+  dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_argdumper()" );
+  bOk = True;
+  strErrMsg = "";
+  strTarget = vstrArgdumperFileName;
+  strSrc = "";
       
-  return (bOk, strMsg);
+  bMakeFileCalled = vDictArgs.has_key( "-m" );
+  if not bMakeFileCalled:
+      return (bOk, strErrMsg);
+  else:
+    eOSType = utilsOsType.determine_os_type();
+    strSrc = "bin/argdumper";
+    if eOSType == utilsOsType.EnumOsType.Windows:
+      strSrc += ".exe"
+      strTarget += ".exe";
+
+  bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
+
+  return (bOk, strErrMsg);
 
 #++---------------------------------------------------------------------------
 # Details:  Make the symlink that the script bridge for Python will need in 
 #       the Python framework directory.
 # Args:   vDictArgs       - (R) Program input parameters.
 #       vstrFrameworkPythonDir  - (R) Python framework directory.
 # Returns:  Bool - True = function success, False = failure.
 #     strErrMsg - Error description on task failure.
 # Throws: None.
 #--
-def make_symlink( vDictArgs, vstrFrameworkPythonDir ):
-  dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink()" );
+def create_symlinks( vDictArgs, vstrFrameworkPythonDir ):
+  dbg = utilsDebug.CDebugFnVerbose( "Python script create_symlinks()" );
   bOk = True;
   strWkDir = "";
   strErrMsg = "";
   eOSType = utilsOsType.determine_os_type();
 
-    # Make symlink for _lldb
+  # Make symlink for _lldb
   strSoFileName = "_lldb";
-  if eOSType == utilsOsType.EnumOsType.Unknown:
-    bOk = False;
-    strErrMsg = strErrMsgOsTypeUnknown;
-  elif eOSType == utilsOsType.EnumOsType.Windows:
-    bOk, strErrMsg = make_symlink_windows( vDictArgs, 
-                         vstrFrameworkPythonDir,
-                         strSoFileName );
-  else:
-    bOk, strErrMsg = make_symlink_other_platforms( vDictArgs, 
-                             vstrFrameworkPythonDir,
-                             strSoFileName );   
+  if bOk:
+    bOk, strErrMsg = make_symlink_liblldb( vDictArgs,
+                         strSoFileName );
 
-    # Make symlink for darwin-debug
+  # 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 argdumper
+  strArgdumperFileName = "argdumper"
+  if bOk:
+    bOk, strErrMsg = make_symlink_argdumper( vDictArgs,
+                         vstrFrameworkPythonDir,
+                         strArgdumperFileName );
+
   return (bOk, strErrMsg);
 
 #++---------------------------------------------------------------------------
 # Details:  Look for the directory in which to put the Python files; if it 
 #     does not already exist, attempt to make it.
 # Args:   vDictArgs       - (R) Program input parameters.
 #     vstrFrameworkPythonDir  - (R) Python framework directory.
 # Returns:  Bool - True = function success, False = failure.
def main( vDictArgs ):
   if bOk and bDbg:
     print strMsgPyFileLocatedHere % strFrameworkPythonDir;
     print strMsgConfigBuildDir % strCfgBldDir;
   
   if bOk:
     bOk, strMsg = find_or_create_python_dir( vDictArgs, strFrameworkPythonDir );
   
   if bOk:
-    bOk, strMsg = make_symlink( vDictArgs, strFrameworkPythonDir );
+    bOk, strMsg = create_symlinks( vDictArgs, strFrameworkPythonDir );
   
   if bOk:
     bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir( vDictArgs,
                             strFrameworkPythonDir,
                             strCfgBldDir );
   strRoot = vDictArgs[ "--srcRoot" ];
   if bOk:
     # lldb

test/functionalities/launch_with_glob/TestLaunchWithGlob.py

class LaunchWithGlobTestCase(TestBase):
         
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym()
         self.do_test ()
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dwarf_test
     def test_with_dwarf (self):
         self.buildDwarf()
         self.do_test ()
 
     def do_test (self):
         exe = os.path.join (os.getcwd(), "a.out")
         

tools/CMakeLists.txt

 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_subdirectory(darwin-debug)
   add_subdirectory(debugserver)
 endif()
+  add_subdirectory(argdumper)
   add_subdirectory(driver)
 if (NOT __ANDROID_NDK__)
   add_subdirectory(lldb-mi)
 endif()
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux")
   add_subdirectory(lldb-gdbserver)
 endif()
 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_subdirectory(lldb-platform)
 endif()

tools/argdumper/CMakeLists.txt

+add_lldb_executable(argdumper
+  argdumper.cpp
+  )
+
+target_link_libraries(argdumper liblldb)
+
+install(TARGETS argdumper
+  RUNTIME DESTINATION bin)