[Lldb-commits] [lldb] r152293 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Core/FormatManager.cpp source/Host/macosx/Host.mm

[Jason Molenda]

Author: jmolenda
Date: Wed Mar  7 22:03:25 2012
New Revision: 152293

URL: http://llvm.org/viewvc/llvm-project?rev=152293&view=rev
Log:
Use a new define, NO_XPC_SERVICES, to indicate that macosx/Host.mm
shouldn't compile any of the XPC support code.  

Update macosx/Host.mm to use that define.

Add a LLDB_DISABLE_PYTHON ifdef block around a new function in 
Core/FormatManager.cpp.

<rdar://problem/10942125>

Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/Core/FormatManager.cpp
    lldb/trunk/source/Host/macosx/Host.mm

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=152293&r1=152292&r2=152293&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Mar  7 22:03:25 2012
@@ -3998,6 +3998,7 @@
 					__STDC_LIMIT_MACROS,
 					LLDB_CONFIGURATION_DEBUG,
 					LLDB_DISABLE_PYTHON,
+					NO_XPC_SERVICES,
 				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -4052,6 +4053,7 @@
 					__STDC_LIMIT_MACROS,
 					LLDB_CONFIGURATION_RELEASE,
 					LLDB_DISABLE_PYTHON,
+					NO_XPC_SERVICES,
 				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -4411,6 +4413,7 @@
 					__STDC_LIMIT_MACROS,
 					LLDB_CONFIGURATION_BUILD_AND_INTEGRATION,
 					LLDB_DISABLE_PYTHON,
+					NO_XPC_SERVICES,
 				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;

Modified: lldb/trunk/source/Core/FormatManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FormatManager.cpp?rev=152293&r1=152292&r2=152293&view=diff
==============================================================================
--- lldb/trunk/source/Core/FormatManager.cpp (original)
+++ lldb/trunk/source/Core/FormatManager.cpp Wed Mar  7 22:03:25 2012
@@ -696,6 +696,7 @@
                                             summary_sp);
 }
 
+#ifndef LLDB_DISABLE_PYTHON
 static void
 AddScriptSummary(TypeCategoryImpl::SharedPointer category_sp,
                  const char* funct_name,
@@ -712,7 +713,7 @@
     category_sp->GetSummaryNavigator()->Add(type_name,
                                             summary_sp);
 }
-
+#endif
 
 #ifndef LLDB_DISABLE_PYTHON
 void

Modified: lldb/trunk/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=152293&r1=152292&r2=152293&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Wed Mar  7 22:03:25 2012
@@ -12,10 +12,10 @@
 #include <AvailabilityMacros.h>
 
 #if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-#define BUILDING_ON_SNOW_LEOPARD 1
+#define NO_XPC_SERVICES 1 
 #endif
 
-#if !BUILDING_ON_SNOW_LEOPARD
+#if !defined(NO_XPC_SERVICES)
 #define __XPC_PRIVATE_H__
 #include <xpc/xpc.h>
 #include "LauncherXPCService.h"
@@ -1260,7 +1260,7 @@
     return flags;
 }
 
-#if !BUILDING_ON_SNOW_LEOPARD
+#if !NO_XPC_SERVICES
 static void
 PackageXPCArguments (xpc_object_t message, const char *prefix, const Args& args)
 {
@@ -1355,7 +1355,7 @@
 static Error
 LaunchProcessXPC (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t &pid)
 {
-#if !BUILDING_ON_SNOW_LEOPARD
+#if !NO_XPC_SERVICES
     Error error = getXPCAuthorization(launch_info);
     if (error.Fail())
         return error;
@@ -1439,9 +1439,9 @@
             error.SetErrorStringWithFormat("Problems with launching via XPC. Error type : %i, code : %i", errorType, errorCode);
         }
     }
-#endif
     
     return error;
+#endif
 }
 
 static Error
@@ -1596,7 +1596,7 @@
 {
     bool result = false;
 
-#if !BUILDING_ON_SNOW_LEOPARD    
+#if !NO_XPC_SERVICES    
     const char *debugserver = "/debugserver";
     int len = strlen(debugserver);
     int exe_len = strlen(exe_path);