mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 210248 - [Internal Builder]does not rebuild a dependent project in

Browse source 
case of a reference library project change - fixed external builder
This commit is contained in:
Alena Laskavaia 2011-11-22 19:34:55 -05:00
parent a3dd98987a
commit fc919d81b6
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/AdditionalInput.java
View file

@ -337,7 +337,8 @@ public class AdditionalInput implements IAdditionalInput {
if (fRebuildState) if (fRebuildState)
return fRebuildState; return fRebuildState;
if (fKind.intValue() == IAdditionalInput.KIND_ADDITIONAL_DEPENDENCY if (fKind.intValue() == IAdditionalInput.KIND_ADDITIONAL_DEPENDENCY
|| fKind.intValue() == IAdditionalInput.KIND_ADDITIONAL_INPUT_DEPENDENCY) { || fKind.intValue() == IAdditionalInput.KIND_ADDITIONAL_INPUT_DEPENDENCY
|| isLibrariesInput()) {
IToolChain toolChain = getToolChain(); IToolChain toolChain = getToolChain();
if (!toolChain.isExtensionElement()) { if (!toolChain.isExtensionElement()) {
long artifactTimeStamp = getArtifactTimeStamp(toolChain); long artifactTimeStamp = getArtifactTimeStamp(toolChain);
@ -395,6 +396,13 @@ public class AdditionalInput implements IAdditionalInput {
return 0; return 0;
} }
private boolean isLibrariesInput() {
// libraries are of the "additionalinput" kind, not "additionalinputdependency" because otherwise the
// external make builder would generate makefiles with $(LIBS) in the dependency list, resulting in
// failure to build dependency -lxyz etc.
return (fKind.intValue() == IAdditionalInput.KIND_ADDITIONAL_INPUT && Arrays.asList(getPaths()).contains("$(LIBS)")); //$NON-NLS-1$
}
private boolean dependencyChanged(String sPath, long artefactTimeStamp) { private boolean dependencyChanged(String sPath, long artefactTimeStamp) {
try { try {
IToolChain toolChain = getToolChain(); IToolChain toolChain = getToolChain();

10
build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
View file

@ -176,7 +176,7 @@
</additionalInput> </additionalInput>
<additionalInput <additionalInput
paths="$(LIBS)" paths="$(LIBS)"
kind="additionalinputdependency"> kind="additionalinput">
</additionalInput> </additionalInput>
</inputType> </inputType>
<outputType <outputType
@ -377,7 +377,7 @@
</additionalInput> </additionalInput>
<additionalInput <additionalInput
paths="$(LIBS)" paths="$(LIBS)"
kind="additionalinputdependency"> kind="additionalinput">
</additionalInput> </additionalInput>
</inputType> </inputType>
<outputType <outputType
@ -458,7 +458,7 @@
</additionalInput> </additionalInput>
<additionalInput <additionalInput
paths="$(LIBS)" paths="$(LIBS)"
kind="additionalinputdependency"> kind="additionalinput">
</additionalInput> </additionalInput>
</inputType> </inputType>
<outputType <outputType
@ -746,7 +746,7 @@
</additionalInput> </additionalInput>
<additionalInput <additionalInput
paths="$(LIBS)" paths="$(LIBS)"
kind="additionalinputdependency"> kind="additionalinput">
</additionalInput> </additionalInput>
</inputType> </inputType>
<outputType <outputType
@ -911,7 +911,7 @@
</additionalInput> </additionalInput>
<additionalInput <additionalInput
paths="$(LIBS)" paths="$(LIBS)"
kind="additionalinputdependency"> kind="additionalinput">
</additionalInput> </additionalInput>
</inputType> </inputType>
<outputType <outputType