diff options
Diffstat (limited to 'org.rtems.cdt/src/org/rtems/cdt/build')
4 files changed, 36 insertions, 36 deletions
diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java b/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java index d64af68..a3f551f 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java @@ -49,37 +49,37 @@ public class CommandLineGenerator extends ManagedCommandLineGenerator implements IProject project = (IProject) tool.getParentResourceInfo().getParent().getOwner(); // Change platform - Storage.changePlatform( project, getPlatform()); + Storage.changePlatform(project, getPlatform()); // Determine tool key via the tool ID String id = tool.getId(); String toolKey = "gcc"; - if (id.contains( "archiver")) { + if (id.contains("archiver")) { toolKey = Constants.TOOL_ARCHIVER_KEY; - } else if (id.contains( "assembler.gcc")) { + } else if (id.contains("assembler.gcc")) { toolKey = Constants.TOOL_COMPILER_C_KEY; - } else if (id.contains( "assembler")) { + } else if (id.contains("assembler")) { toolKey = Constants.TOOL_ASSEMBLER_KEY; - } else if (id.contains( "compiler.cpp")) { + } else if (id.contains("compiler.cpp")) { toolKey = Constants.TOOL_COMPILER_CPP_KEY; - } else if (id.contains( "compiler.c")) { + } else if (id.contains("compiler.c")) { toolKey = Constants.TOOL_COMPILER_C_KEY; - } else if (id.contains( "linker.cpp")) { + } else if (id.contains("linker.cpp")) { toolKey = Constants.TOOL_LINKER_CPP_KEY; - } else if (id.contains( "linker.c")) { + } else if (id.contains("linker.c")) { toolKey = Constants.TOOL_LINKER_C_KEY; } // Set command name - commandName = Storage.getProperty( project, toolKey); - tool.setToolCommand( commandName); + commandName = Storage.getProperty(project, toolKey); + tool.setToolCommand(commandName); // Combine tool options and options - if (Storage.areToolOptionsEnabled( project)) { - String [] toolOptions = Storage.getToolOptions( project, toolKey); + if (Storage.areToolOptionsEnabled(project)) { + String [] toolOptions = Storage.getToolOptions(project, toolKey); String combinedOptions [] = new String [toolOptions.length + options.length]; - System.arraycopy( toolOptions, 0, combinedOptions, 0, toolOptions.length); - System.arraycopy( options, 0, combinedOptions, toolOptions.length, options.length); + System.arraycopy(toolOptions, 0, combinedOptions, 0, toolOptions.length); + System.arraycopy(options, 0, combinedOptions, toolOptions.length, options.length); options = combinedOptions; } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java b/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java index a67a718..99f0da9 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java @@ -42,29 +42,29 @@ import org.eclipse.core.resources.IProject; public class CygwinScannerInfoCollector extends PerProjectSICollector implements IScannerInfoCollector3, IManagedScannerInfoCollector { private IProject mProject; - public void contributeToScannerConfig( Object resource, Map scannerInfo) { - List<String> includes = (List<String>) scannerInfo.get( ScannerInfoTypes.INCLUDE_PATHS); - List<String> translatedIncludes = CygpathTranslator.translateIncludePaths( mProject, includes); + public void contributeToScannerConfig(Object resource, Map scannerInfo) { + List<String> includes = (List<String>) scannerInfo.get(ScannerInfoTypes.INCLUDE_PATHS); + List<String> translatedIncludes = CygpathTranslator.translateIncludePaths(mProject, includes); Iterator<String> iter = translatedIncludes.listIterator(); while (iter.hasNext()) { String convertedPath = iter.next(); - if (convertedPath.startsWith( "/")) { + if (convertedPath.startsWith("/")) { iter.remove(); } } - scannerInfo.put( ScannerInfoTypes.INCLUDE_PATHS, translatedIncludes); + scannerInfo.put(ScannerInfoTypes.INCLUDE_PATHS, translatedIncludes); - super.contributeToScannerConfig( resource, scannerInfo); + super.contributeToScannerConfig(resource, scannerInfo); } - public void setProject( IProject project) { + public void setProject(IProject project) { mProject = project; - super.setProject( project); + super.setProject(project); } - public void setInfoContext( InfoContext context) { + public void setInfoContext(InfoContext context) { mProject = context.getProject(); - super.setInfoContext( context); + super.setInfoContext(context); } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java b/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java index 80f88b2..00f880f 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java @@ -40,26 +40,26 @@ public class EnvironmentSupplier implements IConfigurationEnvironmentVariableSup return Constants.PLATFORM_DEFAULT; } - public IBuildEnvironmentVariable getVariable( String name, IConfiguration configuration, IEnvironmentVariableProvider provider) { - if (name.equals( "PATH")) { + public IBuildEnvironmentVariable getVariable(String name, IConfiguration configuration, IEnvironmentVariableProvider provider) { + if (name.equals("PATH")) { IProject project = (IProject) configuration.getOwner(); // Change platform - Storage.changePlatform( project, getPlatform()); + Storage.changePlatform(project, getPlatform()); // Get path parts - String part = Storage.getProperty( project, Constants.PATH_PREPEND_KEY); + String part = Storage.getProperty(project, Constants.PATH_PREPEND_KEY); - return new BuildEnvVar( name, part, IBuildEnvironmentVariable.ENVVAR_PREPEND, Constants.PATH_SEPARATOR); + return new BuildEnvVar(name, part, IBuildEnvironmentVariable.ENVVAR_PREPEND, Constants.PATH_SEPARATOR); } return null; } - public IBuildEnvironmentVariable [] getVariables( IConfiguration configuration, IEnvironmentVariableProvider provider) { + public IBuildEnvironmentVariable [] getVariables(IConfiguration configuration, IEnvironmentVariableProvider provider) { IBuildEnvironmentVariable variables [] = new IBuildEnvironmentVariable [VARIABLE_COUNT]; - variables [PATH_INDEX] = getVariable( "PATH", configuration, provider); + variables [PATH_INDEX] = getVariable("PATH", configuration, provider); return variables; } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java b/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java index 93c67fd..5adbe42 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java @@ -57,18 +57,18 @@ public class RunScannerInfoProvider extends GCCSpecsRunSIProvider { } // Change platform - Storage.changePlatform( project, getPlatform()); + Storage.changePlatform(project, getPlatform()); // Set compile command fCompileCommand = new Path( - Storage.getProperty( project, Constants.TOOL_COMPILER_C_KEY) + Storage.getProperty(project, Constants.TOOL_COMPILER_C_KEY) ); // Add the standard options to the command arguments - String options [] = Storage.getToolOptions( project, Constants.TOOL_COMPILER_C_KEY); + String options [] = Storage.getToolOptions(project, Constants.TOOL_COMPILER_C_KEY); String newCompileArguments [] = new String [options.length + fCompileArguments.length]; - System.arraycopy( options, 0, newCompileArguments, 0, options.length); - System.arraycopy( fCompileArguments, 0, newCompileArguments, options.length, fCompileArguments.length); + System.arraycopy(options, 0, newCompileArguments, 0, options.length); + System.arraycopy(fCompileArguments, 0, newCompileArguments, options.length, fCompileArguments.length); fCompileArguments = newCompileArguments; return true; |