Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2018-11-20 16:20:42 +0000
committerJonah Graham2018-11-22 21:47:02 +0000
commit170e654b4796bad1453ae85a427b97317d67a69a (patch)
tree6ca9b8a8fedd5fd25f97eb79c408312e256ff981 /build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
parent35996a5c5ca5c254959ba48241eaada6dbf8628d (diff)
downloadorg.eclipse.cdt-170e654b4796bad1453ae85a427b97317d67a69a.tar.gz
org.eclipse.cdt-170e654b4796bad1453ae85a427b97317d67a69a.tar.xz
org.eclipse.cdt-170e654b4796bad1453ae85a427b97317d67a69a.zip
Bug 540373: Cleanup: Format & Remove trailing whitespace
This was done by selecting all projects in Eclipse then Source -> Clean Up... -> choosing: - Format source code - Remove trailing white spaces on all lines and completing the wizard Change-Id: I63685372c6bcc67719bcf145123bcb72e5b00394
Diffstat (limited to 'build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java')
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index a17b44fdc8e..3b6ce717f42 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -127,7 +127,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
}
}
}
-
+
if (pathVar == null && this.path != null) {
// Make one with the directory containing out tool
pathVar = new EnvironmentVariable("PATH", this.path.getParent().toString(), //$NON-NLS-1$
@@ -219,7 +219,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
public void setProperty(String key, String value) {
properties.put(key, value);
}
-
+
@Override
public String getBinaryParserId() {
// Assume local builds
@@ -261,12 +261,12 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
int offset = 0;
Path command = Paths.get(commandStrings.get(offset));
-
+
// look for ccache being used
if (command.toString().contains("ccache")) { //$NON-NLS-1$
command = Paths.get(commandStrings.get(++offset));
}
-
+
List<String> commandLine = new ArrayList<>();
if (command.isAbsolute()) {
commandLine.add(command.toString());
@@ -415,7 +415,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
commandLine.add("-I" + includePath); //$NON-NLS-1$
}
}
-
+
if (baseScannerInfo.getDefinedSymbols() != null) {
for (Map.Entry<String, String> macro : baseScannerInfo.getDefinedSymbols().entrySet()) {
if (macro.getValue() != null && !macro.getValue().isEmpty()) {
@@ -460,15 +460,15 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
// Startup the command
ProcessBuilder processBuilder = new ProcessBuilder(commandLine).directory(buildDirectory.toFile());
- CCorePlugin.getDefault().getBuildEnvironmentManager().setEnvironment(processBuilder.environment(),
- buildConfig, true);
+ CCorePlugin.getDefault().getBuildEnvironmentManager().setEnvironment(processBuilder.environment(), buildConfig,
+ true);
Process process = processBuilder.start();
// Scan for the scanner info
Map<String, String> symbols = new HashMap<>();
List<String> includePath = new ArrayList<>();
Pattern definePattern = Pattern.compile("#define ([^\\s]*)\\s(.*)"); //$NON-NLS-1$
-
+
// First the include path off the error stream
Thread includePathReaderThread = new Thread("Include Path Reader") {
@Override
@@ -498,7 +498,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
}
};
includePathReaderThread.start();
-
+
Thread macroReaderThread = new Thread("Macro reader") {
public void run() {
// Now the defines off the output stream

Back to the top