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

Commit7740eeb

Browse files
ndfredfpotter
authored andcommitted
Make sure we show the right scheme generation tip for workspace-based projects as well
1 parent77ac045 commit7740eeb

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

‎xctool/xctool-tests/OptionsTests.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,7 @@ - (void)testSchemeMustBeValid
189189
assertOptionsFailToValidateWithError:
190190
@"Can't find scheme 'TestProject-Library-Bogus'.\n\n"
191191
@"Possible schemes include:\n"
192-
@" TestProject-Library\n\n"
193-
@"TIP: This might happen if you're relying on Xcode to autocreate your schemes\n"
194-
@"and your scheme files don't yet exist. xctool, like xcodebuild, isn't able to\n"
195-
@"automatically create schemes. We recommend disabling\"Autocreate schemes\"\n"
196-
@"in your workspace/project, making sure your existing schemes are marked as\n"
197-
@"\"Shared\", and making sure they're checked into source control."
192+
@" TestProject-Library"
198193
withBuildSettingsFromFile:
199194
TEST_DATA@"TestWorkspace-Library-TestProject-Library-showBuildSettings.txt"];
200195
}

‎xctool/xctool/Options.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ - (BOOL)validateAndReturnXcodeSubjectInfo:(XcodeSubjectInfo **)xcodeSubjectInfoO
393393
BOOL automaticSchemeCreationDisabled =NO;
394394

395395
{
396-
NSString *basePath = self.project !=nil ? self.project : self.workspace;
397-
NSString *settingsPath = [basePathstringByAppendingPathComponent:@"/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings"];
396+
NSString *basePath = self.project !=nil ?[self.projectstringByAppendingPathComponent:@"project.xcworkspace"] : self.workspace;
397+
NSString *settingsPath = [basePathstringByAppendingPathComponent:@"xcshareddata/WorkspaceSettings.xcsettings"];
398398
NSDictionary *settings = [NSDictionarydictionaryWithContentsOfFile:settingsPath];
399399
NSNumber *automaticSchemeCreationSetting = [settingsobjectForKey:@"IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded"];
400400

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp