From 689b15c1e7db9047f073fa49f2d7fe27b39e5f0e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 21 Dec 2020 14:01:41 -0800 Subject: [PATCH] Build without warnings --- lib/Analysis/Info.plist | 24 --------- llbuild.xcodeproj/project.pbxproj | 54 +++++++------------ perftests/Xcode/PerfTests/Info.plist | 24 --------- products/llbuild-framework/Info.plist | 26 --------- .../llbuildSwift/BuildSystemBindings.swift | 6 +-- unittests/Analysis/Info.plist | 22 -------- unittests/Swift/BuildSystemEngineTests.swift | 2 +- unittests/Swift/Info.plist | 22 -------- unittests/TestSupport/Info.plist | 22 -------- unittests/swift-Ninja/Info.plist | 22 -------- utils/Xcode/LitXCTestAdaptor/Info.plist | 24 --------- 11 files changed, 24 insertions(+), 224 deletions(-) delete mode 100644 lib/Analysis/Info.plist delete mode 100644 perftests/Xcode/PerfTests/Info.plist delete mode 100644 products/llbuild-framework/Info.plist delete mode 100644 unittests/Analysis/Info.plist delete mode 100644 unittests/Swift/Info.plist delete mode 100644 unittests/TestSupport/Info.plist delete mode 100644 unittests/swift-Ninja/Info.plist delete mode 100644 utils/Xcode/LitXCTestAdaptor/Info.plist diff --git a/lib/Analysis/Info.plist b/lib/Analysis/Info.plist deleted file mode 100644 index 7904cbbb5..000000000 --- a/lib/Analysis/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2019 Apple Inc. All rights reserved. - - diff --git a/llbuild.xcodeproj/project.pbxproj b/llbuild.xcodeproj/project.pbxproj index 46d022052..3f33ebfc5 100644 --- a/llbuild.xcodeproj/project.pbxproj +++ b/llbuild.xcodeproj/project.pbxproj @@ -1145,15 +1145,12 @@ B505BFB5228FCBAB00255BD7 /* db.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = db.h; sourceTree = ""; }; B505BFB6228FCFAF00255BD7 /* BuildDBBindings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildDBBindings.swift; sourceTree = ""; }; B52912BE232BF0AD00FD3389 /* llbuildAnalysis.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = llbuildAnalysis.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - B52912C1232BF0AD00FD3389 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B52912C6232BF0AE00FD3389 /* llbuildAnalysisTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = llbuildAnalysisTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; B52912CB232BF0AE00FD3389 /* CriticalPathTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = CriticalPathTests.swift; sourceTree = ""; tabWidth = 4; }; - B52912CD232BF0AE00FD3389 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B52912D5232BF17900FD3389 /* CriticalBuildPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = CriticalBuildPath.swift; sourceTree = ""; tabWidth = 4; }; B52912D7232BF19600FD3389 /* CriticalPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = CriticalPath.swift; sourceTree = ""; tabWidth = 4; }; B52912D9232BF1AC00FD3389 /* IdentifierFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = IdentifierFactory.swift; sourceTree = ""; tabWidth = 4; }; B546B39422C65CFB007046C0 /* llbuildSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = llbuildSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - B546B39822C65CFB007046C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../llbuildSwiftTests/Info.plist; sourceTree = ""; }; B546B3A022C65DF0007046C0 /* BuildSystemBindingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildSystemBindingsTests.swift; sourceTree = ""; }; B546B3A422CA161A007046C0 /* BuildDBBindingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildDBBindingsTests.swift; sourceTree = ""; }; B563CEA620A6252500276198 /* CrossPlatformCompatibility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CrossPlatformCompatibility.h; sourceTree = ""; }; @@ -1178,18 +1175,14 @@ E1066C091BC5BCE700B892CE /* LLVM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LLVM.h; sourceTree = ""; }; E1075ED61E4EA417007D52C6 /* BuildSystemTaskTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuildSystemTaskTests.cpp; sourceTree = ""; }; E10D5CDA19FEBF6A00211ED4 /* LitXCTestAdaptor.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LitXCTestAdaptor.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - E10D5CDD19FEBF6A00211ED4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E10D5CDE19FEBF6A00211ED4 /* LitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LitTests.m; sourceTree = ""; }; E10D5CE319FEF3BD00211ED4 /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = System/Library/Frameworks/Python.framework; sourceTree = SDKROOT; }; E10D5CE519FEF40100211ED4 /* LitTests.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = LitTests.py; sourceTree = ""; }; E10FE0D61B7313D50059D086 /* DepsBuildEngineTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DepsBuildEngineTest.cpp; sourceTree = ""; }; E111C110241B25470086A92D /* llbuildswift-NinjaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "llbuildswift-NinjaTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - E111C111241B25480086A92D /* llbuildSwiftTests copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "llbuildSwiftTests copy-Info.plist"; path = "/Users/ddunbar/public/llbuild/llbuildSwiftTests copy-Info.plist"; sourceTree = ""; }; E111C117241B25960086A92D /* SwiftNinjaTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftNinjaTests.swift; sourceTree = ""; }; E111C142241B25B70086A92D /* Ninja.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Ninja.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E111C143241B25B70086A92D /* llbuild-framework copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "llbuild-framework copy-Info.plist"; path = "/Users/ddunbar/public/llbuild/llbuild-framework copy-Info.plist"; sourceTree = ""; }; E111C158241B269D0086A92D /* llbuildTestSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = llbuildTestSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E111C159241B269D0086A92D /* Analysis copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Analysis copy-Info.plist"; path = "/Users/ddunbar/public/llbuild/Analysis copy-Info.plist"; sourceTree = ""; }; E111C15B241B26D30086A92D /* XCTestCase+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTestCase+Extensions.swift"; sourceTree = ""; }; E111C162241B285E0086A92D /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; E111C163241B285E0086A92D /* NinjaManifest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NinjaManifest.swift; sourceTree = ""; }; @@ -1456,12 +1449,10 @@ E1B839641B5420F500DB876B /* BuildSystemCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuildSystemCommand.cpp; sourceTree = ""; }; E1BE0AAD1C46F93000AD0883 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = ""; }; E1C404AC1A0308F3003392BA /* PerfTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerfTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - E1C404AF1A0308F3003392BA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E1C404B01A0308F3003392BA /* NinjaPerfTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NinjaPerfTests.mm; sourceTree = ""; }; E1C404B71A03090D003392BA /* llvm-only.ninja */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "llvm-only.ninja"; sourceTree = ""; }; E1D191B81B472305000C4E95 /* llbuild-module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = "llbuild-module.modulemap"; sourceTree = ""; }; E1D191BE1B47232B000C4E95 /* llbuild.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = llbuild.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E1D191C61B472372000C4E95 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E1DD22741C47259900555A5D /* Core-C-API.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Core-C-API.cpp"; sourceTree = ""; }; E1DD22761C472A3F00555A5D /* BuildSystem-C-API.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "BuildSystem-C-API.cpp"; sourceTree = ""; }; E1E221041A0067EF00957481 /* BuildDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuildDB.h; sourceTree = ""; }; @@ -2042,7 +2033,6 @@ B52912BF232BF0AD00FD3389 /* Analysis */ = { isa = PBXGroup; children = ( - B52912C1232BF0AD00FD3389 /* Info.plist */, B52912D5232BF17900FD3389 /* CriticalBuildPath.swift */, B52912D7232BF19600FD3389 /* CriticalPath.swift */, B52912D9232BF1AC00FD3389 /* IdentifierFactory.swift */, @@ -2054,7 +2044,6 @@ isa = PBXGroup; children = ( B52912CB232BF0AE00FD3389 /* CriticalPathTests.swift */, - B52912CD232BF0AE00FD3389 /* Info.plist */, ); path = Analysis; sourceTree = ""; @@ -2062,7 +2051,6 @@ B546B39F22C65D2E007046C0 /* Swift */ = { isa = PBXGroup; children = ( - B546B39822C65CFB007046C0 /* Info.plist */, B546B3A022C65DF0007046C0 /* BuildSystemBindingsTests.swift */, B546B3A422CA161A007046C0 /* BuildDBBindingsTests.swift */, B5BE9BA422E854C600777A06 /* BuildKeyTests.swift */, @@ -2101,7 +2089,6 @@ E10D5CDC19FEBF6A00211ED4 /* Supporting Files */ = { isa = PBXGroup; children = ( - E10D5CDD19FEBF6A00211ED4 /* Info.plist */, ); name = "Supporting Files"; sourceTree = ""; @@ -2212,9 +2199,6 @@ 1484D1DB209450A600D3830F /* Vagrantfile */, E1A223F219F98F1C0059043E /* Products */, E13B5E411A00395300EA0405 /* Frameworks */, - E111C111241B25480086A92D /* llbuildSwiftTests copy-Info.plist */, - E111C143241B25B70086A92D /* llbuild-framework copy-Info.plist */, - E111C159241B269D0086A92D /* Analysis copy-Info.plist */, ); indentWidth = 2; sourceTree = ""; @@ -2910,7 +2894,6 @@ E1C404AE1A0308F3003392BA /* Supporting Files */ = { isa = PBXGroup; children = ( - E1C404AF1A0308F3003392BA /* Info.plist */, ); name = "Supporting Files"; sourceTree = ""; @@ -2944,7 +2927,6 @@ E1D191B71B472305000C4E95 /* llbuild-framework */ = { isa = PBXGroup; children = ( - E1D191C61B472372000C4E95 /* Info.plist */, E1D191B81B472305000C4E95 /* llbuild-module.modulemap */, 1484D1F5209453A500D3830F /* README.md */, ); @@ -4900,7 +4882,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 9999; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/lib/Analysis/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.apple.dt.Analysis; PRODUCT_NAME = "llbuild$(TARGET_NAME:c99extidentifier)"; @@ -4918,7 +4900,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 9999; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/lib/Analysis/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.apple.dt.Analysis; PRODUCT_NAME = "llbuild$(TARGET_NAME:c99extidentifier)"; @@ -4931,7 +4913,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - INFOPLIST_FILE = "$(SRCROOT)/unittests/Analysis/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.apple.dt.AnalysisTests; PRODUCT_NAME = "llbuild$(TARGET_NAME)"; @@ -4942,7 +4924,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - INFOPLIST_FILE = "$(SRCROOT)/unittests/Analysis/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.apple.dt.AnalysisTests; PRODUCT_NAME = "llbuild$(TARGET_NAME)"; @@ -4952,7 +4934,7 @@ B546B39D22C65CFB007046C0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = unittests/Swift/Info.plist; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_BUNDLE_IDENTIFIER = com.apple.llbuildSwiftTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -4961,7 +4943,7 @@ B546B39E22C65CFB007046C0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = unittests/Swift/Info.plist; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_BUNDLE_IDENTIFIER = com.apple.llbuildSwiftTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -4978,7 +4960,7 @@ "$(inherited)", "\"BUILT_PRODUCTS_DIR=\\\"$(BUILT_PRODUCTS_DIR)\\\"\"", ); - INFOPLIST_FILE = utils/Xcode/LitXCTestAdaptor/Info.plist; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(PRODUCT_NAME:rfc1034identifier)"; }; @@ -4996,7 +4978,7 @@ "$(inherited)", "\"BUILT_PRODUCTS_DIR=\\\"$(BUILT_PRODUCTS_DIR)\\\"\"", ); - INFOPLIST_FILE = utils/Xcode/LitXCTestAdaptor/Info.plist; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(PRODUCT_NAME:rfc1034identifier)"; }; @@ -5006,6 +4988,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_BUNDLE_IDENTIFIER = com.apple.llbuildSwiftTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -5015,6 +4998,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_BUNDLE_IDENTIFIER = com.apple.llbuildSwiftTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -5027,7 +5011,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = "$(PROJECT_SOURCE_VERSION)"; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/unittests/swift-Ninja/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_NAME = Ninja; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(LLBUILD_SWIFT_VERSION_DEFINITIONS) LLBUILD_FRAMEWORK"; @@ -5041,7 +5025,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = "$(PROJECT_SOURCE_VERSION)"; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/unittests/swift-Ninja/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_NAME = Ninja; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(LLBUILD_SWIFT_VERSION_DEFINITIONS) LLBUILD_FRAMEWORK"; @@ -5056,7 +5040,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 9999; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/unittests/TestSupport/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = NO; @@ -5071,7 +5055,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 9999; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/unittests/TestSupport/Info.plist"; + GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = NO; @@ -5167,6 +5151,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -5226,6 +5211,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -5479,7 +5465,7 @@ "\"SRCROOT=\\\"$(SRCROOT)\\\"\"", "\"TEST_TEMPS_PATH=\\\"$(CONFIGURATION_TEMP_DIR)/test-temps\\\"\"", ); - INFOPLIST_FILE = perftests/Xcode/PerfTests/Info.plist; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_BUNDLE_IDENTIFIER = com.apple.NinjaPerfTests; }; name = Debug; @@ -5496,7 +5482,7 @@ "\"SRCROOT=\\\"$(SRCROOT)\\\"\"", "\"TEST_TEMPS_PATH=\\\"$(CONFIGURATION_TEMP_DIR)/test-temps\\\"\"", ); - INFOPLIST_FILE = perftests/Xcode/PerfTests/Info.plist; + GENERATE_INFOPLIST_FILE = YES; PRODUCT_BUNDLE_IDENTIFIER = com.apple.NinjaPerfTests; }; name = Release; @@ -5509,8 +5495,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = "$(PROJECT_SOURCE_VERSION)"; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GENERATE_INFOPLIST_FILE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/products/libllbuild/include"; - INFOPLIST_FILE = "$(SRCROOT)/products/llbuild-framework/Info.plist"; INSTALL_PATH = "$(DT_SHARED_FRAMEWORKS_INSTALL_DIR:standardizepath)"; MODULEMAP_FILE = "$(SRCROOT)/products/llbuild-framework/llbuild-module.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.apple.dt.llbuild; @@ -5531,8 +5517,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = "$(PROJECT_SOURCE_VERSION)"; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GENERATE_INFOPLIST_FILE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/products/libllbuild/include"; - INFOPLIST_FILE = "$(SRCROOT)/products/llbuild-framework/Info.plist"; INSTALL_PATH = "$(DT_SHARED_FRAMEWORKS_INSTALL_DIR:standardizepath)"; MODULEMAP_FILE = "$(SRCROOT)/products/llbuild-framework/llbuild-module.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.apple.dt.llbuild; diff --git a/perftests/Xcode/PerfTests/Info.plist b/perftests/Xcode/PerfTests/Info.plist deleted file mode 100644 index ba72822e8..000000000 --- a/perftests/Xcode/PerfTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/products/llbuild-framework/Info.plist b/products/llbuild-framework/Info.plist deleted file mode 100644 index 9a55bedce..000000000 --- a/products/llbuild-framework/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2015 Apple Inc. All rights reserved. - - diff --git a/products/llbuildSwift/BuildSystemBindings.swift b/products/llbuildSwift/BuildSystemBindings.swift index 3a7c0be57..324781ad1 100644 --- a/products/llbuildSwift/BuildSystemBindings.swift +++ b/products/llbuildSwift/BuildSystemBindings.swift @@ -62,7 +62,7 @@ public struct BuildSystemCommandInterface { } } -public protocol Tool: class { +public protocol Tool: AnyObject { /// Called to create a specific command instance of this tool. func createCommand(_ name: String) -> ExternalCommand @@ -141,7 +141,7 @@ private final class ToolWrapper { } } -public protocol ExternalCommand: class { +public protocol ExternalCommand: AnyObject { /// Get a signature used to identify the internal state of the command. /// /// This is checked to determine if the command needs to rebuild versus the last time it was run. @@ -180,7 +180,7 @@ public protocol ExternalCommand: class { } -public protocol ProducesCustomBuildValue: class { +public protocol ProducesCustomBuildValue: AnyObject { /// Called to execute the given command that produces a custom build value. /// /// - command: A handle to the executing command. diff --git a/unittests/Analysis/Info.plist b/unittests/Analysis/Info.plist deleted file mode 100644 index 64d65ca49..000000000 --- a/unittests/Analysis/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/unittests/Swift/BuildSystemEngineTests.swift b/unittests/Swift/BuildSystemEngineTests.swift index be41ba03f..5380db659 100644 --- a/unittests/Swift/BuildSystemEngineTests.swift +++ b/unittests/Swift/BuildSystemEngineTests.swift @@ -29,7 +29,7 @@ class FailureCommand: ExternalCommand { } } -protocol ExpectationCommand: class { +protocol ExpectationCommand: AnyObject { func isFulfilled() -> Bool } diff --git a/unittests/Swift/Info.plist b/unittests/Swift/Info.plist deleted file mode 100644 index 64d65ca49..000000000 --- a/unittests/Swift/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/unittests/TestSupport/Info.plist b/unittests/TestSupport/Info.plist deleted file mode 100644 index 64d65ca49..000000000 --- a/unittests/TestSupport/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/unittests/swift-Ninja/Info.plist b/unittests/swift-Ninja/Info.plist deleted file mode 100644 index 64d65ca49..000000000 --- a/unittests/swift-Ninja/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/utils/Xcode/LitXCTestAdaptor/Info.plist b/utils/Xcode/LitXCTestAdaptor/Info.plist deleted file mode 100644 index ba72822e8..000000000 --- a/utils/Xcode/LitXCTestAdaptor/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - -