[Lldb-commits] [lldb] r112626 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Host/macosx/Host.mm

[Greg Clayton]

Author: gclayton
Date: Tue Aug 31 13:56:24 2010
New Revision: 112626

URL: http://llvm.org/viewvc/llvm-project?rev=112626&view=rev
Log:
Cleaned up my previous submission which had some header search paths that
were not needed and fixed a merge issue.


Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    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=112626&r1=112625&r2=112626&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Aug 31 13:56:24 2010
@@ -2812,10 +2812,7 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = 4.2;
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/System.framework/PrivateHeaders,
-					/usr/include/python2.6,
-				);
+				HEADER_SEARCH_PATHS = /usr/include/python2.6;
 				INFOPLIST_FILE = "resources/LLDB-Info.plist";
 				INSTALL_PATH = /Developer/Library/PrivateFrameworks;
 				LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
@@ -2868,10 +2865,7 @@
 				GCC_ENABLE_OBJC_GC = supported;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_VERSION = 4.2;
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/System.framework/PrivateHeaders,
-					/usr/include/python2.6,
-				);
+				HEADER_SEARCH_PATHS = /usr/include/python2.6;
 				INFOPLIST_FILE = "resources/LLDB-Info.plist";
 				INSTALL_PATH = /Developer/Library/PrivateFrameworks;
 				LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
@@ -2981,10 +2975,7 @@
 				GCC_ENABLE_OBJC_GC = supported;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_VERSION = 4.2;
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/System.framework/PrivateHeaders,
-					/usr/include/python2.6,
-				);
+				HEADER_SEARCH_PATHS = /usr/include/python2.6;
 				INFOPLIST_FILE = "resources/LLDB-Info.plist";
 				INSTALL_PATH = /Developer/Library/PrivateFrameworks;
 				LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";

Modified: lldb/trunk/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=112626&r1=112625&r2=112626&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Tue Aug 31 13:56:24 2010
@@ -834,6 +834,7 @@
     
     file_and_line_desc.descKey = keyAEPosition;
     
+    static std::string g_app_name;
     static FSRef g_app_fsref;
 
     LSApplicationParameters app_params;
@@ -846,11 +847,10 @@
     
     if (external_editor)
     {
-        bool calculate_fsref = true;
         if (log)
             log->Printf("Looking for external editor \"%s\".\n", external_editor);
 
-        if (app_name.empty() || strcmp (app_name.c_str(), external_editor) != 0)
+        if (g_app_name.empty() || strcmp (g_app_name.c_str(), external_editor) != 0)
         {
             CFCString editor_name (external_editor, kCFStringEncodingUTF8);
             error = ::LSFindApplicationForInfo (kLSUnknownCreator,