Merge pull request #43 from neonichu/update-project-to-latest-xcode
Update project settings to latest Xcode
diff --git a/llbuild.xcodeproj/project.pbxproj b/llbuild.xcodeproj/project.pbxproj
index 52bc799..f5da7aa 100644
--- a/llbuild.xcodeproj/project.pbxproj
+++ b/llbuild.xcodeproj/project.pbxproj
@@ -2180,7 +2180,7 @@
E1A223E919F98F1C0059043E /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0730;
+ LastUpgradeCheck = 0830;
ORGANIZATIONNAME = "Apple Inc.";
TargetAttributes = {
E10D5CD919FEBF6A00211ED4 = {
@@ -2941,6 +2941,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INFOPLIST_FILE = utils/Xcode/LitXCTestAdaptor/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+ PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@@ -2960,6 +2961,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INFOPLIST_FILE = utils/Xcode/LitXCTestAdaptor/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+ PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@@ -3064,19 +3066,24 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -3114,8 +3121,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
@@ -3126,8 +3135,10 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -3445,6 +3456,7 @@
"\"TEST_TEMPS_PATH=\\\"$(CONFIGURATION_TEMP_DIR)/test-temps\\\"\"",
);
INFOPLIST_FILE = perftests/Xcode/PerfTests/Info.plist;
+ PRODUCT_BUNDLE_IDENTIFIER = com.apple.NinjaPerfTests;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@@ -3462,6 +3474,7 @@
"\"TEST_TEMPS_PATH=\\\"$(CONFIGURATION_TEMP_DIR)/test-temps\\\"\"",
);
INFOPLIST_FILE = perftests/Xcode/PerfTests/Info.plist;
+ PRODUCT_BUNDLE_IDENTIFIER = com.apple.NinjaPerfTests;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
diff --git a/llbuild.xcodeproj/xcshareddata/xcschemes/PerfTests.xcscheme b/llbuild.xcodeproj/xcshareddata/xcschemes/PerfTests.xcscheme
index 4c502b4..798206d 100644
--- a/llbuild.xcodeproj/xcshareddata/xcschemes/PerfTests.xcscheme
+++ b/llbuild.xcodeproj/xcshareddata/xcschemes/PerfTests.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
diff --git "a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild \050external tests\051.xcscheme" "b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild \050external tests\051.xcscheme"
index f9edfe2..3d88010 100644
--- "a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild \050external tests\051.xcscheme"
+++ "b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild \050external tests\051.xcscheme"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
diff --git a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-Bot.xcscheme b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-Bot.xcscheme
index 1b2032b..84876fd 100644
--- a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-Bot.xcscheme
+++ b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-Bot.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
diff --git a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-asan-Bot.xcscheme b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-asan-Bot.xcscheme
index cdd7385..9b21e87 100644
--- a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-asan-Bot.xcscheme
+++ b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-asan-Bot.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0830"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
@@ -100,6 +100,7 @@
revealArchiveInOrganizer = "YES">
</ArchiveAction>
<InstallAction
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ includeDebugSupportFiles = "YES">
</InstallAction>
</Scheme>
diff --git a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-perf-Bot.xcscheme b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-perf-Bot.xcscheme
index 54bd0b8..fe1cfc9 100644
--- a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-perf-Bot.xcscheme
+++ b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild-perf-Bot.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0830"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
@@ -121,6 +121,7 @@
revealArchiveInOrganizer = "YES">
</ArchiveAction>
<InstallAction
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ includeDebugSupportFiles = "YES">
</InstallAction>
</Scheme>
diff --git a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild.xcscheme b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild.xcscheme
index acef906..a525787 100644
--- a/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild.xcscheme
+++ b/llbuild.xcodeproj/xcshareddata/xcschemes/llbuild.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -11,8 +11,7 @@
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
- buildForAnalyzing = "YES"
- hideIssues = "NO">
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E1A224C219F999B80059043E"
@@ -26,8 +25,7 @@
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
- buildForAnalyzing = "YES"
- hideIssues = "NO">
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E17C29ED1B5AC12B00C12DA9"
@@ -41,8 +39,7 @@
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
- buildForAnalyzing = "YES"
- hideIssues = "NO">
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E1C404AB1A0308F3003392BA"
@@ -56,8 +53,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
- buildForAnalyzing = "NO"
- hideIssues = "NO">
+ buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E10D5CD919FEBF6A00211ED4"
diff --git a/perftests/Xcode/PerfTests/Info.plist b/perftests/Xcode/PerfTests/Info.plist
index 541b7b9..ba72822 100644
--- a/perftests/Xcode/PerfTests/Info.plist
+++ b/perftests/Xcode/PerfTests/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
- <string>com.apple.NinjaPerfTests</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
diff --git a/utils/Xcode/LitXCTestAdaptor/Info.plist b/utils/Xcode/LitXCTestAdaptor/Info.plist
index c22d7b5..ba72822 100644
--- a/utils/Xcode/LitXCTestAdaptor/Info.plist
+++ b/utils/Xcode/LitXCTestAdaptor/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
- <string>com.apple.$(PRODUCT_NAME:rfc1034identifier)</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
