Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Feb 2, 2021. It is now read-only.
/xctoolPublic archive

Make xctool play nice with Find Implicit Dependencies#98

Merged
fpotter merged 4 commits intomasterfromfpotter/fix-implicit-dependencies
Jul 12, 2013
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
the generated Tests workspace should include all projects in subject'…
…s workspacePreviously, we only added projects for the buildables and testables tothe generated workspace.  This was fine, but it doesn't give Xcode'sFind Implicit Dependencies feature enough information to work from.Let's make the generated workspace include all the projects.Test Plan:Tests pass.  Verified that find implicit dependencies now works with aCocoaPods project.
  • Loading branch information
@fpotter
fpotter committedJul 10, 2013
commit6314bb6b7f91c47a53e6adce92eba537ae76a752
4 changes: 4 additions & 0 deletionsxctool/xctool-tests/BuildTestsActionTests.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,7 @@ - (void)testBuildTestsAction

[verify(mockSchemeGenerator) setParallelizeBuildables:YES];
[verify(mockSchemeGenerator) setBuildImplicitDependencies:YES];
[verify(mockSchemeGenerator) addProjectPathToWorkspace:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestProjectTestProjectLibraryTargetID
inProject:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestProjectTestProjectLibraryTestTargetID
Expand DownExpand Up@@ -202,6 +203,7 @@ - (void)testBuildTestsActionWillBuildEverythingMarkedAsBuildForTest
NSString *projectPath = TEST_DATA @"TestWorkspace-Library/TestProject-Library/TestProject-Library.xcodeproj";
[verify(mockSchemeGenerator) setParallelizeBuildables:NO];
[verify(mockSchemeGenerator) setBuildImplicitDependencies:YES];
[verify(mockSchemeGenerator) addProjectPathToWorkspace:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestWorkspaceTestProjectLibraryTargetID
inProject:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestWorkspaceTestProjectOtherLibTargetID
Expand DownExpand Up@@ -269,6 +271,7 @@ - (void)testBuildTestsCanBuildASingleTarget
NSString *projectPath = TEST_DATA @"TestWorkspace-Library/TestProject-Library/TestProject-Library.xcodeproj";
[verify(mockSchemeGenerator) setParallelizeBuildables:NO];
[verify(mockSchemeGenerator) setBuildImplicitDependencies:YES];
[verify(mockSchemeGenerator) addProjectPathToWorkspace:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestWorkspaceTestProjectLibraryTargetID
inProject:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestWorkspaceTestProjectOtherLibTargetID
Expand DownExpand Up@@ -333,6 +336,7 @@ - (void)testSkipDependencies
NSString *projectPath = TEST_DATA @"TestWorkspace-Library/TestProject-Library/TestProject-Library.xcodeproj";
[verify(mockSchemeGenerator) setParallelizeBuildables:NO];
[verify(mockSchemeGenerator) setBuildImplicitDependencies:YES];
[verify(mockSchemeGenerator) addProjectPathToWorkspace:projectPath];
[verify(mockSchemeGenerator) addBuildableWithID:kTestWorkspaceTestProjectLibraryTestsTargetID
inProject:projectPath];
[verifyCount(mockSchemeGenerator, times(1)) addBuildableWithID:(id)anything() inProject:(id)anything()];
Expand Down
13 changes: 13 additions & 0 deletionsxctool/xctool/BuildTestsAction.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,19 @@ + (BOOL)buildTestables:(NSArray *)testables
schemeGenerator.parallelizeBuildables = xcodeSubjectInfo.parallelizeBuildables;
schemeGenerator.buildImplicitDependencies = xcodeSubjectInfo.buildImplicitDependencies;

// For Xcode's Find Implicit Dependencies to work, we must add every project
// in the subject's workspace to the generated workspace.
if (options.workspace) {
NSArray *projectPaths = [XcodeSubjectInfo projectPathsInWorkspace:options.workspace];
for (NSString *projectPath in projectPaths) {
[schemeGenerator addProjectPathToWorkspace:projectPath];
}
} else if (options.project) {
[schemeGenerator addProjectPathToWorkspace:options.project];
} else {
NSAssert(NO, @"Should have a workspace or a project.");
}

for (NSDictionary *buildable in testables) {
[schemeGenerator addBuildableWithID:buildable[@"targetID"] inProject:buildable[@"projectPath"]];
}
Expand Down
2 changes: 2 additions & 0 deletionsxctool/xctool/SchemeGenerator.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@
- (void)addBuildableWithID:(NSString *)identifier
inProject:(NSString *)projectPath;

- (void)addProjectPathToWorkspace:(NSString *)projectPath;

/// Write the workspace into this directory.
- (BOOL)writeWorkspaceNamed:(NSString *)name
to:(NSString *)destination;
Expand Down
5 changes: 5 additions & 0 deletionsxctool/xctool/SchemeGenerator.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,11 @@ - (void)addBuildableWithID:(NSString *)identifier
{
NSString *absPath = [[[NSURL fileURLWithPath:projectPath] URLByStandardizingPath] path];
[_buildables addObject:@{@"id":identifier, @"project":absPath}];
}

- (void)addProjectPathToWorkspace:(NSString *)projectPath
{
NSString *absPath = [[[NSURL fileURLWithPath:projectPath] URLByStandardizingPath] path];
[_projectPaths addObject:absPath];
}

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp