mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

bug 416024: "null" is added to the ${workspace_loc} paths

Browse source
This commit is contained in:
Andrew Gvozdev 2013-10-20 15:16:46 -04:00
parent 3426670477
commit dcffc2cabf
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
View file

@ -599,9 +599,27 @@ public class BuildEntryStorage extends AbstractEntryStorage {
*/ */
private static String locationToFullPath(String path){ private static String locationToFullPath(String path){
path = path.trim(); path = path.trim();
if(!path.startsWith("${")) //$NON-NLS-1$ // A path starting from "${workspace_loc}" is always a filesystem path.
// Only ${workspace_loc:/thing} is treated here as workspace path
if(!path.startsWith("${workspace_loc:")) //$NON-NLS-1$
return null; return null;
final int index = path.lastIndexOf('}');
int index = -1;
int depth = 1;
for (int i = "${workspace_loc:".length(); i < path.length(); i++) { //$NON-NLS-1$
char c = path.charAt(i);
if (c == '}') {
depth--;
if (depth < 1) {
index = i;
break;
}
} else if (c == '{' && path.charAt(i-1) == '$') {
depth++;
}
}
if(index == -1) if(index == -1)
return null; return null;
@ -609,10 +627,10 @@ public class BuildEntryStorage extends AbstractEntryStorage {
String str1 = path.substring(2, index); String str1 = path.substring(2, index);
String result = null; String result = null;
if(str1.startsWith(varName)){ if(str1.startsWith(varName)){
str1 = str1.substring(varName.length()); String str2= str1.substring(varName.length());
if(str1.length() != 0){ if(str2.length() != 0){
if(str1.startsWith(":")){ //$NON-NLS-1$ if(str2.startsWith(":")){ //$NON-NLS-1$
result = str1.substring(1); result = str2.substring(1);
} }
} else { } else {
result = "/"; //$NON-NLS-1$ result = "/"; //$NON-NLS-1$