builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java
equal
deleted
inserted
replaced
569 ICarbideProjectInfo cpi = buildConfig.getCarbideProject(); |
569 ICarbideProjectInfo cpi = buildConfig.getCarbideProject(); |
570 IPath workingDirectory = cpi.getINFWorkingDirectory(); |
570 IPath workingDirectory = cpi.getINFWorkingDirectory(); |
571 |
571 |
572 String buildTarget = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase(); |
572 String buildTarget = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase(); |
573 |
573 |
574 String[] sbsArgs = new String[] {"--source-target=\"" + file.toOSString() + "\"", COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()}; |
574 String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()}; |
575 launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList()); |
575 launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList()); |
576 |
576 |
577 int retVal = launcher.executeCommand(SBS_BAT, sbsArgs, getResolvedEnvVars(buildConfig), workingDirectory); |
577 int retVal = launcher.executeCommand(SBS_BAT, sbsArgs, getResolvedEnvVars(buildConfig), workingDirectory); |
578 if (retVal != 0) { |
578 if (retVal != 0) { |
579 launcher.writeToConsole("\n=== make failed with error code " + retVal + " ==="); |
579 launcher.writeToConsole("\n=== make failed with error code " + retVal + " ==="); |