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

bug 407169: Add 2 more automatic variables in content assist for Makefile Editor

Browse source
This commit is contained in:
Andrew Gvozdev 2013-05-03 09:32:45 -04:00
parent 548b84cb35
commit 98e64e6975
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakeFileResources.properties
View file

@ -22,9 +22,11 @@ MakefileValidator.error.endefMissingOverrideDefine=endef missing [override] defi
MakefileValidator.error.unknownDirective=unknow directive
MakefileValidator.error.noMatchingEndifForCondition=No matching endif for condition
MakefileValidator.error.noMatchingEndefForOverrideDefine=No matching endef for [override] define
GNUMakefile.automatic.at=Target of the rule
GNUMakefile.automatic.lt=First prerequisite of the rule
GNUMakefile.automatic.star=Stem with which an implicit rule matches
GNUMakefile.automatic.qm=All prerequisites that are newer than the target
GNUMakefile.automatic.percent=Target member name, when the target is an archive member
GNUMakefile.automatic.up=All prerequisites
GNUMakefile.automaticVariable.at=Target of the rule
GNUMakefile.automaticVariable.percent=Target member name, when the target is an archive member
GNUMakefile.automaticVariable.less=First prerequisite of the rule
GNUMakefile.automaticVariable.question=All prerequisites that are newer than the target
GNUMakefile.automaticVariable.carrot=All prerequisites
GNUMakefile.automaticVariable.plus=All prerequisites in order
GNUMakefile.automaticVariable.pipe= Order-only prerequisites
GNUMakefile.automaticVariable.star=Stem with which an implicit rule matches

24
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
View file

@ -77,13 +77,16 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
public static String FILE_SEPARATOR = System.getProperty("file.separator", "/"); //$NON-NLS-1$ //$NON-NLS-2$
String[] includeDirectories = new String[0];
@SuppressWarnings("nls")
IDirective[] builtins = new IDirective[]{
new AutomaticVariable(this, "<", MakefileMessages.getString("GNUMakefile.automatic.lt")),//$NON-NLS-1$//$NON-NLS-2$
new AutomaticVariable(this, "*", MakefileMessages.getString("GNUMakefile.automatic.star")),//$NON-NLS-1$//$NON-NLS-2$
new AutomaticVariable(this, "@", MakefileMessages.getString("GNUMakefile.automatic.at")),//$NON-NLS-1$//$NON-NLS-2$
new AutomaticVariable(this, "?", MakefileMessages.getString("GNUMakefile.automatic.qm")),//$NON-NLS-1$//$NON-NLS-2$
new AutomaticVariable(this, "%", MakefileMessages.getString("GNUMakefile.automatic.percent")),//$NON-NLS-1$//$NON-NLS-2$
new AutomaticVariable(this, "^", MakefileMessages.getString("GNUMakefile.automatic.up")),//$NON-NLS-1$//$NON-NLS-2$
new AutomaticVariable(this, "@", MakefileMessages.getString("GNUMakefile.automaticVariable.at")),
new AutomaticVariable(this, "%", MakefileMessages.getString("GNUMakefile.automaticVariable.percent")),
new AutomaticVariable(this, "<", MakefileMessages.getString("GNUMakefile.automaticVariable.less")),
new AutomaticVariable(this, "?", MakefileMessages.getString("GNUMakefile.automaticVariable.question")),
new AutomaticVariable(this, "^", MakefileMessages.getString("GNUMakefile.automaticVariable.carrot")),
new AutomaticVariable(this, "+", MakefileMessages.getString("GNUMakefile.automaticVariable.plus")),
new AutomaticVariable(this, "|", MakefileMessages.getString("GNUMakefile.automaticVariable.pipe")),
new AutomaticVariable(this, "*", MakefileMessages.getString("GNUMakefile.automaticVariable.star")),
};
private IMakefileReaderProvider makefileReaderProvider;
@ -91,9 +94,6 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
super(null);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.make.core.makefile.IMakefile#getMakefileReaderProvider()
*/
@Override
public IMakefileReaderProvider getMakefileReaderProvider() {
return makefileReaderProvider;
@ -104,9 +104,6 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
parse(URIUtil.toURI(filePath), new MakefileReader(reader));
}
/* (non-Javadoc)
* @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
*/
@Override
public void parse(URI fileURI,
IMakefileReaderProvider makefileReaderProvider) throws IOException {
@ -818,9 +815,6 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
return list.toArray(new IDirective[list.size()]);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.make.internal.core.makefile.AbstractMakefile#getBuiltins()
*/
@Override
public IDirective[] getBuiltins() {
return builtins;