mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for [Bug 196852] Internal Builder does not expand macros in pre- and post- build steps

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-08-10 13:06:54 +00:00
parent 18e36b75d0
commit 868b714c51
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java
View file

@ -260,18 +260,21 @@ public class BuildStep implements IBuildStep {
}
if(step != null && (step = step.trim()).length() > 0){
String commands[] = step.split(";"); //$NON-NLS-1$
if(cwd == null)
cwd = calcCWD();
List list = new ArrayList();
for(int i = 0; i < commands.length; i++){
IBuildCommand cmds[] = createCommandsFromString(commands[i], cwd, getEnvironment());
for(int j = 0; j < cmds.length; j++){
list.add(cmds[j]);
step = resolveMacros(step, resolveAll);
if(step != null && (step = step.trim()).length() > 0){
String commands[] = step.split(";"); //$NON-NLS-1$
if(cwd == null)
cwd = calcCWD();
List list = new ArrayList();
for(int i = 0; i < commands.length; i++){
IBuildCommand cmds[] = createCommandsFromString(commands[i], cwd, getEnvironment());
for(int j = 0; j < cmds.length; j++){
list.add(cmds[j]);
}
}
return (IBuildCommand[])list.toArray(new BuildCommand[list.size()]);
}
return (IBuildCommand[])list.toArray(new BuildCommand[list.size()]);
}
return new IBuildCommand[0];
}
@ -458,7 +461,22 @@ public class BuildStep implements IBuildStep {
return result;
}
private String resolveMacros(String str, boolean resolveAll){
String result = str;
try {
IConfiguration cfg = getBuildDescription().getConfiguration();
if(resolveAll){
result = ManagedBuildManager.getBuildMacroProvider().resolveValue(str, "", " ", IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg); //$NON-NLS-1$ //$NON-NLS-2$
} else {
result = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(str, "", " ", IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg); //$NON-NLS-1$ //$NON-NLS-2$
}
} catch (CdtVariableException e) {
}
return result;
}
private SupplierBasedCdtVariableSubstitutor createSubstitutor(IConfiguration cfg, IBuilder builder, IFileContextData fileData){
BuildMacroProvider prov = (BuildMacroProvider)ManagedBuildManager.getBuildMacroProvider();
IMacroContextInfo info = prov.getMacroContextInfo(IBuildMacroProvider.CONTEXT_FILE, fileData);