yonaskolb/XcodeGen
1
1
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2024-09-11 12:56:03 +03:00
Code Issues Projects Releases Wiki Activity

fix Target reference generation

Browse Source
This commit is contained in:
Yonas Kolb 2017-12-27 17:40:53 +08:00
parent 0e30b1a182
commit 2315dc89b2
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/XcodeGenKit/PBXProjGenerator.swift
View File

@ -73,11 +73,9 @@ public class PBXProjGenerator {
addObject(buildConfigList)
for target in spec.targets {
targetNativeReferences[target.name] =
referenceGenerator.generate(
target.isLegacy ? PBXLegacyTarget.self : PBXNativeTarget.self,
target.name
)
targetNativeReferences[target.name] = target.isLegacy ?
referenceGenerator.generate(PBXLegacyTarget.self, target.name) :
referenceGenerator.generate(PBXNativeTarget.self, target.name)
let fileReference = PBXFileReference(
reference: referenceGenerator.generate(PBXFileReference.self, target.name),

40
Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
View File

@ -51,21 +51,21 @@
isa = PBXContainerItemProxy;
containerPortal = P_8448771205358 /* Project object */;
proxyType = 1;
remoteGlobalIDString = T_8252321105004;
remoteGlobalIDString = NT_825232110500;
remoteInfo = App_iOS;
};
CIP_82523211050 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = P_8448771205358 /* Project object */;
proxyType = 1;
remoteGlobalIDString = T_4792646603740;
remoteGlobalIDString = LT_479264660374;
remoteInfo = Legacy;
};
"CIP_82523211050-1" /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = P_8448771205358 /* Project object */;
proxyType = 1;
remoteGlobalIDString = T_4722960424192;
remoteGlobalIDString = NT_472296042419;
remoteInfo = Framework_iOS;
};
/* End PBXContainerItemProxy section */
@ -378,7 +378,7 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXLegacyTarget section */
T_4792646603740 /* Legacy */ = {
LT_479264660374 /* Legacy */ = {
isa = PBXLegacyTarget;
buildConfigurationList = CL_479264660374 /* Build configuration list for PBXLegacyTarget "Legacy" */;
buildPhases = (
@ -396,7 +396,7 @@
/* End PBXLegacyTarget section */
/* Begin PBXNativeTarget section */
T_4387045385063 /* Framework_watchOS */ = {
NT_438704538506 /* Framework_watchOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = CL_438704538506 /* Build configuration list for PBXNativeTarget "Framework_watchOS" */;
buildPhases = (
@ -414,7 +414,7 @@
productReference = FR_438704538506 /* Framework_watchOS.framework */;
productType = "com.apple.product-type.framework";
};
T_4722960424192 /* Framework_iOS */ = {
NT_472296042419 /* Framework_iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = CL_472296042419 /* Build configuration list for PBXNativeTarget "Framework_iOS" */;
buildPhases = (
@ -432,7 +432,7 @@
productReference = FR_472296042419 /* Framework_iOS.framework */;
productType = "com.apple.product-type.framework";
};
T_5251191204695 /* Framework_macOS */ = {
NT_525119120469 /* Framework_macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = CL_525119120469 /* Build configuration list for PBXNativeTarget "Framework_macOS" */;
buildPhases = (
@ -450,7 +450,7 @@
productReference = FR_525119120469 /* Framework_macOS.framework */;
productType = "com.apple.product-type.framework";
};
T_6623158371826 /* Framework_tvOS */ = {
NT_662315837182 /* Framework_tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = CL_662315837182 /* Build configuration list for PBXNativeTarget "Framework_tvOS" */;
buildPhases = (
@ -468,7 +468,7 @@
productReference = FR_662315837182 /* Framework_tvOS.framework */;
productType = "com.apple.product-type.framework";
};
T_7831228999101 /* App_iOS_Tests */ = {
NT_783122899910 /* App_iOS_Tests */ = {
isa = PBXNativeTarget;
buildConfigurationList = CL_783122899910 /* Build configuration list for PBXNativeTarget "App_iOS_Tests" */;
buildPhases = (
@ -484,7 +484,7 @@
productReference = FR_783122899910 /* App_iOS_Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
T_8252321105004 /* App_iOS */ = {
NT_825232110500 /* App_iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = CL_825232110500 /* Build configuration list for PBXNativeTarget "App_iOS" */;
buildPhases = (
@ -527,13 +527,13 @@
projectDirPath = "";
projectRoot = "";
targets = (
T_8252321105004 /* App_iOS */,
T_7831228999101 /* App_iOS_Tests */,
T_4722960424192 /* Framework_iOS */,
T_5251191204695 /* Framework_macOS */,
T_6623158371826 /* Framework_tvOS */,
T_4387045385063 /* Framework_watchOS */,
T_4792646603740 /* Legacy */,
NT_825232110500 /* App_iOS */,
NT_783122899910 /* App_iOS_Tests */,
NT_472296042419 /* Framework_iOS */,
NT_525119120469 /* Framework_macOS */,
NT_662315837182 /* Framework_tvOS */,
NT_438704538506 /* Framework_watchOS */,
LT_479264660374 /* Legacy */,
);
};
/* End PBXProject section */
@ -718,17 +718,17 @@
/* Begin PBXTargetDependency section */
TD_354342487294 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = T_4722960424192 /* Framework_iOS */;
target = NT_472296042419 /* Framework_iOS */;
targetProxy = "CIP_82523211050-1" /* PBXContainerItemProxy */;
};
TD_436638162860 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = T_8252321105004 /* App_iOS */;
target = NT_825232110500 /* App_iOS */;
targetProxy = CIP_78312289991 /* PBXContainerItemProxy */;
};
TD_742119822021 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = T_4792646603740 /* Legacy */;
target = LT_479264660374 /* Legacy */;
targetProxy = CIP_82523211050 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

10
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS.xcscheme
View File

@ -5,11 +5,11 @@
<TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" codeCoverageEnabled="YES" shouldUseLaunchSchemeArgsEnv="NO" buildConfiguration="Production Debug">
<Testables>
<TestableReference skipped="NO">
<BuildableReference BlueprintIdentifier="T_7831228999101" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS_Tests.xctest" BlueprintName="App_iOS" BuildableIdentifier="primary" />
<BuildableReference BlueprintIdentifier="NT_783122899910" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS_Tests.xctest" BlueprintName="App_iOS" BuildableIdentifier="primary" />
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference BlueprintIdentifier="T_8252321105004" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
<BuildableReference BlueprintIdentifier="NT_825232110500" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument argument="MyEnabledArgument" isEnabled="YES" />
@ -18,7 +18,7 @@
</TestAction>
<ProfileAction savedToolIdentifier="" useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="NO" buildConfiguration="Production Release" debugDocumentVersioning="YES">
<BuildableProductRunnable runnableDebuggingMode="0">
<BuildableReference BlueprintIdentifier="T_8252321105004" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
<BuildableReference BlueprintIdentifier="NT_825232110500" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument argument="MyEnabledArgument" isEnabled="YES" />
@ -28,13 +28,13 @@
<BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES">
<BuildActionEntries>
<BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForProfiling="YES" buildForAnalyzing="YES">
<BuildableReference BlueprintIdentifier="T_8252321105004" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
<BuildableReference BlueprintIdentifier="NT_825232110500" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Production Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES">
<BuildableProductRunnable runnableDebuggingMode="0">
<BuildableReference BlueprintIdentifier="T_8252321105004" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
<BuildableReference BlueprintIdentifier="NT_825232110500" ReferencedContainer="container:Project.xcodeproj" BuildableName="App_iOS.app" BlueprintName="App_iOS" BuildableIdentifier="primary" />
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument argument="MyEnabledArgument" isEnabled="YES" />