mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-22 16:35:25 +02:00
Code Issues Wiki Activity

Reverse option path converter to allow converting entry to values

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-04-18 08:26:55 +00:00
parent 66c3bdc869
commit b699c719b8
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IReverseOptionPathConverter.java Normal file
View file

@ -0,0 +1,17 @@
/*******************************************************************************
* Copyright (c) 2007 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Intel Corporation - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.core;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
public interface IReverseOptionPathConverter {
String convertToOptionValue(ICSettingEntry entry, IOption option, ITool tool);
}

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

@ -28,6 +28,7 @@ import org.eclipse.cdt.managedbuilder.core.IEnvVarBuildPath;
import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.managedbuilder.core.IOptionPathConverter;
import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
import org.eclipse.cdt.managedbuilder.core.IReverseOptionPathConverter;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
@ -153,7 +154,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
if(value.indexOf('"') == 0 && value.lastIndexOf('"') == value.length() - 1 && value.length() != 1){
value = value.substring(1, value.length() - 1);
}
ICLanguageSettingEntry entry = createUserEntry(value, flags);
ICLanguageSettingEntry entry = createUserEntry(option, value, flags);
entryList.add(new UserEntryInfo(entry, value));
}
}
@ -208,7 +209,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
return new ICLanguageSettingEntry[0];
}
private ICLanguageSettingEntry createUserEntry(String optionValue, int flags){
private ICLanguageSettingEntry createUserEntry(IOption option, String optionValue, int flags){
int kind = getKind();
ICLanguageSettingEntry entry = null;
@ -231,7 +232,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
if(((Boolean)v[1]).booleanValue()){
flags |= ICLanguageSettingEntry.VALUE_WORKSPACE_PATH;
} else if (optionPathConverter != null){
IPath path = optionPathConverter.convertToPlatformLocation(name, null, null);
IPath path = optionPathConverter.convertToPlatformLocation(name, option, fLangData.getTool());
if(path != null)
name = path.toString();
}
@ -242,17 +243,21 @@ public class BuildEntryStorage extends AbstractEntryStorage {
return entry;
}
private String createOptionValue(UserEntryInfo info){
private String createOptionValue(IOption option, UserEntryInfo info){
if(info.fOptionValue != null)
return info.fOptionValue;
return entryValueToOption(info.fEntry);
return entryValueToOption(option, info.fEntry);
}
private String entryValueToOption(ICLanguageSettingEntry entry){
private String entryValueToOption(IOption option, ICLanguageSettingEntry entry){
if(entry.getKind() == ICLanguageSettingEntry.MACRO && entry.getValue().length() > 0){
return new StringBuffer(entry.getName()).append('=').append(entry.getValue()).toString();
} else if(entry instanceof ICLanguageSettingPathEntry){
IOptionPathConverter converter = fLangData.getTool().getOptionPathConverter();
if(converter instanceof IReverseOptionPathConverter){
return ((IReverseOptionPathConverter)converter).convertToOptionValue(entry, option, fLangData.getTool());
}
ICLanguageSettingPathEntry pathEntry = (ICLanguageSettingPathEntry)entry;
if(pathEntry.isValueWorkspacePath()){
return ManagedBuildManager.fullPathToLocation(pathEntry.getValue());
@ -290,7 +295,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
String optValue[] = new String[entries.length];
if(entries.length != 0){
for(int i = 0; i < entries.length; i++){
optValue[i] = createOptionValue(entries[i]);
optValue[i] = createOptionValue(option, entries[i]);
}
}