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 312835: CDT build settings which are set at the folder level are

Browse source 
ignored in certain situations - restored reverse sorting plus
unit tests adjusted
This commit is contained in:
Andrew Gvozdev 2011-07-02 02:25:38 -04:00
parent 4057829075
commit 70b1c522bd
14 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile
View file

@ -8,9 +8,9 @@ RM := rm
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include Sources/sub\ sources/subdir.mk -include Sources/sub\ sources/subdir.mk
-include Sources/subdir.mk -include Sources/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile
View file

@ -8,9 +8,9 @@ RM := rm
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include Sources/sub\ sources/subdir.mk -include Sources/sub\ sources/subdir.mk
-include Sources/subdir.mk -include Sources/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile
View file

@ -8,9 +8,9 @@ RM := rm
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include Sources/sub\ sources/subdir.mk -include Sources/sub\ sources/subdir.mk
-include Sources/subdir.mk -include Sources/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile
View file

@ -8,8 +8,8 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include Functions/subdir.mk -include Functions/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile
View file

@ -8,8 +8,8 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include Functions/subdir.mk -include Functions/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile
View file

@ -8,10 +8,10 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include source2/source21/subdir.mk -include source2/source21/subdir.mk
-include source2/subdir.mk -include source2/subdir.mk
-include source1/subdir.mk -include source1/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/makefile
View file

@ -8,9 +8,9 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include module/subdir.mk -include module/subdir.mk
-include Sources/subdir.mk -include Sources/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
-include ../makefile.defs -include ../makefile.defs

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/makefile
View file

@ -8,8 +8,8 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include Functions/subdir.mk -include Functions/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/makefile
View file

@ -8,10 +8,10 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include source2/source21/subdir.mk -include source2/source21/subdir.mk
-include source2/subdir.mk -include source2/subdir.mk
-include source1/subdir.mk -include source1/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/makefile
View file

@ -8,8 +8,8 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include sub\ folder\ with\ spaces/subdir.mk -include sub\ folder\ with\ spaces/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/makefile
View file

@ -8,8 +8,8 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include ABC/subdir.mk -include ABC/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
-include ../makefile.defs -include ../makefile.defs

10
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile
View file

@ -8,15 +8,15 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include dir1/dd/ff/subdir.mk -include dir1/dd/ff/subdir.mk
-include dir1/dd/excluded_c/subdir.mk
-include dir1/dd/excluded_c/asd/subdir.mk -include dir1/dd/excluded_c/asd/subdir.mk
-include d1_1/subdir.mk -include dir1/dd/excluded_c/subdir.mk
-include d1_1/d2_1/subdir.mk -include d1_1/d2_1/subdir.mk
-include d1/subdir.mk -include d1_1/subdir.mk
-include d1/d2/subdir.mk
-include d1/d2/d3/subdir.mk -include d1/d2/d3/subdir.mk
-include d1/d2/subdir.mk
-include d1/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

10
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile
View file

@ -8,15 +8,15 @@ RM := rm -rf
# All of the sources participating in the build are defined here # All of the sources participating in the build are defined here
-include sources.mk -include sources.mk
-include subdir.mk
-include dir1/dd/ff/subdir.mk -include dir1/dd/ff/subdir.mk
-include dir1/dd/excluded_c/subdir.mk
-include dir1/dd/excluded_c/asd/subdir.mk -include dir1/dd/excluded_c/asd/subdir.mk
-include d1_1/subdir.mk -include dir1/dd/excluded_c/subdir.mk
-include d1_1/d2_1/subdir.mk -include d1_1/d2_1/subdir.mk
-include d1/subdir.mk -include d1_1/subdir.mk
-include d1/d2/subdir.mk
-include d1/d2/d3/subdir.mk -include d1/d2/d3/subdir.mk
-include d1/d2/subdir.mk
-include d1/subdir.mk
-include subdir.mk
-include objects.mk -include objects.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

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

@ -22,6 +22,7 @@ import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@ -1214,6 +1215,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
if(!projectRelativePath.toString().equals("")) //$NON-NLS-1$ if(!projectRelativePath.toString().equals("")) //$NON-NLS-1$
subDirList.add(0, projectRelativePath.toString()); subDirList.add(0, projectRelativePath.toString());
} }
Collections.sort(subDirList, Collections.reverseOrder());
for (String dir : subDirList) { for (String dir : subDirList) {
buffer.append("-include " + escapeWhitespaces(dir) + SEPARATOR + "subdir.mk"+ NEWLINE); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("-include " + escapeWhitespaces(dir) + SEPARATOR + "subdir.mk"+ NEWLINE); //$NON-NLS-1$ //$NON-NLS-2$
} }