Skip to content

Commit

Permalink
Bug 550076 - Use PE64 parser by default
Browse files Browse the repository at this point in the history
Change-Id: I757c8ace43e79f1215ad0e817430e5ab90415401
  • Loading branch information
jonahgraham committed Sep 9, 2019
1 parent a1febf0 commit 2cbf927
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 44 deletions.
2 changes: 1 addition & 1 deletion build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GCC support for CDT Build Core
Bundle-SymbolicName: org.eclipse.cdt.build.gcc.core;singleton:=true
Bundle-Version: 1.0.1.qualifier
Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.cdt.build.gcc.core.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public String getBinaryParserId() {
// TODO be smarter and use the id which should be the target
switch (Platform.getOS()) {
case Platform.OS_WIN32:
return CCorePlugin.PLUGIN_ID + ".PE"; //$NON-NLS-1$
return CCorePlugin.PLUGIN_ID + ".PE64"; //$NON-NLS-1$
case Platform.OS_MACOSX:
return CCorePlugin.PLUGIN_ID + ".MachO64"; //$NON-NLS-1$
default:
Expand Down
32 changes: 16 additions & 16 deletions build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
defaultExtension="toor"
isAbstract="false"
makeCommand="make"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
makeArguments="-k"
osList="win32">
<tool
Expand Down Expand Up @@ -204,7 +204,7 @@
isTest="true"
defaultExtension="bus"
isAbstract="false"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
archList="x86,ppc"
parent="test.root"
makeArguments="-d"
Expand Down Expand Up @@ -374,7 +374,7 @@
isTest="true"
errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser"
name="Test Error Parsers"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
isAbstract="false"
id="test.error.parsers">
<tool
Expand Down Expand Up @@ -1225,7 +1225,7 @@
<targetPlatform
id="cdt.managedbuild.target.testgnu.platform.exe.debug"
name="Dbg Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -1298,7 +1298,7 @@
<targetPlatform
id="cdt.managedbuild.target.testgnu.platform.exe.release"
name="Rel Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -3646,7 +3646,7 @@
<targetPlatform
id="cdt.managedbuild.target.testenv.platform.exe.debug"
name="Dbg Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -3711,7 +3711,7 @@
<targetPlatform
id="cdt.managedbuild.target.testenv.platform.exe.release"
name="Rel Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -3819,7 +3819,7 @@
<targetPlatform
id="cdt.managedbuild.target.testenv.platform.exe.five"
name="Dbg Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -3873,7 +3873,7 @@
<targetPlatform
id="TopTC.platform"
name="TopTC Platform"
binaryParser="org.eclipse.cdt.core.PE"/>
binaryParser="org.eclipse.cdt.core.PE64"/>
<builder
id="TopTC.managedbuilder"
name="TopTC Builder"/>
Expand Down Expand Up @@ -4018,7 +4018,7 @@
<targetPlatform
id="cdt.managedbuild.target.testMultipleVersions.platform.exe.debug"
name="Debug IA32 Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -4058,7 +4058,7 @@
<targetPlatform
id="cdt.managedbuild.target.testMultipleVersions.platform.exe.release"
name="Release IA32 Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -4159,7 +4159,7 @@
<targetPlatform
id="target.testProjectConverterConvenienceRoutines.platform.exe.debug"
name="Debug IA32 Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -4741,7 +4741,7 @@
<targetPlatform
id="cdt.test.fortran.platform.executable.release"
name="Platform.Executable.Release"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
osList="win32"
archList="x86">
</targetPlatform>
Expand Down Expand Up @@ -4785,7 +4785,7 @@
<targetPlatform
id="cdt.test.fortran.platform.executable.debug"
name="Platform.Executable.Debug"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
osList="win32"
archList="x86">
</targetPlatform>
Expand Down Expand Up @@ -5097,7 +5097,7 @@
<targetPlatform
id="cdt.managedbuild.target.enablement.platform.exe.debug"
name="Dbg Platform"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -8470,7 +8470,7 @@
<targetPlatform
id="test.four.dot.zero.cdt.managedbuild.target.gnu.platform.cygwin.base"
name="Test 4.0 PlatformName.Dbg"
binaryParser="org.eclipse.cdt.core.Cygwin_PE"
binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
osList="win32"
archList="all">
</targetPlatform>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private void checkExeProjectType(IProjectType ptype) throws BuildException {
int expectedSizeOSList = 5;
String[] expectedArchList = { "all" };
String expectedBinaryParser = "org.eclipse.cdt.core.ELF";
String expectedBinaryParser2 = "org.eclipse.cdt.core.PE";
String expectedBinaryParser2 = "org.eclipse.cdt.core.PE64";
String[] expectedPlatformName = { "Dbg Platform", "Rel Platform" };
String expectedCommand = "make";
String expectedArguments = "-k";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ private void checkOptionReferences(IProject project) throws BuildException {
private void checkRootProjectType(IProjectType type) throws BuildException {
// Project stuff
String expectedCleanCmd = "del /myworld";
String expectedParserId = "org.eclipse.cdt.core.PE";
String expectedParserId = "org.eclipse.cdt.core.PE64";
String[] expectedOSList = { "win32" };
String[] expectedArchList = { "all" };
assertTrue(type.isTestProjectType());
Expand Down Expand Up @@ -1123,7 +1123,7 @@ private void checkRootProjectType(IProjectType type) throws BuildException {
*/
private void checkRootManagedProject(IManagedProject managedProj, String testValue) throws BuildException {
String expectedCleanCmd = "del /myworld";
String expectedParserId = "org.eclipse.cdt.core.PE";
String expectedParserId = "org.eclipse.cdt.core.PE64";
String[] expectedOSList = { "win32" };
String[] expectedArchList = { "all" };
assertTrue(managedProj.getProjectType().isTestProjectType());
Expand Down Expand Up @@ -1571,7 +1571,7 @@ private void checkSubProjectType(IProjectType projType) throws BuildException {
// Make sure the binary parser is hard-coded and available
IToolChain toolChain = configs[0].getToolChain();
ITargetPlatform targetPlatform = toolChain.getTargetPlatform();
assertEquals("org.eclipse.cdt.core.PE", targetPlatform.getBinaryParserList()[0]);
assertEquals("org.eclipse.cdt.core.PE64", targetPlatform.getBinaryParserList()[0]);
String[] expectedOSList = { "win32", "linux", "solaris" };
assertTrue(Arrays.equals(expectedOSList, toolChain.getOSList()));
// Make sure the list is overridden
Expand Down Expand Up @@ -1880,7 +1880,7 @@ public void testErrorParsers() throws BuildException {
*/
private void checkErrorParsersProject(IManagedProject proj) throws BuildException {
// Target stuff
String expectedBinParserId = "org.eclipse.cdt.core.PE";
String expectedBinParserId = "org.eclipse.cdt.core.PE64";
IConfiguration[] configs = proj.getConfigurations();
IToolChain toolChain = configs[0].getToolChain();
ITargetPlatform targetPlatform = toolChain.getTargetPlatform();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true
Bundle-Version: 8.7.100.qualifier
Bundle-Version: 8.7.200.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ Additional special types exist to flag options of special relevance to the build
<attribute name="binaryParser" type="string">
<annotation>
<documentation>
Set this to the ID of the binary parser for the output format of your target. Currently there are only 2 choices: org.eclipse.cdt.core.ELF for *nix targets, and &quot;org.eclipse.cdt.core.PE&quot; for targets that build for Windows, like Cygwin.
Set this to the ID of the binary parser for the output format of your target. Currently there are only 2 choices: org.eclipse.cdt.core.ELF for *nix targets, and &quot;org.eclipse.cdt.core.PE64&quot; for targets that build for Windows, like Cygwin.
</documentation>
</annotation>
</attribute>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.gnu.ui; singleton:=true
Bundle-Version: 8.3.1.qualifier
Bundle-Version: 8.3.100.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1924,7 +1924,7 @@
<targetPlatform
id="cdt.managedbuild.target.gnu.platform.cygwin.base"
name="%PlatformName.Dbg"
binaryParser="org.eclipse.cdt.core.Cygwin_PE"
binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
osList="win32"
archList="all">
</targetPlatform>
Expand Down Expand Up @@ -1994,7 +1994,7 @@
<targetPlatform
id="cdt.managedbuild.target.gnu.platform.mingw.base"
name="%PlatformName.Dbg"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
osList="win32"
archList="all">
</targetPlatform>
Expand Down
5 changes: 5 additions & 0 deletions core/org.eclipse.cdt.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3343,6 +3343,11 @@
parserID="org.eclipse.cdt.core.Cygwin_PE"
id="PEBinaryParserPage">
</parserPage>
<parserPage
class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
parserID="org.eclipse.cdt.core.Cygwin_PE64"
id="PEBinaryParserPage">
</parserPage>
<parserPage
class="org.eclipse.cdt.ui.dialogs.GNUXCoffBinaryParserPage"
parserID="org.eclipse.cdt.core.XCOFF32"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div role="main"><h1>Selecting a binary parser</h1>
<p>Selecting the correct binary parser is important to ensure the
accuracy of the C/C++ Projects view and to successfully run and debug
your programs. Windows users should select the PE Windows Parser. UNIX
your programs. Windows users should select the PE64 Windows Parser. UNIX
and Linux users should select the Elf Parser. When you select the
correct parser for your development environment and build your project,
you can view the components of the .o file in the C/C++ Projects view
Expand All @@ -30,8 +30,8 @@
<li>In the <strong>Binary Parser</strong> list, click:
<ul>
<li><strong>Elf Parser</strong>, if you are a Solaris, UNIX, or Linux user.</li>
<li><strong>PE Windows Parser</strong>, if you are a Windows user.</li>
<li><strong>Cygwin PE Parser</strong>, if you are using Cygwin.</li>
<li><strong>PE64 Windows Parser</strong>, if you are a Windows user.</li>
<li><strong>Cygwin PE64 Parser</strong>, if you are using Cygwin.</li>
</ul>
</li>
<li>Click <strong>OK</strong>.</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5043,7 +5043,7 @@ <h5>Figure 8 Generated makefiles</h5>
you will be using to create your example projects on. For example, if
you
are running this tutorial on Linux or Solaris, enter the value <code>org.eclipse.cdt.core.ELF</code>.
If you are running the tutorial on Windows, enter the value <code>org.eclipse.cdt.core.PE</code>.</li>
If you are running the tutorial on Windows, enter the value <code>org.eclipse.cdt.core.PE64</code>.</li>
</ol>
<p style="font-weight: normal;" class="subsection">
<strong>
Expand Down
6 changes: 3 additions & 3 deletions doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div role="main"><h1>Selecting a binary parser</h1>
<p>Selecting the correct binary parser is important to ensure the
accuracy of the C/C++ Projects view and to successfully run and debug
your programs. Windows users should select the PE Windows Parser. UNIX
your programs. Windows users should select the PE64 Windows Parser. UNIX
and Linux users should select the Elf Parser. When you select the
correct parser for your development environment and build your project,
you can view the components of the .o file in the C/C++ Projects view
Expand All @@ -30,8 +30,8 @@
<li>In the <strong>Binary Parser</strong> list, click:
<ul>
<li><strong>Elf Parser</strong>, if you are a Solaris, UNIX, or Linux user.</li>
<li><strong>PE Windows Parser</strong>, if you are a Windows user.</li>
<li><strong>Cygwin PE Parser</strong>, if you are using Cygwin.</li>
<li><strong>PE64 Windows Parser</strong>, if you are a Windows user.</li>
<li><strong>Cygwin PE64 Parser</strong>, if you are using Cygwin.</li>
</ul>
</li>
<li>Click <strong>OK</strong>.</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.llvm.ui;singleton:=true
Bundle-Version: 1.1.8.qualifier
Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.llvm.ui.LlvmUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
12 changes: 6 additions & 6 deletions llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@
superClass="cdt.managedbuild.toolchain.llvm.clang.base">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.Cygwin_PE"
binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
id="cdt.managedbuild.target.llvm.win32.cygwin.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
Expand All @@ -1241,7 +1241,7 @@
superClass="cdt.managedbuild.toolchain.llvm.clang.base">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.win32.mingw.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
Expand Down Expand Up @@ -1347,7 +1347,7 @@
superClass="cdt.managedbuild.toolchain.llvm.gnu.base">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.Cygwin_PE"
binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
id="cdt.managedbuild.target.llvm.gnu.win32.cygwin.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
Expand All @@ -1366,7 +1366,7 @@
superClass="cdt.managedbuild.toolchain.llvm.gnu.base">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.gnu.win32.mingw.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
Expand Down Expand Up @@ -1432,7 +1432,7 @@
superClass="cdt.managedbuild.toolchain.llvm.with.static.compiler.base">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.static.compiler.win32.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
Expand Down Expand Up @@ -1498,7 +1498,7 @@
superClass="cdt.managedbuild.toolchain.llvm.jit.base">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.jit.win32.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
Expand Down
2 changes: 1 addition & 1 deletion windows/org.eclipse.cdt.msw.build/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
targetTool="org.eclipse.cdt.msvc.link;org.eclipse.cdt.msvc.lib">
<targetPlatform
archList="all"
binaryParser="org.eclipse.cdt.core.PE"
binaryParser="org.eclipse.cdt.core.PE64"
id="org.eclipse.cdt.msvc.targetPlatform"
osList="win32">
</targetPlatform>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public String[] getErrorParserIds() {

@Override
public String getBinaryParserId() {
return CCorePlugin.PLUGIN_ID + ".PE"; //$NON-NLS-1$
return CCorePlugin.PLUGIN_ID + ".PE64"; //$NON-NLS-1$
}

@Override
Expand Down

0 comments on commit 2cbf927

Please sign in to comment.