Skip to content

Commit e947d2b

Browse files
jonahgrahamjonahgraham
committed
Fix many of the review comments.
1 parent 852b0a8 commit e947d2b

File tree

11 files changed

+192
-56
lines changed

11 files changed

+192
-56
lines changed

‎build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/helloworldCPP.zip

-2.84 KB
Binary file not shown.

‎build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/helloworldCPP/.cproject

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
3+
<storageModule moduleId="org.eclipse.cdt.core.settings">
4+
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.820480149">
5+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.820480149" moduleId="org.eclipse.cdt.core.settings" name="Debug">
6+
<externalSettings/>
7+
<extensions>
8+
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
9+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
10+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
11+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
12+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
13+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
14+
</extensions>
15+
</storageModule>
16+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.820480149" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
18+
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.820480149." name="/" resourcePath="">
19+
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1641428807" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
20+
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.262720954" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
21+
<builder buildPath="${workspace_loc:/helloworldCPP}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.1032130352" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
22+
<tool id="cdt.managedbuild.tool.gnu.archiver.base.839906208" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
23+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1196984960" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
24+
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.79417865" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
25+
<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.431065895" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
26+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1286323743" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
27+
</tool>
28+
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1246763039" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
29+
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.369489624" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
30+
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.1826011744" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
31+
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1031978815" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
32+
</tool>
33+
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1304027108" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
34+
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1981132960" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
35+
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1527419178" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
36+
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
37+
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
38+
</inputType>
39+
</tool>
40+
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.169259683" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
41+
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.452335042" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
42+
</tool>
43+
</toolChain>
44+
</folderInfo>
45+
<sourceEntries>
46+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
47+
</sourceEntries>
48+
</configuration>
49+
</storageModule>
50+
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
51+
</cconfiguration>
52+
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1457294052">
53+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1457294052" moduleId="org.eclipse.cdt.core.settings" name="Release">
54+
<externalSettings/>
55+
<extensions>
56+
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
57+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
58+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
59+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
60+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
61+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
62+
</extensions>
63+
</storageModule>
64+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
65+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1457294052" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
66+
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1457294052." name="/" resourcePath="">
67+
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1011821737" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
68+
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.309919958" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
69+
<builder buildPath="${workspace_loc:/helloworldCPP}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.1090002708" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
70+
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1773946264" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
71+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1470241229" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
72+
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.557202788" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
73+
<option defaultValue="gnu.cpp.compiler.debugging.level.none" id="gnu.cpp.compiler.exe.release.option.debugging.level.1759805386" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
74+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.721288807" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
75+
</tool>
76+
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.434487242" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
77+
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1402083057" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
78+
<option defaultValue="gnu.c.debugging.level.none" id="gnu.c.compiler.exe.release.option.debugging.level.869445712" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
79+
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1589410219" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
80+
</tool>
81+
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.348319276" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
82+
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1030689147" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
83+
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.197539459" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
84+
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
85+
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
86+
</inputType>
87+
</tool>
88+
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.2108783729" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
89+
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1936474627" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
90+
</tool>
91+
</toolChain>
92+
</folderInfo>
93+
<sourceEntries>
94+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
95+
</sourceEntries>
96+
</configuration>
97+
</storageModule>
98+
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
99+
</cconfiguration>
100+
</storageModule>
101+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
102+
<project id="helloworldCPP.cdt.managedbuild.target.gnu.exe.1873431902" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
103+
</storageModule>
104+
<storageModule moduleId="scannerConfiguration">
105+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
106+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.820480149;cdt.managedbuild.config.gnu.exe.debug.820480149.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1246763039;cdt.managedbuild.tool.gnu.c.compiler.input.1031978815">
107+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
108+
</scannerConfigBuildInfo>
109+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1457294052;cdt.managedbuild.config.gnu.exe.release.1457294052.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1470241229;cdt.managedbuild.tool.gnu.cpp.compiler.input.721288807">
110+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
111+
</scannerConfigBuildInfo>
112+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1457294052;cdt.managedbuild.config.gnu.exe.release.1457294052.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.434487242;cdt.managedbuild.tool.gnu.c.compiler.input.1589410219">
113+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
114+
</scannerConfigBuildInfo>
115+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.820480149;cdt.managedbuild.config.gnu.exe.debug.820480149.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1196984960;cdt.managedbuild.tool.gnu.cpp.compiler.input.1286323743">
116+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
117+
</scannerConfigBuildInfo>
118+
</storageModule>
119+
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
120+
</cproject>

‎build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/helloworldCPP/.project

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>helloworldCPP</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
10+
<triggers>clean,full,incremental,</triggers>
11+
<arguments>
12+
</arguments>
13+
</buildCommand>
14+
<buildCommand>
15+
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
16+
<triggers>full,incremental,</triggers>
17+
<arguments>
18+
</arguments>
19+
</buildCommand>
20+
</buildSpec>
21+
<natures>
22+
<nature>org.eclipse.cdt.core.cnature</nature>
23+
<nature>org.eclipse.cdt.core.ccnature</nature>
24+
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
25+
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
26+
</natures>
27+
</projectDescription>

‎build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/helloworldCPP/src/helloworldCPP.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
int main() {
2+
return 0;
3+
}

0 commit comments

Comments
 (0)