Skip to content

fix: stop showing the command help on native build error #3814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2018
Merged

fix: stop showing the command help on native build error #3814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,11 +701,17 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
const childProcessOpts = opts.childProcessOpts || {};
childProcessOpts.cwd = childProcessOpts.cwd || projectRoot;
childProcessOpts.stdio = childProcessOpts.stdio || "inherit";
let commandResult;
try {
commandResult = await this.spawn(gradlew,
gradleArgs,
childProcessOpts,
spawnFromEventOptions);
} catch (err) {
this.$errors.failWithoutHelp(err.message);
}

return await this.spawn(gradlew,
gradleArgs,
childProcessOpts,
spawnFromEventOptions);
return commandResult;
}
}

Expand Down
22 changes: 15 additions & 7 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
private $plistParser: IPlistParser,
private $sysInfo: ISysInfo,
private $xCConfigService: XCConfigService) {
super($fs, $projectDataService);
super($fs, $projectDataService);
}

private _platformsDirCache: string = null;
Expand Down Expand Up @@ -442,11 +442,19 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
localArgs.push("-quiet");
this.$logger.info("Xcode build...");
}
return this.$childProcess.spawnFromEvent("xcodebuild",
localArgs,
"exit",
{ stdio: stdio || "inherit", cwd },
{ emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true });

let commandResult;
try {
commandResult = await this.$childProcess.spawnFromEvent("xcodebuild",
localArgs,
"exit",
{ stdio: stdio || "inherit", cwd },
{ emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true });
} catch (err) {
this.$errors.failWithoutHelp(err.message);
}

return commandResult;
}

private async setupSigningFromTeam(projectRoot: string, projectData: IProjectData, teamId: string) {
Expand Down Expand Up @@ -1112,7 +1120,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
private async prepareNativeSourceCode(pluginName: string, pluginPlatformsFolderPath: string, projectData: IProjectData): Promise<void> {
const project = this.createPbxProj(projectData);
const group = this.getRootGroup(pluginName, pluginPlatformsFolderPath);
project.addPbxGroup(group.files, group.name, group.path, null, {isMain:true});
project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true });
project.addToHeaderSearchPaths(group.path);
this.savePbxProj(project, projectData);
}
Expand Down