From 2cbf927a36d722adb50d0e90421378752ad15d43 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 3 Sep 2019 10:27:38 -0400 Subject: [PATCH] Bug 550076 - Use PE64 parser by default Change-Id: I757c8ace43e79f1215ad0e817430e5ab90415401 --- .../META-INF/MANIFEST.MF | 2 +- .../cdt/build/gcc/core/GCCToolChain.java | 2 +- .../plugin.xml | 32 +++++++++---------- .../core/tests/ManagedBuildCoreTests.java | 2 +- .../core/tests/ManagedBuildCoreTests20.java | 8 ++--- .../META-INF/MANIFEST.MF | 2 +- .../schema/ManagedBuildTools.exsd | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../plugin.xml | 4 +-- core/org.eclipse.cdt.ui/plugin.xml | 5 +++ .../tasks/cdt_t_proj_parser.htm | 6 ++-- .../Managed_Build_Extensibility.html | 2 +- .../tasks/cdt_t_proj_parser.htm | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../plugin.xml | 12 +++---- windows/org.eclipse.cdt.msw.build/plugin.xml | 2 +- .../cdt/msw/build/core/MSVCToolChain.java | 2 +- 17 files changed, 49 insertions(+), 44 deletions(-) diff --git a/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF index e9fd3792eeb..7fe5b95686a 100644 --- a/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF @@ -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, diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java index 7e4a4de8804..16fff2dd9bf 100644 --- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java +++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java @@ -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: diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml index 09bc3c2517e..3d4ea53d48c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml @@ -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"> @@ -1298,7 +1298,7 @@ @@ -3646,7 +3646,7 @@ @@ -3711,7 +3711,7 @@ @@ -3819,7 +3819,7 @@ @@ -3873,7 +3873,7 @@ + binaryParser="org.eclipse.cdt.core.PE64"/> @@ -4018,7 +4018,7 @@ @@ -4058,7 +4058,7 @@ @@ -4159,7 +4159,7 @@ @@ -4741,7 +4741,7 @@ @@ -4785,7 +4785,7 @@ @@ -5097,7 +5097,7 @@ @@ -8470,7 +8470,7 @@ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java index 1bd037fb571..65b84a4c73f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java @@ -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"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java index 644bdbdcd3e..70e2d552418 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java @@ -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()); @@ -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()); @@ -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 @@ -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(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF index 49db4305758..e433053bf62 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -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 diff --git a/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd b/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd index f530f6c8cec..ae7409bbe1d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd +++ b/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd @@ -514,7 +514,7 @@ Additional special types exist to flag options of special relevance to the build - 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 "org.eclipse.cdt.core.PE" 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 "org.eclipse.cdt.core.PE64" for targets that build for Windows, like Cygwin. diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF index 5a0ab9cc0e6..632c4dad847 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF @@ -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 diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml index 36eab81bf75..665913f5c7b 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml @@ -1924,7 +1924,7 @@ @@ -1994,7 +1994,7 @@ diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml index 50e0430c72f..ee0a5873c7d 100644 --- a/core/org.eclipse.cdt.ui/plugin.xml +++ b/core/org.eclipse.cdt.ui/plugin.xml @@ -3343,6 +3343,11 @@ parserID="org.eclipse.cdt.core.Cygwin_PE" id="PEBinaryParserPage"> + +

Selecting a binary parser

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 @@ -30,8 +30,8 @@

  • In the Binary Parser list, click:
    • Elf Parser, if you are a Solaris, UNIX, or Linux user.
      • -
    • PE Windows Parser, if you are a Windows user.
      • -
    • Cygwin PE Parser, if you are using Cygwin.
      • +
    • PE64 Windows Parser, if you are a Windows user.
      • +
    • Cygwin PE64 Parser, if you are using Cygwin.
  • Click OK.
    • diff --git a/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html b/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html index dc405670378..c256a2d68ed 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html @@ -5043,7 +5043,7 @@
    Figure 8 Generated makefiles
    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 org.eclipse.cdt.core.ELF. -If you are running the tutorial on Windows, enter the value org.eclipse.cdt.core.PE. +If you are running the tutorial on Windows, enter the value org.eclipse.cdt.core.PE64.

    diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm index 7145c077d62..3591289af52 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm @@ -10,7 +10,7 @@

    Selecting a binary parser

    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 @@ -30,8 +30,8 @@

  • In the Binary Parser list, click:
    • Elf Parser, if you are a Solaris, UNIX, or Linux user.
      • -
    • PE Windows Parser, if you are a Windows user.
      • -
    • Cygwin PE Parser, if you are using Cygwin.
      • +
    • PE64 Windows Parser, if you are a Windows user.
      • +
    • Cygwin PE64 Parser, if you are using Cygwin.
  • Click OK.
    • diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF index 6082e6fa17f..9d7271d1530 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF @@ -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 diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml index edcfd3bca93..396d33637f8 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml @@ -1222,7 +1222,7 @@ superClass="cdt.managedbuild.toolchain.llvm.clang.base"> diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java index 94647a43cad..2297dec6e16 100644 --- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java +++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java @@ -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