Improve Scheme generation - Generate a scheme containing all indexer targets as buildable references. This gives Xcode enough information to index indexer targets using the active ARCH instead of x86_64. - No longer generate runnable schemes for library and test targets Test targets are still testable, but not runnable. Similarly, library targets are still buildable, but not runnable. PiperOrigin-RevId: 188092024
diff --git a/src/TulsiGenerator/PBXObjects.swift b/src/TulsiGenerator/PBXObjects.swift index acb2721..bdd48bc 100644 --- a/src/TulsiGenerator/PBXObjects.swift +++ b/src/TulsiGenerator/PBXObjects.swift
@@ -721,6 +721,11 @@ return self == .UnitTest || self == .UIUnitTest } + /// Whether or not this ProductTypes denotes a library target. + var isLibrary: Bool { + return self == .StaticLibrary || self == .DynamicLibrary + } + /// Returns the extension type associated with this watch app type (or nil if this ProductType /// is not a WatchApp type). var watchAppExtensionType: ProductType? {
diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift index cb5a3c9..a6c8a5d 100644 --- a/src/TulsiGenerator/PBXTargetGenerator.swift +++ b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -1065,21 +1065,17 @@ buildSettings["OTHER_SWIFT_FLAGS"] = "$(inherited) " + data.otherSwiftFlags.joined(separator: " ") } - // Force the indexers to target the x86_64 simulator. This minimizes issues triggered by - // Xcode's use of SourceKit to parse Swift-based code. Specifically, Xcode appears to use the - // first ARCHS value that also appears in VALID_ARCHS when attempting to process swiftmodule's - // during Live issues parsing. - // Anecdotally it would appear that users target 64-bit simulators more often than armv7 devices - // (the first architecture in Xcode 8's default value), so this change increases the chance that - // the LI parser is able to find appropriate swiftmodule artifacts generated by the Bazel build. - // Default the sdkroot to iOS sim. + // Default the SDKROOT to the proper device SDK. + // Previously, we would force the indexer targets to the x86_64 simulator. This caused indexing + // to fail when building Swift for device, as the arm Swift modules would be discovered via + // tulsi-includes but Xcode would only index for x86_64. Note that just setting this is not + // enough; research has shown that Xcode needs a scheme for these indexer targets in order to + // use the proper ARCH for indexing, so we also generate an `_idx_Scheme` containing all + // indexer targets as build targets. let deploymentTarget = data.deploymentTarget let platform = deploymentTarget.platform - buildSettings["SDKROOT"] = platform.simulatorSDK - - buildSettings["ARCHS"] = "x86_64" + buildSettings["SDKROOT"] = platform.deviceSDK buildSettings[platform.buildSettingsDeploymentTarget] = deploymentTarget.osVersion - buildSettings["VALID_ARCHS"] = "x86_64" createBuildConfigurationsForList(target.buildConfigurationList, buildSettings: buildSettings,
diff --git a/src/TulsiGenerator/XcodeProjectGenerator.swift b/src/TulsiGenerator/XcodeProjectGenerator.swift index 821b1f2..cf1d2f6 100644 --- a/src/TulsiGenerator/XcodeProjectGenerator.swift +++ b/src/TulsiGenerator/XcodeProjectGenerator.swift
@@ -648,33 +648,23 @@ let filename = target.name + ".xcscheme" let url = xcschemesURL.appendingPathComponent(filename) - let appExtension: Bool - let extensionType: String? - let launchStyle: XcodeScheme.LaunchStyle - let runnableDebuggingMode: XcodeScheme.RunnableDebuggingMode let targetType = entry.pbxTargetType ?? .Application - switch targetType { - case .MessagesExtension: - fallthrough - case .MessagesStickerPackExtension: - fallthrough - case .AppExtension: - appExtension = true - launchStyle = .AppExtension - runnableDebuggingMode = .Default - extensionType = entry.extensionType - case .Watch1App, .Watch2App: - appExtension = false - extensionType = nil - launchStyle = .Normal - runnableDebuggingMode = .Remote + var appExtension: Bool = false + var extensionType: String? = nil + var launchStyle: XcodeScheme.LaunchStyle? = .Normal + var runnableDebuggingMode: XcodeScheme.RunnableDebuggingMode = .Default - default: - appExtension = false - launchStyle = .Normal - runnableDebuggingMode = .Default - extensionType = nil + if targetType.isiOSAppExtension { + appExtension = true + launchStyle = .AppExtension + extensionType = entry.extensionType + } else if targetType.isWatchApp { + runnableDebuggingMode = .Remote + } else if targetType.isLibrary { + launchStyle = nil + } else if targetType.isTest { + launchStyle = nil } var additionalBuildTargets = target.buildActionDependencies.map() { @@ -767,6 +757,32 @@ return (validTests, suiteHostTarget) } + func installSchemesForIndexerTargets() throws { + let indexerTargets = info.indexerTargets.values + guard !indexerTargets.isEmpty else { return } + + let filename = "_idx_Scheme.xcscheme" + let url = xcschemesURL.appendingPathComponent(filename) + + let additionalBuildTargets = indexerTargets.map() { + ($0, projectBundleName, XcodeScheme.makeBuildActionEntryAttributes()) + } + + let scheme = XcodeScheme(target: nil, + project: info.project, + projectBundleName: projectBundleName, + launchStyle: nil, + additionalBuildTargets: additionalBuildTargets, + preActionScripts: [:], + postActionScripts: [:], + localizedMessageLogger: localizedMessageLogger) + let xmlDocument = scheme.toXML() + + let data = xmlDocument.xmlData(options: XMLNode.Options.nodePrettyPrint) + try writeDataHandler(url, data) + } + try installSchemesForIndexerTargets() + func installSchemeForTestSuite(_ suite: RuleEntry, named suiteName: String) throws { let (validTests, extractedHostTarget) = extractTestTargets(suite) guard !validTests.isEmpty else { @@ -785,6 +801,7 @@ projectBundleName: projectBundleName, testActionBuildConfig: runTestTargetBuildConfigPrefix + "Debug", profileActionBuildConfig: runTestTargetBuildConfigPrefix + "Release", + launchStyle: .Normal, explicitTests: Array(validTests), commandlineArguments: commandlineArguments(for: suite), environmentVariables: environmentVariables(for: suite),
diff --git a/src/TulsiGenerator/XcodeScheme.swift b/src/TulsiGenerator/XcodeScheme.swift index 61ff250..c94100f 100644 --- a/src/TulsiGenerator/XcodeScheme.swift +++ b/src/TulsiGenerator/XcodeScheme.swift
@@ -48,7 +48,7 @@ let archiveActionBuildConfig: String let appExtension: Bool let extensionType: String? - let launchStyle: LaunchStyle + let launchStyle: LaunchStyle? let runnableDebuggingMode: RunnableDebuggingMode let explicitTests: [PBXTarget]? // List of additional targets and their project bundle names that should be built along with the @@ -71,7 +71,7 @@ archiveActionBuildConfig: String = "Release", appExtension: Bool = false, extensionType: String? = nil, - launchStyle: LaunchStyle = .Normal, + launchStyle: LaunchStyle? = nil, runnableDebuggingMode: RunnableDebuggingMode = .Default, version: String = "1.3", explicitTests: [PBXTarget]? = nil, @@ -267,7 +267,7 @@ "debugServiceExtension": "internal", "allowLocationSimulation": "YES", ] - if launchStyle == .AppExtension { + if let launchStyle = launchStyle, launchStyle == .AppExtension { attributes["selectedDebuggerIdentifier"] = "" attributes["selectedLauncherIdentifier"] = "Xcode.IDEFoundation.Launcher.PosixSpawn" attributes["launchAutomaticallySubstyle"] = launchStyle.rawValue @@ -284,7 +284,12 @@ if let postActionScript = postActionScripts[XcodeActionType.LaunchAction] { element.addChild(postActionElement(postActionScript)) } - if launchStyle != .AppExtension { + + if launchStyle == nil { + if let reference = macroReference() { + element.addChild(reference) + } + } else if launchStyle != .AppExtension { if let runnable = buildableProductRunnable(runnableDebuggingMode) { element.addChild(runnable) } @@ -316,13 +321,20 @@ element.setAttributesWith(attributes) let childRunnableDebuggingMode: RunnableDebuggingMode - if launchStyle != .AppExtension { - childRunnableDebuggingMode = runnableDebuggingMode + if let launchStyle = launchStyle { + if launchStyle != .AppExtension { + childRunnableDebuggingMode = runnableDebuggingMode + } else { + childRunnableDebuggingMode = .Default + } + if let runnable = buildableProductRunnable(childRunnableDebuggingMode) { + element.addChild(runnable) + } } else { - childRunnableDebuggingMode = .Default - } - if let runnable = buildableProductRunnable(childRunnableDebuggingMode) { - element.addChild(runnable) + // Not launchable, just use a macro reference. + if let runnable = macroReference() { + element.addChild(runnable) + } } return element
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj index fb5518d..6426d22 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -936,86 +936,74 @@ 44936BD67EED3C4D00000004 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; FRAMEWORK_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tulsi_e2e_complex/ObjCFramework"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_complex/Application/includes/first/include $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/first/include $(TULSI_WR)/tulsi_e2e_complex/Application/includes/second/include $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/second/include $(TULSI_WR)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tulsi_e2e_complex/Application/includes/first/include $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/first/include $(TULSI_BWRS)/tulsi_e2e_complex/Application/includes/second/include $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/second/include $(TULSI_BWRS)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DA=BINARY_DEFINE -DLIBRARY SECOND DEFINE=2 -DLIBRARY_DEFINES_DEFINE=1 -DLIBRARY_VALUE_WITH_SPACES=Value with spaces -DSubLibraryWithDefines=1 -DSubLibraryWithDefines_DEFINE=SubLibraryWithDefines -DSubLibraryWithDifferentDefines=1"; PRODUCT_NAME = _idx_ApplicationLibrary_30DD5A4B_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000005 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000006 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREFIX_HEADER = "$(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/PCHGenerator/outs/PCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY SECOND DEFINE=2 -DLIBRARY_COPT_DEFINE -DLIBRARY_DEFINES_DEFINE=1 -DLIBRARY_VALUE_WITH_SPACES=Value with spaces -DSubLibraryWithDefines=1 -DSubLibraryWithDefines_DEFINE=SubLibraryWithDefines -DSubLibraryWithDifferentDefines=1"; PRODUCT_NAME = _idx_Library_20EC2F4A_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000007 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-D'SubLibraryWithDifferentDefines Define with spaces and value'=1 -D'SubLibraryWithDifferentDefines Define with spaces' -DSubLibraryWithDifferentDefines=1 -DSubLibraryWithDifferentDefines_INTEGER_DEFINE=1 -DSubLibraryWithDifferentDefines_LocalDefine -DSubLibraryWithDifferentDefines_STRING_DEFINE=Test -DSubLibraryWithDifferentDefines_STRING_WITH_SPACES='String with spaces'"; PRODUCT_NAME = _idx_SubLibraryWithDifferentDefines_32E5A9BC_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000008 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; CLANG_ENABLE_MODULES = YES; GCC_PREFIX_HEADER = "$(TULSI_BWRS)/tulsi_e2e_complex/SubLibrary/pch/AnotherPCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SubLibrary_19588DB9_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000009 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) /SubLibraryWithDefines/local/includes $(TULSI_BWRS)/relative/SubLibraryWithDefines/local/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-menable-no-nans -menable-no-infs -DSubLibraryWithDefines=1 -DSubLibraryWithDefines_DEFINE=SubLibraryWithDefines"; PRODUCT_NAME = _idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -1115,86 +1103,74 @@ 44936BD6A3D45CE900000004 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; FRAMEWORK_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tulsi_e2e_complex/ObjCFramework"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_complex/Application/includes/first/include $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/first/include $(TULSI_WR)/tulsi_e2e_complex/Application/includes/second/include $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/second/include $(TULSI_WR)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tulsi_e2e_complex/Application/includes/first/include $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/first/include $(TULSI_BWRS)/tulsi_e2e_complex/Application/includes/second/include $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/Application/includes/second/include $(TULSI_BWRS)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DA=BINARY_DEFINE -DLIBRARY SECOND DEFINE=2 -DLIBRARY_DEFINES_DEFINE=1 -DLIBRARY_VALUE_WITH_SPACES=Value with spaces -DSubLibraryWithDefines=1 -DSubLibraryWithDefines_DEFINE=SubLibraryWithDefines -DSubLibraryWithDifferentDefines=1"; PRODUCT_NAME = _idx_ApplicationLibrary_30DD5A4B_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000005 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000006 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREFIX_HEADER = "$(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/PCHGenerator/outs/PCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY SECOND DEFINE=2 -DLIBRARY_COPT_DEFINE -DLIBRARY_DEFINES_DEFINE=1 -DLIBRARY_VALUE_WITH_SPACES=Value with spaces -DSubLibraryWithDefines=1 -DSubLibraryWithDefines_DEFINE=SubLibraryWithDefines -DSubLibraryWithDifferentDefines=1"; PRODUCT_NAME = _idx_Library_20EC2F4A_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000007 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_complex/SubLibraryWithDifferentDefines/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-D'SubLibraryWithDifferentDefines Define with spaces and value'=1 -D'SubLibraryWithDifferentDefines Define with spaces' -DSubLibraryWithDifferentDefines=1 -DSubLibraryWithDifferentDefines_INTEGER_DEFINE=1 -DSubLibraryWithDifferentDefines_LocalDefine -DSubLibraryWithDifferentDefines_STRING_DEFINE=Test -DSubLibraryWithDifferentDefines_STRING_WITH_SPACES='String with spaces'"; PRODUCT_NAME = _idx_SubLibraryWithDifferentDefines_32E5A9BC_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000008 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; CLANG_ENABLE_MODULES = YES; GCC_PREFIX_HEADER = "$(TULSI_BWRS)/tulsi_e2e_complex/SubLibrary/pch/AnotherPCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SubLibrary_19588DB9_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000009 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) /SubLibraryWithDefines/local/includes $(TULSI_BWRS)/relative/SubLibraryWithDefines/local/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-menable-no-nans -menable-no-infs -DSubLibraryWithDefines=1 -DSubLibraryWithDefines_DEFINE=SubLibraryWithDefines"; PRODUCT_NAME = _idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme index 3358c92..e2a6c94 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6EF2E7F4000000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="XCTest.xctest" BlueprintName="XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6EF2E7F4000000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="XCTest.xctest" BlueprintName="XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..842fee3 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,52 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6202AA80600000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_Library_20EC2F4A_ios_min8.0.a" BlueprintName="_idx_Library_20EC2F4A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E65DB0F3F800000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_SubLibrary_19588DB9_ios_min8.0.a" BlueprintName="_idx_SubLibrary_19588DB9_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E68C6469FA00000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0.a" BlueprintName="_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E68C6469FA00000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0.a" BlueprintName="_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6FBA8FA0800000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0.a" BlueprintName="_idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6E3993AD600000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_SubLibraryWithDifferentDefines_32E5A9BC_ios_min8.0.a" BlueprintName="_idx_SubLibraryWithDifferentDefines_32E5A9BC_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E68C6469FA00000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0.a" BlueprintName="_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6C106276200000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_ApplicationLibrary_30DD5A4B_ios_min8.0.a" BlueprintName="_idx_ApplicationLibrary_30DD5A4B_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E68C6469FA00000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0.a" BlueprintName="_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E68C6469FA00000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0.a" BlueprintName="_idx_TodayExtensionLibrary_CoreDataResources_NonPropagatedLibrary_TestLibrary_79AD2A0E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6FBA8FA0800000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0.a" BlueprintName="_idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6FBA8FA0800000000" ReferencedContainer="container:ComplexSingleProject.xcodeproj" BuildableName="lib_idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0.a" BlueprintName="_idx_SubLibraryWithIdenticalDefines_SubLibraryWithDefines_EC7E0D8E_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj index f8f70f2..f2c0e1c 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
@@ -231,13 +231,11 @@ 44936BD67EED3C4D00000002 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_LegacyTestsLib_A268D14B_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -297,13 +295,11 @@ 44936BD6A3D45CE900000002 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_LegacyTestsLib_A268D14B_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..bc40d68 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,19 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E64163162C00000000" ReferencedContainer="container:IosLegacyTestProject.xcodeproj" BuildableName="lib_idx_LegacyTestsLib_A268D14B_ios_min8.0.a" BlueprintName="_idx_LegacyTestsLib_A268D14B_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj index 665296d..73c1369 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -407,13 +407,11 @@ 44936BD67EED3C4D00000004 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -509,13 +507,11 @@ 44936BD6A3D45CE900000004 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..3254876 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,28 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F77D1C0800000000" ReferencedContainer="container:MacOSProject.xcodeproj" BuildableName="lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12.a" BlueprintName="_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F77D1C0800000000" ReferencedContainer="container:MacOSProject.xcodeproj" BuildableName="lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12.a" BlueprintName="_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F77D1C0800000000" ReferencedContainer="container:MacOSProject.xcodeproj" BuildableName="lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12.a" BlueprintName="_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F77D1C0800000000" ReferencedContainer="container:MacOSProject.xcodeproj" BuildableName="lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12.a" BlueprintName="_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj index ba5993a..991cea6 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
@@ -559,26 +559,22 @@ 44936BD67EED3C4D00000005 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = _idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Debug; }; 44936BD67EED3C4D00000006 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = _idx_UnitTestsNoHostLib_EC0877C6_macos_min10.10; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -701,26 +697,22 @@ 44936BD6A3D45CE900000005 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = _idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Release; }; 44936BD6A3D45CE900000006 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = _idx_UnitTestsNoHostLib_EC0877C6_macos_min10.10; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme index a59b9c3..3bdc50b 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E660313F3200000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="UITests.xctest" BlueprintName="UITests" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E660313F3200000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="UITests.xctest" BlueprintName="UITests" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme index 3b50c41..2e453e9 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E619998B3A00000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="UnitTests.xctest" BlueprintName="UnitTests" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E619998B3A00000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="UnitTests.xctest" BlueprintName="UnitTests" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTestsNoHost.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTestsNoHost.xcscheme index 58e4a15..4c5b2c2 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTestsNoHost.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/UnitTestsNoHost.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6211D1A7800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="UnitTestsNoHost.xctest" BlueprintName="UnitTestsNoHost" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6211D1A7800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="UnitTestsNoHost.xctest" BlueprintName="UnitTestsNoHost" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..7a07565 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,34 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F27F76B800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="lib_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12.a" BlueprintName="_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F27F76B800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="lib_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12.a" BlueprintName="_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F27F76B800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="lib_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12.a" BlueprintName="_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F27F76B800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="lib_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12.a" BlueprintName="_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E63AACEB6600000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="lib_idx_UnitTestsNoHostLib_EC0877C6_macos_min10.10.a" BlueprintName="_idx_UnitTestsNoHostLib_EC0877C6_macos_min10.10" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F27F76B800000000" ReferencedContainer="container:MacOSTestsProject.xcodeproj" BuildableName="lib_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12.a" BlueprintName="_idx_UnitTestsLib_MyMacAppSources_MyTodayExtensionSources_UITestsLib_5415F9E2_macos_min10.12" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj index 0edabe9..93d756c 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
@@ -257,13 +257,11 @@ 44936BD67EED3C4D00000001 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_NAME = _idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -322,13 +320,11 @@ 44936BD6A3D45CE900000001 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_NAME = _idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..5af4747 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,25 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E683D3FEB200000000" ReferencedContainer="container:SimpleCCProject.xcodeproj" BuildableName="lib_idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0.a" BlueprintName="_idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E683D3FEB200000000" ReferencedContainer="container:SimpleCCProject.xcodeproj" BuildableName="lib_idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0.a" BlueprintName="_idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E683D3FEB200000000" ReferencedContainer="container:SimpleCCProject.xcodeproj" BuildableName="lib_idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0.a" BlueprintName="_idx_ccLibrary_ccBinary_F372BDE7_ios_min7.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj index 0dfd492..4e9ab2b 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -622,43 +622,37 @@ 44936BD67EED3C4D00000004 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_BWRS)/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DAPPLIB_ADDITIONAL_DEFINE -DAPPLIB_ANOTHER_DEFINE=2 -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_ApplicationLibrary_BB2F88FA_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000005 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREFIX_HEADER = "$(TULSI_BWRS)/tulsi_e2e_simple/Library/pch/PCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) /Library/absolute/include/path $(TULSI_BWRS)/relative/Library/include/path $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_COPT_DEFINE -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_Library_1A8360DD_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000006 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_TestLibrary_92E29781_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -758,43 +752,37 @@ 44936BD6A3D45CE900000004 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_BWRS)/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple/ApplicationLibrary/includes $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DAPPLIB_ADDITIONAL_DEFINE -DAPPLIB_ANOTHER_DEFINE=2 -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_ApplicationLibrary_BB2F88FA_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000005 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREFIX_HEADER = "$(TULSI_BWRS)/tulsi_e2e_simple/Library/pch/PCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) /Library/absolute/include/path $(TULSI_BWRS)/relative/Library/include/path $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_COPT_DEFINE -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_Library_1A8360DD_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000006 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_TestLibrary_92E29781_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme index 8b122ea..d44458f 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme
@@ -78,14 +78,14 @@ </ActionContent> </ExecutionAction> </PostActions> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6EF2E7F4000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableName="XCTest.xctest" BlueprintName="XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6EF2E7F4000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableName="XCTest.xctest" BlueprintName="XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..477d8e0 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,25 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6DDB1401000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableName="lib_idx_TestLibrary_92E29781_ios_min8.0.a" BlueprintName="_idx_TestLibrary_92E29781_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E657AF671A00000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableName="lib_idx_ApplicationLibrary_BB2F88FA_ios_min8.0.a" BlueprintName="_idx_ApplicationLibrary_BB2F88FA_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6BB25C05600000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableName="lib_idx_Library_1A8360DD_ios_min8.0.a" BlueprintName="_idx_Library_1A8360DD_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj index 3ece242..fb33384 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
@@ -846,70 +846,60 @@ 44936BD67EED3C4D00000006 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_JavaLibrary_C16E964B_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000007 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREFIX_HEADER = "$(TULSI_BWRS)/tulsi_e2e_simple_skylark/Library/pch/PCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_generated_protos/ObjcProtos $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/third_party/protobuf/objectivec $(TULSI_WR)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_generated_protos/ObjcProtos $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/protobuf/objectivec /Library/absolute/include/path $(TULSI_BWRS)/relative/Library/include/path $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_COPT_DEFINE -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_Library_22D3B3D5_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000008 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_simple_skylark/App/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/App/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/third_party/protobuf/objectivec $(TULSI_WR)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/tulsi_e2e_simple_skylark/App/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/App/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DBINARY_ADDITIONAL_DEFINE -DBINARY_ANOTHER_DEFINE=2 -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_MainLibrary_E33E600C_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000009 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_XCTestCodeSwift_2FB5517B_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/XCTestCodeSwift/_objs"; - VALID_ARCHS = x86_64; }; name = Debug; }; 44936BD67EED3C4D0000000A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/third_party/protobuf/objectivec $(TULSI_WR)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -1050,70 +1040,60 @@ 44936BD6A3D45CE900000006 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_JavaLibrary_C16E964B_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000007 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREFIX_HEADER = "$(TULSI_BWRS)/tulsi_e2e_simple_skylark/Library/pch/PCHFile.pch"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_generated_protos/ObjcProtos $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/third_party/protobuf/objectivec $(TULSI_WR)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_generated_protos/ObjcProtos $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/protobuf/objectivec /Library/absolute/include/path $(TULSI_BWRS)/relative/Library/include/path $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_COPT_DEFINE -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_Library_22D3B3D5_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000008 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_simple_skylark/App/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/App/includes $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/third_party/protobuf/objectivec $(TULSI_WR)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/tulsi_e2e_simple_skylark/App/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/App/includes $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DBINARY_ADDITIONAL_DEFINE -DBINARY_ANOTHER_DEFINE=2 -DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_MainLibrary_E33E600C_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000009 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_XCTestCodeSwift_2FB5517B_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/XCTestCodeSwift/_objs"; - VALID_ARCHS = x86_64; }; name = Release; }; 44936BD6A3D45CE90000000A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_WR)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_WR)/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_WR)/third_party/protobuf/objectivec $(TULSI_WR)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_simple_skylark/_j2objc/JavaLibrary $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/Classes $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/libcore/luni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/android/platform/libcore/ojluni/src/main/native $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul/apple_apsl $(TULSI_BWRS)/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/java_src/j2objc/jre_emul $(TULSI_BWRS)/third_party/protobuf/objectivec $(TULSI_BWRS)/_tulsi-includes/x/x/third_party/protobuf/objectivec $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DLIBRARY_DEFINES_DEFINE=1"; PRODUCT_NAME = _idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme index b703134..8af6416 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCTest.xcscheme
@@ -24,14 +24,14 @@ <EnvironmentVariables> <EnvironmentVariable key="projectKey" value="projectValue" isEnabled="YES"></EnvironmentVariable> </EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6EF2E7F4000000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="XCTest.xctest" BlueprintName="XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6EF2E7F4000000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="XCTest.xctest" BlueprintName="XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCUITest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCUITest.xcscheme index 0caf81c..aae99d1 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCUITest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/XCUITest.xcscheme
@@ -24,14 +24,14 @@ <EnvironmentVariables> <EnvironmentVariable key="projectKey" value="projectValue" isEnabled="YES"></EnvironmentVariable> </EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6BECFDF8000000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="XCUITest.xctest" BlueprintName="XCUITest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6BECFDF8000000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="XCUITest.xctest" BlueprintName="XCUITest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..df2a9a6 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,37 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E626CA755A00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="lib_idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0.a" BlueprintName="_idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E626CA755A00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="lib_idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0.a" BlueprintName="_idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E616CDD44E00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="lib_idx_Library_22D3B3D5_ios_min8.0.a" BlueprintName="_idx_Library_22D3B3D5_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E681C6DCDA00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="lib_idx_MainLibrary_E33E600C_ios_min8.0.a" BlueprintName="_idx_MainLibrary_E33E600C_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E65C6B61BE00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="_idx_XCTestCodeSwift_2FB5517B_ios_min8.0.framework" BlueprintName="_idx_XCTestCodeSwift_2FB5517B_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E626CA755A00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="lib_idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0.a" BlueprintName="_idx_XCUITestCode_XCTestCode_1D881332_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E666B361EA00000000" ReferencedContainer="container:SimpleSkylarkProject.xcodeproj" BuildableName="lib_idx_JavaLibrary_C16E964B_ios_min8.0.a" BlueprintName="_idx_JavaLibrary_C16E964B_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj index 96ec69e..c4f7326 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -380,42 +380,36 @@ 44936BD67EED3C4D00000002 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SwiftLibraryV3_56AA3A57_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_swift/SwiftLibraryV3/_objs"; - VALID_ARCHS = x86_64; }; name = Debug; }; 44936BD67EED3C4D00000003 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SwiftLibraryV4_56AA3A59_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_swift/SwiftLibraryV4/_objs"; - VALID_ARCHS = x86_64; }; name = Debug; }; 44936BD67EED3C4D00000004 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SwiftLibrary_EA7FC891_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_swift/SwiftLibrary/_objs"; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -476,42 +470,36 @@ 44936BD6A3D45CE900000002 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SwiftLibraryV3_56AA3A57_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_swift/SwiftLibraryV3/_objs"; - VALID_ARCHS = x86_64; }; name = Release; }; 44936BD6A3D45CE900000003 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SwiftLibraryV4_56AA3A59_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_swift/SwiftLibraryV4/_objs"; - VALID_ARCHS = x86_64; }; name = Release; }; 44936BD6A3D45CE900000004 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_SwiftLibrary_EA7FC891_ios_min8.0; - SDKROOT = iphonesimulator; + SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_swift/SwiftLibrary/_objs"; - VALID_ARCHS = x86_64; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..a92069c --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,25 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E68D4F012A00000000" ReferencedContainer="container:SwiftProject.xcodeproj" BuildableName="_idx_SwiftLibrary_EA7FC891_ios_min8.0.framework" BlueprintName="_idx_SwiftLibrary_EA7FC891_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E685D0530A00000000" ReferencedContainer="container:SwiftProject.xcodeproj" BuildableName="_idx_SwiftLibraryV3_56AA3A57_ios_min8.0.framework" BlueprintName="_idx_SwiftLibraryV3_56AA3A57_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E62F55BA0C00000000" ReferencedContainer="container:SwiftProject.xcodeproj" BuildableName="_idx_SwiftLibraryV4_56AA3A59_ios_min8.0.framework" BlueprintName="_idx_SwiftLibraryV4_56AA3A59_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj index 246d9f0..c58a71c 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -637,13 +637,11 @@ 44936BD67EED3C4D00000006 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -789,13 +787,11 @@ 44936BD6A3D45CE900000006 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/LogicTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/LogicTest.xcscheme index 0973bb0..8c18934 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/LogicTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/LogicTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E60AB7D76C00000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="LogicTest.xctest" BlueprintName="LogicTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E60AB7D76C00000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="LogicTest.xctest" BlueprintName="LogicTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-One-XCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-One-XCTest.xcscheme index 6b4c72f..ec4de40 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-One-XCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-One-XCTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6004A74A800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="TestSuite-One-XCTest.xctest" BlueprintName="TestSuite-One-XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6004A74A800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="TestSuite-One-XCTest.xctest" BlueprintName="TestSuite-One-XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Three-XCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Three-XCTest.xcscheme index 9cc2dd4..666b2de 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Three-XCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Three-XCTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6042EA8D800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="TestSuite-Three-XCTest.xctest" BlueprintName="TestSuite-Three-XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6042EA8D800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="TestSuite-Three-XCTest.xctest" BlueprintName="TestSuite-Three-XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Two-XCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Two-XCTest.xcscheme index 737ef3d..efd9bd6 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Two-XCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuite-Two-XCTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E67C4CFB5800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="TestSuite-Two-XCTest.xctest" BlueprintName="TestSuite-Two-XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E67C4CFB5800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="TestSuite-Two-XCTest.xctest" BlueprintName="TestSuite-Two-XCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..4c532f6 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,34 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F51B7BE800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="lib_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0.a" BlueprintName="_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F51B7BE800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="lib_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0.a" BlueprintName="_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F51B7BE800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="lib_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0.a" BlueprintName="_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F51B7BE800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="lib_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0.a" BlueprintName="_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F51B7BE800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="lib_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0.a" BlueprintName="_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6F51B7BE800000000" ReferencedContainer="container:TestSuiteExplicitXCTestsProject.xcodeproj" BuildableName="lib_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0.a" BlueprintName="_idx_XCTestLib_ApplicationLibrary_LogicTestLib_XCTestLib_XCTestLib_0F4BF70A_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj index 8e4b5fb..614aec1 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -396,13 +396,11 @@ 44936BD67EED3C4D00000003 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -484,13 +482,11 @@ 44936BD6A3D45CE900000003 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme index bf35e4c..2624aaf 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6420BCBAA00000000" ReferencedContainer="container:TestSuiteLocalTaggedTestsProject.xcodeproj" BuildableName="TestSuiteXCTest.xctest" BlueprintName="TestSuiteXCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6420BCBAA00000000" ReferencedContainer="container:TestSuiteLocalTaggedTestsProject.xcodeproj" BuildableName="TestSuiteXCTest.xctest" BlueprintName="TestSuiteXCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..8996bbe --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,25 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6899BE7FE00000000" ReferencedContainer="container:TestSuiteLocalTaggedTestsProject.xcodeproj" BuildableName="lib_idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0.a" BlueprintName="_idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6899BE7FE00000000" ReferencedContainer="container:TestSuiteLocalTaggedTestsProject.xcodeproj" BuildableName="lib_idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0.a" BlueprintName="_idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6899BE7FE00000000" ReferencedContainer="container:TestSuiteLocalTaggedTestsProject.xcodeproj" BuildableName="lib_idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0.a" BlueprintName="_idx_TestSuiteXCTestLib_ApplicationLibrary_96607F05_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj index 521a006..deaa4fe 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -556,13 +556,11 @@ 44936BD67EED3C4D00000005 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; @@ -688,13 +686,11 @@ 44936BD6A3D45CE900000005 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; };
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme index a82eb68..78313b4 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/TestSuiteXCTest.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6420BCBAA00000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="TestSuiteXCTest.xctest" BlueprintName="TestSuiteXCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E6420BCBAA00000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="TestSuiteXCTest.xctest" BlueprintName="TestSuiteXCTest" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..2c86e31 --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,31 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E69E47A3C800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="lib_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0.a" BlueprintName="_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E69E47A3C800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="lib_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0.a" BlueprintName="_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E69E47A3C800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="lib_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0.a" BlueprintName="_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E69E47A3C800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="lib_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0.a" BlueprintName="_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E69E47A3C800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="lib_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0.a" BlueprintName="_idx_tagged_xctest_2_lib_ApplicationLibrary_TestSuiteXCTestLib_tagged_xctest_1_lib_345F39DA_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_1.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_1.xcscheme index 8a3f3e1..1c5bf77 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_1.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_1.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E67E0D424800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="tagged_xctest_1.xctest" BlueprintName="tagged_xctest_1" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E67E0D424800000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="tagged_xctest_1.xctest" BlueprintName="tagged_xctest_1" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_2.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_2.xcscheme index 1822192..22a47eb 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_2.xcscheme +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/xcshareddata/xcschemes/tagged_xctest_2.xcscheme
@@ -19,14 +19,14 @@ </TestAction> <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> <EnvironmentVariables></EnvironmentVariables> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E67E0C424E00000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="tagged_xctest_2.xctest" BlueprintName="tagged_xctest_2" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </LaunchAction> <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES"> - <BuildableProductRunnable runnableDebuggingMode="0"> + <MacroExpansion> <BuildableReference BlueprintIdentifier="3D31C5E67E0C424E00000000" ReferencedContainer="container:TestSuiteRecursiveTestSuiteProject.xcodeproj" BuildableName="tagged_xctest_2.xctest" BlueprintName="tagged_xctest_2" BuildableIdentifier="primary"></BuildableReference> - </BuildableProductRunnable> + </MacroExpansion> </ProfileAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction>
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj index 12b9c3c..18a47ee 100644 --- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -482,25 +482,21 @@ 44936BD67EED3C4D00000004 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_ApplicationLibrary_06BBE256_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Debug; }; 44936BD67EED3C4D00000005 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; PRODUCT_NAME = _idx_WatchExtensionLibrary_6997976B_watchos_min3.0; - SDKROOT = watchsimulator; - VALID_ARCHS = x86_64; + SDKROOT = watchos; WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Debug; @@ -597,25 +593,21 @@ 44936BD6A3D45CE900000004 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_WR)/_tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/_tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tools/cpp/gcc3 "; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = _idx_ApplicationLibrary_06BBE256_ios_min8.0; - SDKROOT = iphonesimulator; - VALID_ARCHS = x86_64; + SDKROOT = iphoneos; }; name = Release; }; 44936BD6A3D45CE900000005 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 "; PRODUCT_NAME = _idx_WatchExtensionLibrary_6997976B_watchos_min3.0; - SDKROOT = watchsimulator; - VALID_ARCHS = x86_64; + SDKROOT = watchos; WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme new file mode 100644 index 0000000..489399b --- /dev/null +++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/xcshareddata/xcschemes/_idx_Scheme.xcscheme
@@ -0,0 +1,22 @@ + +<Scheme LastUpgradeVersion="0900" version="1.3"> + <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> + <BuildActionEntries> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6074E6CA200000000" ReferencedContainer="container:WatchProject.xcodeproj" BuildableName="lib_idx_WatchExtensionLibrary_6997976B_watchos_min3.0.a" BlueprintName="_idx_WatchExtensionLibrary_6997976B_watchos_min3.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + <BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForAnalyzing="YES" buildForProfiling="YES"> + <BuildableReference BlueprintIdentifier="3D31C5E6C6B1A54800000000" ReferencedContainer="container:WatchProject.xcodeproj" BuildableName="lib_idx_ApplicationLibrary_06BBE256_ios_min8.0.a" BlueprintName="_idx_ApplicationLibrary_06BBE256_ios_min8.0" BuildableIdentifier="primary"></BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug"> + <Testables></Testables> + </TestAction> + <LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES"> + <EnvironmentVariables></EnvironmentVariables> + </LaunchAction> + <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES"></ProfileAction> + <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> + <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"></ArchiveAction> +</Scheme> \ No newline at end of file
diff --git a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift index f01053d..691f09c 100644 --- a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift +++ b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
@@ -2910,12 +2910,10 @@ inTargets targets: Dictionary<String, PBXTarget> = Dictionary<String, PBXTarget>(), line: UInt = #line) { var expectedBuildSettings = [ - "ARCHS": "x86_64", "HEADER_SEARCH_PATHS": "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 ", "PRODUCT_NAME": indexerTargetName, - "SDKROOT": "iphonesimulator", + "SDKROOT": "iphoneos", "IPHONEOS_DEPLOYMENT_TARGET": "9.0", - "VALID_ARCHS": "x86_64", ] if pchFile != nil { expectedBuildSettings["GCC_PREFIX_HEADER"] = "$(TULSI_BWRS)/\(pchFile!.path!)"