mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2024-10-28 20:17:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 535091 separate out the two streams for macros and defines.

Browse source 
The output of the call to gcc to pick out the defines and include paths
produces them on different streams, defines on stdout and paths on
stderr. Separate the scanning of the two into two threads.

Change-Id: I3173d3619e53d13a51a6e283eb320a618daacf21
This commit is contained in:
Doug Schaefer 2018-05-29 00:13:47 -04:00
parent 0f8f4a24cf
commit eb197ea3c7
1 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
View file

@ -449,8 +449,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
Files.createDirectories(buildDirectory);
// Startup the command
ProcessBuilder processBuilder = new ProcessBuilder(commandLine).directory(buildDirectory.toFile())
.redirectErrorStream(true);
ProcessBuilder processBuilder = new ProcessBuilder(commandLine).directory(buildDirectory.toFile());
CCorePlugin.getDefault().getBuildEnvironmentManager().setEnvironment(processBuilder.environment(),
buildConfig, true);
Process process = processBuilder.start();
@ -459,30 +458,50 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
Map<String, String> symbols = new HashMap<>();
List<String> includePath = new ArrayList<>();
Pattern definePattern = Pattern.compile("#define ([^\\s]*)\\s(.*)"); //$NON-NLS-1$
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
if (line.startsWith("#define ")) { //$NON-NLS-1$
Matcher matcher = definePattern.matcher(line);
if (matcher.matches()) {
symbols.put(matcher.group(1), matcher.group(2));
}
} else {
String dir = line.trim();
if (dir.equals(".")) { //$NON-NLS-1$
includePath.add(buildDirectory.toString());
} else {
try {
Path dirPath = Paths.get(dir);
if (Files.isDirectory(dirPath)) {
includePath.add(dirPath.toString());
// First the include path off the error stream
new Thread("Include Path Reader") {
@Override
public void run() {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
String dir = line.trim();
if (dir.equals(".")) { //$NON-NLS-1$
includePath.add(buildDirectory.toString());
} else {
try {
Path dirPath = Paths.get(dir);
if (Files.isDirectory(dirPath)) {
includePath.add(dirPath.toString());
}
} catch (InvalidPathException e) {
// nothing
}
} catch (InvalidPathException e) {
// nothing
}
}
} catch (IOException e) {
CCorePlugin.log(e);
}
}
}
}.start();
new Thread("Macro reader") {
public void run() {
// Now the defines off the output stream
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
if (line.startsWith("#define ")) { //$NON-NLS-1$
Matcher matcher = definePattern.matcher(line);
if (matcher.matches()) {
symbols.put(matcher.group(1), matcher.group(2));
}
}
}
} catch (IOException e) {
CCorePlugin.log(e);
}
}
}.start();
try {
process.waitFor();