Skip to content
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

Cdt 9 5 #10

Closed
wants to merge 22 commits into from
Closed

Cdt 9 5 #10

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5d4915c
[releng] Set paths to 9.5 on the branch
jonahgraham Jun 5, 2018
a91cd76
[releng] Use Photon specific locations for target platform
jonahgraham Jun 9, 2018
025742c
Bug 531701 - ClassCastException in
HighCommander4 Feb 27, 2018
3b44424
Bug 535972 deal with relative include paths in GCC scanner info
Jun 16, 2018
e6550c7
Revert "Bug 534286. Made read(byte[],int,int) blocking"
Jun 16, 2018
ce52b24
[releng] Bump version to 9.5.1
jonahgraham Jun 27, 2018
0f2ab7f
[releng] Update CDT Baseline to CDT 9.5
jonahgraham Jun 27, 2018
054750b
[releng] Proper URL for platform with milestones being removed
jonahgraham Jun 27, 2018
4b8274b
Bug 536317 - Deadlock at start with launchbar and docker tooling enabled
jjohnstn Jun 28, 2018
a1ed9cd
Bug 536396 - Handle corrupt scanner info cache files
Jul 4, 2018
ee5f57d
Bug 536363 - Meson project include paths wrong when using ccache
jjohnstn Jul 4, 2018
ea35968
[releng] Bump version to 9.5.2
jonahgraham Jul 6, 2018
893784c
Bug 533363 - Indexer spending a lot of time in CommandLauncherManager
jjohnstn Jul 11, 2018
5f449f8
Bug 536884 - Removing header cache should cause ScannerInfo refresh
jjohnstn Jul 12, 2018
f90f1e2
Bug 536413 - ConcurrentModificationException when indexing
jjohnstn Jul 17, 2018
35a590e
[releng] Bump version to 9.5.3
jonahgraham Jul 23, 2018
3603986
Bug 537118 - CMake and Meson integration now working on Windows.
copelnug Aug 1, 2018
fe5703b
Bug 537632 - Meson Property Pages missing some fields after configure
jjohnstn Aug 2, 2018
e0e6a54
Bug 537924: Unable to build javadoc maven target
Aug 13, 2018
fae039b
Bug 535559 - Index search for entity inside toplevel anonymous namespace
HighCommander4 Jun 22, 2018
f4178eb
Bug 535548 - Infinite recursion loading function whose return type re…
HighCommander4 Jun 25, 2018
8c3ed4c
Bug 536805 - NPE in CPPEvaluation.maybeApplyConversion()
HighCommander4 Jul 8, 2018
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
Prev Previous commit
Next Next commit
Bug 536363 - Meson project include paths wrong when using ccache 
- fix GCCToolChain and ContainerGCCToolChain to not blindly
  take the first token in the command string when processing
  scannerinfo; if it is "ccache", take the second token instead

Change-Id: I4b2b7dfaccae6f3ec968bbe4217c57994ad71963
(cherry picked from commit a5ed8ea)
  • Loading branch information
@jjohnstn
jjohnstn committed Jul 5, 2018
commit ee5f57d536f67b9b4bddcc32774761babca5c41e
11 changes: 9 additions & 2 deletions build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,14 @@ public IExtendedScannerInfo getScannerInfo(IBuildConfiguration buildConfig, List
try {
Path buildDirectory = Paths.get(buildDirectoryURI);

Path command = Paths.get(commandStrings.get(0));
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());
Expand All @@ -283,7 +290,7 @@ public IExtendedScannerInfo getScannerInfo(IBuildConfiguration buildConfig, List
}

addDiscoveryOptions(commandLine);
commandLine.addAll(commandStrings.subList(1, commandStrings.size()));
commandLine.addAll(commandStrings.subList(offset + 1, commandStrings.size()));

// Strip surrounding quotes from the args on Windows
if (Platform.OS_WIN32.equals(Platform.getOS())) {
Expand Down
12 changes: 10 additions & 2 deletions ...cher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,14 @@ public IExtendedScannerInfo getScannerInfo(IBuildConfiguration buildConfig, List
try {
Path buildDirectory = Paths.get(buildDirectoryURI);

Path command = Paths.get(commandStrings.get(0));
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());
Expand All @@ -213,7 +220,8 @@ public IExtendedScannerInfo getScannerInfo(IBuildConfiguration buildConfig, List
}

addDiscoveryOptions(commandLine);
commandLine.addAll(commandStrings.subList(1, commandStrings.size()));
commandLine.addAll(
commandStrings.subList(offset + 1, commandStrings.size()));

// Strip surrounding quotes from the args on Windows
if (Platform.OS_WIN32.equals(Platform.getOS())) {
Expand Down