[Lldb-commits] [lldb] r143269 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj resources/LLDB-Info.plist tools/debugserver/debugserver.xcodeproj/project.pbxproj
Greg Clayton
gclayton at apple.com
Fri Oct 28 18:19:09 PDT 2011
Author: gclayton
Date: Fri Oct 28 20:19:08 2011
New Revision: 143269
URL: http://llvm.org/viewvc/llvm-project?rev=143269&view=rev
Log:
Updated the project to use the "DEVELOPER_DIR" build setting that specifies
the path to the /Developer directory, and also bumped the Xcode project version
for lldb-83 and debugserver-148.
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/resources/LLDB-Info.plist
lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=143269&r1=143268&r2=143269&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Oct 28 20:19:08 2011
@@ -3657,7 +3657,7 @@
FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
- INSTALL_PATH = /Developer/usr/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "darwin-debug";
};
@@ -3669,7 +3669,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
- INSTALL_PATH = /Developer/usr/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "darwin-debug";
};
@@ -3680,7 +3680,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
- INSTALL_PATH = /Developer/usr/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "darwin-debug";
};
@@ -3691,9 +3691,9 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 82;
+ DYLIB_CURRENT_VERSION = 83;
EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -3710,7 +3710,7 @@
);
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "resources/LLDB-Info.plist";
- INSTALL_PATH = /Developer/Library/PrivateFrameworks;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/Library/PrivateFrameworks";
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -3741,10 +3741,10 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
DEAD_CODE_STRIPPING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 82;
+ DYLIB_CURRENT_VERSION = 83;
EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -3760,7 +3760,7 @@
);
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "resources/LLDB-Info.plist";
- INSTALL_PATH = /Developer/Library/PrivateFrameworks;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/Library/PrivateFrameworks";
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -3790,8 +3790,8 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 82;
- DYLIB_CURRENT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
+ DYLIB_CURRENT_VERSION = 83;
EXECUTABLE_EXTENSION = a;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -3804,7 +3804,7 @@
__STDC_LIMIT_MACROS,
LLDB_CONFIGURATION_DEBUG,
);
- LD_DYLIB_INSTALL_NAME = "/Developer/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
+ LD_DYLIB_INSTALL_NAME = "$(DEVELOPER_DIR)/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LLVM_BUILD_DIR)",
@@ -3828,8 +3828,8 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 82;
- DYLIB_CURRENT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
+ DYLIB_CURRENT_VERSION = 83;
EXECUTABLE_EXTENSION = a;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -3842,7 +3842,7 @@
__STDC_LIMIT_MACROS,
LLDB_CONFIGURATION_RELEASE,
);
- LD_DYLIB_INSTALL_NAME = "/Developer/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
+ LD_DYLIB_INSTALL_NAME = "$(DEVELOPER_DIR)/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LLVM_BUILD_DIR)",
@@ -3866,8 +3866,8 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 82;
- DYLIB_CURRENT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
+ DYLIB_CURRENT_VERSION = 83;
EXECUTABLE_EXTENSION = a;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -3880,7 +3880,7 @@
__STDC_LIMIT_MACROS,
LLDB_CONFIGURATION_BUILD_AND_INTEGRATION,
);
- LD_DYLIB_INSTALL_NAME = "/Developer/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
+ LD_DYLIB_INSTALL_NAME = "$(DEVELOPER_DIR)/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LLVM_BUILD_DIR)",
@@ -3939,7 +3939,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -3948,7 +3948,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "lldb-Info.plist";
- INSTALL_PATH = /Developer/usr/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = (
"-sectcreate",
@@ -3968,10 +3968,10 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
DEAD_CODE_STRIPPING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 82;
+ DYLIB_CURRENT_VERSION = 83;
EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -3987,7 +3987,7 @@
);
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "resources/LLDB-Info.plist";
- INSTALL_PATH = /Developer/Library/PrivateFrameworks;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/Library/PrivateFrameworks";
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -4028,7 +4028,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- INSTALL_PATH = /usr/local/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
OTHER_LDFLAGS = (
"-framework",
Foundation,
@@ -4054,7 +4054,7 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- INSTALL_PATH = /usr/local/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
OTHER_LDFLAGS = (
"-framework",
Foundation,
@@ -4078,7 +4078,7 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- INSTALL_PATH = /usr/local/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
OTHER_LDFLAGS = (
"-framework",
Foundation,
@@ -4094,7 +4094,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -4105,7 +4105,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "lldb-Info.plist";
- INSTALL_PATH = /Developer/usr/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = (
"-sectcreate",
@@ -4124,7 +4124,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 82;
+ CURRENT_PROJECT_VERSION = 83;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -4133,7 +4133,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "lldb-Info.plist";
- INSTALL_PATH = /Developer/usr/bin;
+ INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = (
"-sectcreate",
Modified: lldb/trunk/resources/LLDB-Info.plist
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/resources/LLDB-Info.plist?rev=143269&r1=143268&r2=143269&view=diff
==============================================================================
--- lldb/trunk/resources/LLDB-Info.plist (original)
+++ lldb/trunk/resources/LLDB-Info.plist Fri Oct 28 20:19:08 2011
@@ -17,7 +17,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>82</string>
+ <string>83</string>
<key>CFBundleName</key>
<string>${EXECUTABLE_NAME}</string>
</dict>
Modified: lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj?rev=143269&r1=143268&r2=143269&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Fri Oct 28 20:19:08 2011
@@ -475,7 +475,7 @@
i386,
);
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 147;
+ CURRENT_PROJECT_VERSION = 148;
"GCC_VERSION[sdk=iphoneos*][arch=*]" = 4.2;
"GCC_VERSION[sdk=macosx*][arch=*]" = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -496,7 +496,7 @@
x86_64,
i386,
);
- CURRENT_PROJECT_VERSION = 147;
+ CURRENT_PROJECT_VERSION = 148;
DEAD_CODE_STRIPPING = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -517,7 +517,7 @@
x86_64,
i386,
);
- CURRENT_PROJECT_VERSION = 147;
+ CURRENT_PROJECT_VERSION = 148;
DEAD_CODE_STRIPPING = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -535,7 +535,7 @@
buildSettings = {
"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 147;
+ CURRENT_PROJECT_VERSION = 148;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
@@ -575,7 +575,7 @@
"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 147;
+ CURRENT_PROJECT_VERSION = 148;
FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
"$(SDKROOT)/System/Library/PrivateFrameworks",
@@ -615,7 +615,7 @@
"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 147;
+ CURRENT_PROJECT_VERSION = 148;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
More information about the lldb-commits
mailing list