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 66258 - Cannot 'mix' compilers (any more). Arbitrarily moved from a single rule for all files with a given extension to a rule for each file. Causing problems for existing users, so moving back to older form of rules.

Browse source
This commit is contained in:
Sean Evoy 2004-06-09 18:37:38 +00:00
parent e7bd887fae
commit a089f769a1
2 changed files with 68 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedBuilderMakefileGenerator.java
View file

@ -23,7 +23,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
public interface IManagedBuilderMakefileGenerator { public interface IManagedBuilderMakefileGenerator {
public final String AT = "@"; //$NON-NLS-1$ public final String AT = "@"; //$NON-NLS-1$
public final String CC_MACRO = "$(CC)"; //$NON-NLS-1$
public final String COLON = ":"; //$NON-NLS-1$ public final String COLON = ":"; //$NON-NLS-1$
public final int COLS_PER_LINE = 80; public final int COLS_PER_LINE = 80;
public final String COMMENT_SYMBOL = "#"; //$NON-NLS-1$ public final String COMMENT_SYMBOL = "#"; //$NON-NLS-1$
@ -31,7 +30,6 @@ public interface IManagedBuilderMakefileGenerator {
public final String DEPFILE_NAME = "subdir.dep"; //$NON-NLS-1$ public final String DEPFILE_NAME = "subdir.dep"; //$NON-NLS-1$
public final String DOT = "."; //$NON-NLS-1$ public final String DOT = "."; //$NON-NLS-1$
public final String ECHO = "echo"; //$NON-NLS-1$ public final String ECHO = "echo"; //$NON-NLS-1$
public final String FLAG_MACRO = "$(CC_FLAGS)"; //$NON-NLS-1$
public final String IN_MACRO = "$<"; //$NON-NLS-1$ public final String IN_MACRO = "$<"; //$NON-NLS-1$
public final String LINEBREAK = "\\\n"; //$NON-NLS-1$ public final String LINEBREAK = "\\\n"; //$NON-NLS-1$
public final String LOGICAL_AND = "&&"; //$NON-NLS-1$ public final String LOGICAL_AND = "&&"; //$NON-NLS-1$

105
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -205,16 +205,18 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
// Local variables needed by generator // Local variables needed by generator
private String buildTargetName; private String buildTargetName;
private ITarget defaultTarget;
private Vector deletedFileList; private Vector deletedFileList;
private Vector dependencyMakefiles; private Vector dependencyMakefiles;
private String extension; private String extension;
protected IManagedBuildInfo info; private IManagedBuildInfo info;
protected Vector modifiedList; private Vector modifiedList;
protected IProgressMonitor monitor; private IProgressMonitor monitor;
protected IProject project; private Set outputExtensionsSet;
protected Vector ruleList; private IProject project;
protected Vector subdirList; private Vector ruleList;
protected IPath topBuildDir; private Vector subdirList;
private IPath topBuildDir;
public GnuMakefileGenerator() { public GnuMakefileGenerator() {
super(); super();
@ -282,26 +284,26 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
return (buffer.append(NEWLINE)); return (buffer.append(NEWLINE));
} }
/* (non-javadoc) /* (non-Javadoc)
* Create the pattern rule in the format: * Create the pattern rule in the format:
* <relative_path>/<name>.<outputExtension>: $(ROOT)/<relative_path>/<name>.<inputExtension> * <relative_path>/%.<outputExtension>: $(ROOT)/<relative_path>/%.<inputExtension>
* @echo 'Building file: $<' * @echo 'Building file: $<'
* @echo <tool> <flags> <output_flag><output_extension>$@ $< * @echo <tool> <flags> <output_flag><output_prefix>$@ $<
* @<tool> <flags> <output_flag><output_extension>$@ $< && \ * @<tool> <flags> <output_flag><output_prefix>$@ $< && \
* echo -n '<relative_path>/<name>.d <relative_path>/' >> <relative_path>/<name>.d && \ * echo -n '<relative_path>/' $(@:%.o=%.d) ' <relative_path>/' >> $(@:%.o=%.d) && \
* <tool> -P -MM -MG <flags> $< >> <relative_path>/<name>.d * <tool> -P -MM -MG <flags> $< >> $(@:%.o=%.d)
* @echo 'Finished building: $<' * @echo 'Finished building: $<'
* @echo ' ' * @echo ' '
* *
* Note that the macros all come from the build model and are * Note that the macros all come from the build model and are
* resolved to a real command before writing to the module * resolved to a real command before writing to the module
* makefile, so a real command might look something like: * makefile, so a real command might look something like:
* source1/foo.o: $(ROOT)/source1/foo.cpp * source1/%.o: $(ROOT)/source1/%.cpp
* @echo 'Building file: $<' * @echo 'Building file: $<'
* @echo g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $< * @echo g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $<
* @ g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $< && \ * @ g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $< && \
* echo -n 'source1/foo.d source1/' >> source1/foo.d && \ * echo -n 'source1/'$(@:%.o=%.d) ' source1/' >> $(@:%.o=%.d) && \
* g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> source1/foo.d * g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> $(@:%.o=%.d)
* @echo 'Finished building: $<' * @echo 'Finished building: $<'
* @echo ' ' * @echo ' '
* *
@ -318,8 +320,20 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
String outflag = null; String outflag = null;
String outputPrefix = null; String outputPrefix = null;
// If the tool creates a dependency file, add it to the list
if (true) {
String depFile = relativePath + resourceName + DOT + DEP_EXT;
getDependencyMakefiles().add(depFile);
}
// Add the rule and command to the makefile // Add the rule and command to the makefile
String buildRule = relativePath + resourceName + DOT + outputExtension + COLON + WHITESPACE + ROOT + SEPARATOR + relativePath + resourceName + DOT + inputExtension; String buildRule = relativePath + WILDCARD + DOT + outputExtension + COLON + WHITESPACE + ROOT + SEPARATOR + relativePath + WILDCARD + DOT + inputExtension;
if (getRuleList().contains(buildRule)) {
return;
}
else {
getRuleList().add(buildRule);
}
buffer.append(buildRule + NEWLINE); buffer.append(buildRule + NEWLINE);
buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_START_FILE + WHITESPACE + IN_MACRO + SINGLE_QUOTE + NEWLINE); buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_START_FILE + WHITESPACE + IN_MACRO + SINGLE_QUOTE + NEWLINE);
buildFlags = info.getFlagsForSource(inputExtension); buildFlags = info.getFlagsForSource(inputExtension);
@ -335,9 +349,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
if (true) { if (true) {
buffer.append(WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); buffer.append(WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK);
// TODO get the dep rule out of the tool // TODO get the dep rule out of the tool
String depRule = relativePath + resourceName + DOT + DEP_EXT; String depRule = "$(@:%." + outputExtension + "=%." + DEP_EXT + ")";
getDependencyMakefiles().add(depRule); buffer.append(TAB + ECHO + WHITESPACE + "-n" + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + depRule + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + WHITESPACE + ">" + WHITESPACE + depRule + WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(TAB + ECHO + WHITESPACE + "-n" + WHITESPACE + SINGLE_QUOTE + depRule + WHITESPACE + relativePath + SINGLE_QUOTE + WHITESPACE + ">" + WHITESPACE + depRule + WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(TAB + cmd + WHITESPACE + "-MM -MG -P -w" + WHITESPACE + buildFlags + WHITESPACE + IN_MACRO + WHITESPACE + ">>" + WHITESPACE + depRule); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append(TAB + cmd + WHITESPACE + "-MM -MG -P -w" + WHITESPACE + buildFlags + WHITESPACE + IN_MACRO + WHITESPACE + ">>" + WHITESPACE + depRule); //$NON-NLS-1$ //$NON-NLS-2$
} }
@ -362,11 +375,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
String relativePath = moduleRelativePath.toString(); String relativePath = moduleRelativePath.toString();
relativePath += relativePath.length() == 0 ? "" : SEPARATOR; //$NON-NLS-1$ relativePath += relativePath.length() == 0 ? "" : SEPARATOR; //$NON-NLS-1$
// get the target for this project
ITarget myTarget = info.getDefaultTarget();
// get the list of tools associated with our target // get the list of tools associated with our target
ITool toolArray[] = myTarget.getTools(); ITool toolArray[] = defaultTarget.getTools();
// For each tool for the target, lookup the kinds of sources it can handle and // For each tool for the target, lookup the kinds of sources it can handle and
// create a map which will map its extension to a string which holds its list of sources. // create a map which will map its extension to a string which holds its list of sources.
@ -384,7 +394,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
// create a macro of the form "EXTENSION_SRCS := " // create a macro of the form "EXTENSION_SRCS := "
String extensionName = exListIterator.next().toString(); String extensionName = exListIterator.next().toString();
if(!extensionToRuleStringMap.containsKey(extensionName) && // do we already have a map entry? if(!extensionToRuleStringMap.containsKey(extensionName) && // do we already have a map entry?
!outputExtensionsSet.contains(extensionName)) { // is the file generated? !getOutputExtentions().contains(extensionName)) { // is the file generated?
// Get the name in the proper macro format // Get the name in the proper macro format
StringBuffer macroName = getMacroName(extensionName); StringBuffer macroName = getMacroName(extensionName);
@ -415,7 +425,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
StringBuffer bufferForExtension = new StringBuffer(); StringBuffer bufferForExtension = new StringBuffer();
bufferForExtension.append(extensionToRuleStringMap.get(ext).toString()); bufferForExtension.append(extensionToRuleStringMap.get(ext).toString());
if(bufferForExtension != null && if(bufferForExtension != null &&
!outputExtensionsSet.contains(bufferForExtension.toString())) { !getOutputExtentions().contains(bufferForExtension.toString())) {
bufferForExtension.append(resource.getName() + WHITESPACE + LINEBREAK); bufferForExtension.append(resource.getName() + WHITESPACE + LINEBREAK);
@ -990,7 +1000,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
/* (non-javadoc) /* (non-javadoc)
* *
* @return List * @return Vector
*/ */
private Vector getModifiedList() { private Vector getModifiedList() {
if (modifiedList == null) { if (modifiedList == null) {
@ -999,25 +1009,29 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
return modifiedList; return modifiedList;
} }
/* (non-Javadoc)
* Answers all of the output extensions that the <code>ITarget</code>
* of the build has tools defined to work on.
*
* @return a <code>Set</code> containing all of the output extensions
*/
protected Set getOutputExtentions() { protected Set getOutputExtentions() {
// Get the target for this project if (outputExtensionsSet == null) {
ITarget myTarget = info.getDefaultTarget();
// Get the list of tools associated with our target // Get the list of tools associated with our target
ITool toolArray[] = myTarget.getTools(); ITool toolArray[] = defaultTarget.getTools();
// The set of output extensions which will be produced by this tool. // The set of output extensions which will be produced by this tool.
// It is presumed that this set is not very large (likely < 10) so // It is presumed that this set is not very large (likely < 10) so
// a HashSet should provide good performance. // a HashSet should provide good performance.
HashSet outputExtensionsSet = new HashSet(); outputExtensionsSet = new HashSet();
// For each tool for the target, lookup the kinds of sources it outputs // For each tool for the target, lookup the kinds of sources it outputs
// and add that to our list of output extensions. // and add that to our list of output extensions.
for(int k = 0; k < toolArray.length; k++) for(int k = 0; k < toolArray.length; k++) {
{
String[] outputs = toolArray[k].getOutputExtensions(); String[] outputs = toolArray[k].getOutputExtensions();
outputExtensionsSet.addAll(Arrays.asList(outputs)); outputExtensionsSet.addAll(Arrays.asList(outputs));
} }
}
return outputExtensionsSet; return outputExtensionsSet;
} }
@ -1065,6 +1079,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
if (extension == null) { if (extension == null) {
extension = new String(); extension = new String();
} }
defaultTarget = info.getDefaultTarget();
} }
/** /**
@ -1300,16 +1315,12 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
// A into B, and then another tool which turns B into C, you will only get dependency info // A into B, and then another tool which turns B into C, you will only get dependency info
// which says that B depends on A. // which says that B depends on A.
// TODO Handle dependencies for complex chains of the form A->B->C // TODO Handle dependencies for complex chains of the form A->B->C
ITarget myTarget = info.getDefaultTarget();
// get the list of tools associated with our target // get the list of tools associated with our target
ITool toolArray[] = myTarget.getTools(); ITool toolArray[] = defaultTarget.getTools();
// get the set of output extensions for all tools
Set outputExtensionsSet = getOutputExtentions();
// set of input extensions for which rules have been created so far // set of input extensions for which rules have been created so far
HashSet handledInputExtensionsSet = new HashSet(); HashSet handledInputExtensions = new HashSet();
// Look at each input extension and generate an appropriate macro for that extension // Look at each input extension and generate an appropriate macro for that extension
// based on whether the file is generated or not. We do not want to create rules for // based on whether the file is generated or not. We do not want to create rules for
@ -1329,8 +1340,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
// checked however. // checked however.
// Generated files should not appear in the list. // Generated files should not appear in the list.
if(!outputExtensionsSet.contains(extensionName) && !handledInputExtensionsSet.contains(extensionName)) { if(!getOutputExtentions().contains(extensionName) && !handledInputExtensions.contains(extensionName)) {
handledInputExtensionsSet.add(extensionName); handledInputExtensions.add(extensionName);
StringBuffer macroName = getMacroName(extensionName); StringBuffer macroName = getMacroName(extensionName);
// create dependency rule of the form // create dependency rule of the form
@ -1365,18 +1376,16 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
StringBuffer buffer = addDefaultHeader(); StringBuffer buffer = addDefaultHeader();
// Add the known macros // Add the known macros
ITarget myTarget = info.getDefaultTarget(); ITool toolArray[] = defaultTarget.getTools();
ITool toolArray[] = myTarget.getTools(); HashSet handledInputExtensions = new HashSet();
Set outputExtensionsSet = getOutputExtentions();
HashSet handledInputExtensionsSet = new HashSet();
for(int k = 0; k < toolArray.length; k++) { for(int k = 0; k < toolArray.length; k++) {
List extensionsList = toolArray[k].getInputExtensions(); List extensionsList = toolArray[k].getInputExtensions();
Iterator exListIterator = extensionsList.iterator(); Iterator exListIterator = extensionsList.iterator();
while(exListIterator.hasNext()) { while(exListIterator.hasNext()) {
// create a macro of the form "EXTENSION_SRCS :=" // create a macro of the form "EXTENSION_SRCS :="
String extensionName = exListIterator.next().toString(); String extensionName = exListIterator.next().toString();
if(!outputExtensionsSet.contains(extensionName) && !handledInputExtensionsSet.contains(extensionName)) { if(!getOutputExtentions().contains(extensionName) && !handledInputExtensions.contains(extensionName)) {
handledInputExtensionsSet.add(extensionName); handledInputExtensions.add(extensionName);
StringBuffer macroName = getMacroName(extensionName); StringBuffer macroName = getMacroName(extensionName);
buffer.append(macroName + WHITESPACE + ":=" + WHITESPACE + NEWLINE); //$NON-NLS-1$ buffer.append(macroName + WHITESPACE + ":=" + WHITESPACE + NEWLINE); //$NON-NLS-1$
} }