mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 03:05:39 +02:00
Code Issues Wiki Activity

1. Fix to CDT Variables: project macros added.

Browse source 
2. Additional MBS tests enabled
This commit is contained in:
Mikhail Sennikovsky 2007-05-25 11:57:52 +00:00
parent 2b2eb9d8bb
commit fbbd7f6c2e
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java
View file

@ -59,7 +59,7 @@ public class AllManagedBuildTests {
// suite.addTest(ManagedCommandLineGeneratorTest.suite()); // suite.addTest(ManagedCommandLineGeneratorTest.suite());
// suite.addTest(ResourceBuildCoreTests.suite()); // suite.addTest(ResourceBuildCoreTests.suite());
// suite.addTest(ManagedProject21MakefileTests.suite()); // suite.addTest(ManagedProject21MakefileTests.suite());
// suite.addTest(ManagedProject30MakefileTests.suite()); suite.addTest(ManagedProject30MakefileTests.suite());
suite.addTest(ManagedBuildCoreTests_SharedToolOptions.suite()); suite.addTest(ManagedBuildCoreTests_SharedToolOptions.suite());
// suite.addTest(ManagedBuildEnvironmentTests.suite()); // suite.addTest(ManagedBuildEnvironmentTests.suite());
// suite.addTest(ManagedBuildMacrosTests.suite()); // suite.addTest(ManagedBuildMacrosTests.suite());

17
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
View file

@ -14,7 +14,9 @@ import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.cdtvariables.CdtVariable; import org.eclipse.cdt.core.cdtvariables.CdtVariable;
import org.eclipse.cdt.core.cdtvariables.ICdtVariable; import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.utils.Platform; import org.eclipse.cdt.utils.Platform;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
@ -32,6 +34,8 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase {
private static final String fConfigurationMacros[] = new String[]{ private static final String fConfigurationMacros[] = new String[]{
"ConfigName", //$NON-NLS-1$ "ConfigName", //$NON-NLS-1$
"ConfigDescription", //$NON-NLS-1$ "ConfigDescription", //$NON-NLS-1$
"ProjName", //$NON-NLS-1$
"ProjDirPath", //$NON-NLS-1$
// "BuildArtifactFileName", //$NON-NLS-1$ // "BuildArtifactFileName", //$NON-NLS-1$
// "BuildArtifactFileExt", //$NON-NLS-1$ // "BuildArtifactFileExt", //$NON-NLS-1$
// "BuildArtifactFileBaseName", //$NON-NLS-1$ // "BuildArtifactFileBaseName", //$NON-NLS-1$
@ -183,6 +187,11 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase {
return macro; return macro;
} }
private IProject getProject(ICConfigurationDescription cfgDes){
ICProjectDescription des = cfgDes.getProjectDescription();
return des != null ? des.getProject() : null;
}
public ICdtVariable getMacro(String macroName, ICConfigurationDescription cfg){ public ICdtVariable getMacro(String macroName, ICConfigurationDescription cfg){
ICdtVariable macro = null; ICdtVariable macro = null;
if("ConfigName".equals(macroName)){ //$NON-NLS-1$ if("ConfigName".equals(macroName)){ //$NON-NLS-1$
@ -190,6 +199,14 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase {
} }
else if("ConfigDescription".equals(macroName)){ //$NON-NLS-1$ else if("ConfigDescription".equals(macroName)){ //$NON-NLS-1$
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,cfg.getDescription()); macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,cfg.getDescription());
} else if("ProjName".equals(macroName)){ //$NON-NLS-1$
IProject project = getProject(cfg);
if(project != null)
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,project.getName());
} else if("ProjDirPath".equals(macroName)){ //$NON-NLS-1$
IProject project = getProject(cfg);
if(project != null)
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,project.getLocation().toString());
} }
/* else if("BuildArtifactFileName".equals(macroName)){ //$NON-NLS-1$ /* else if("BuildArtifactFileName".equals(macroName)){ //$NON-NLS-1$
String name = cfg.getArtifactName(); String name = cfg.getArtifactName();