diff options
| author |  Peter Schmitt <schmitt@google.com> | 2015-05-12 22:58:08 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-05-15 09:43:13 +0000 |
| commit | ea047be3dbd00206e3547bf04f14027aa5c1630f (patch) | |
| tree | 0f766bb6fcf3ff5dea9849af8183f799a0f62857 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java | |
| parent | 4eda0cf57fb18538211e0f74d3de5a3affb672c5 (diff) | |
Clean up obcj rules by removing ObjcActionsBuilder.
Moved the last remaining logic to its corresponding support class
(XcodeSupport).
--
MOS_MIGRATED_REVID=93462899
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java index e167f8966a..85ed4bd444 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeproj.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; /** @@ -31,16 +30,13 @@ public class ObjcXcodeproj implements RuleConfiguredTargetFactory { @Override public ConfiguredTarget create(RuleContext ruleContext) throws InterruptedException { - XcodeProvider.Project project = XcodeProvider.Project.fromTopLevelTargets( - ruleContext.getPrerequisites("deps", Mode.TARGET, XcodeProvider.class)); - Artifact pbxproj = ruleContext.getImplicitOutputArtifact(XcodeSupport.PBXPROJ); - - ObjcActionsBuilder actionsBuilder = ObjcRuleClasses.actionsBuilder(ruleContext); - actionsBuilder.registerXcodegenActions( - new ObjcRuleClasses.Tools(ruleContext), pbxproj, project); + NestedSetBuilder<Artifact> filesToBuild = NestedSetBuilder.stableOrder(); + new XcodeSupport(ruleContext) + .addFilesToBuild(filesToBuild) + .registerActions(ruleContext.getPrerequisites("deps", Mode.TARGET, XcodeProvider.class)); return new RuleConfiguredTargetBuilder(ruleContext) - .setFilesToBuild(NestedSetBuilder.create(Order.STABLE_ORDER, pbxproj)) + .setFilesToBuild(filesToBuild.build()) .addProvider(RunfilesProvider.class, RunfilesProvider.EMPTY) .build(); } |