From 451cdd57875fb6d52197097e4c735348559163d9 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 26 May 2014 13:29:28 -0400 Subject: [PATCH] Bug 303083 - Rename spawner bundle to 'native' Native more accurately reflects what we've put there. They're native utilities that can be reused by other Eclipse bundles to access native services. Also fixed up the cdt 4.4 target which had fixed version numbers for some of the dependencies and used RSE out of the Luna repo instead of their latest milestones. Change-Id: I259aa9e92212409378679a8c61bf2fffd05c67a2 Reviewed-on: https://git.eclipse.org/r/27304 Tested-by: Hudson CI Reviewed-by: Doug Schaefer --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 0 .../.cvsignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 3 +- .../plugin.properties | 28 ++++++++++++++++++ .../pom.xml | 2 +- .../org/eclipse/cdt/core/IProcessInfo.java | 0 .../org/eclipse/cdt/core/IProcessList.java | 0 .../internal/core/spawner/CSpawnerPlugin.java | 0 .../cdt/internal/core/spawner/Messages.java | 0 .../internal/core/spawner/messages.properties | 0 .../eclipse/cdt/utils/WindowsRegistry.java | 0 .../utils/org/eclipse/cdt/utils/pty/PTY.java | 0 .../eclipse/cdt/utils/pty/PTYInputStream.java | 0 .../cdt/utils/pty/PTYOutputStream.java | 0 .../cdt/utils/spawner/EnvironmentReader.java | 0 .../cdt/utils/spawner/ProcessFactory.java | 0 .../eclipse/cdt/utils/spawner/Spawner.java | 0 .../cdt/utils/spawner/SpawnerInputStream.java | 0 .../utils/spawner/SpawnerOutputStream.java | 0 .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../plugin.properties | 28 ------------------ core/org.eclipse.cdt.core.spawner/plugin.xml | 5 ---- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 2 +- pom.xml | 11 +++---- .../.project | 2 +- .../build.properties | 0 .../eclipse_update_120.jpg | Bin .../feature.properties | 2 +- .../feature.xml | 4 +-- .../pom.xml | 2 +- .../.project | 2 +- .../build.properties | 0 .../eclipse_update_120.jpg | Bin .../feature.properties | 2 +- .../feature.xml | 4 +-- .../pom.xml | 2 +- .../feature.xml | 2 +- .../feature.xml | 4 +++ .../org.eclipse.cdt.sdk-feature/feature.xml | 4 --- releng/org.eclipse.cdt.target/.project | 7 +++++ releng/org.eclipse.cdt.target/cdt-e4.4.target | 16 +++++----- 59 files changed, 82 insertions(+), 80 deletions(-) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/.classpath (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/.cvsignore (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/.project (94%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/.settings/org.eclipse.jdt.core.prefs (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/.settings/org.eclipse.jdt.ui.prefs (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/.settings/org.eclipse.pde.api.tools.prefs (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/META-INF/MANIFEST.MF (90%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/about.html (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/build.properties (93%) create mode 100755 core/org.eclipse.cdt.core.native/plugin.properties rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/pom.xml (90%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/core/IProcessInfo.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/core/IProcessList.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/internal/core/spawner/Messages.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/internal/core/spawner/messages.properties (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/WindowsRegistry.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/pty/PTY.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/spawner/Spawner.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java (100%) rename core/{org.eclipse.cdt.core.spawner => org.eclipse.cdt.core.native}/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java (100%) delete mode 100755 core/org.eclipse.cdt.core.spawner/plugin.properties delete mode 100644 core/org.eclipse.cdt.core.spawner/plugin.xml rename releng/{org.eclipse.cdt.spawner-feature => org.eclipse.cdt.native-feature}/.project (84%) rename releng/{org.eclipse.cdt.spawner-feature => org.eclipse.cdt.native-feature}/build.properties (100%) rename releng/{org.eclipse.cdt.spawner-feature => org.eclipse.cdt.native-feature}/eclipse_update_120.jpg (100%) rename releng/{org.eclipse.cdt.spawner-feature => org.eclipse.cdt.native-feature}/feature.properties (96%) rename releng/{org.eclipse.cdt.spawner-feature => org.eclipse.cdt.native-feature}/feature.xml (97%) rename releng/{org.eclipse.cdt.spawner-feature => org.eclipse.cdt.native-feature}/pom.xml (91%) rename releng/{org.eclipse.cdt.spawner.source-feature => org.eclipse.cdt.native.source-feature}/.project (82%) rename releng/{org.eclipse.cdt.spawner.source-feature => org.eclipse.cdt.native.source-feature}/build.properties (100%) rename releng/{org.eclipse.cdt.spawner.source-feature => org.eclipse.cdt.native.source-feature}/eclipse_update_120.jpg (100%) rename releng/{org.eclipse.cdt.spawner.source-feature => org.eclipse.cdt.native.source-feature}/feature.properties (96%) rename releng/{org.eclipse.cdt.spawner.source-feature => org.eclipse.cdt.native.source-feature}/feature.xml (94%) rename releng/{org.eclipse.cdt.spawner.source-feature => org.eclipse.cdt.native.source-feature}/pom.xml (90%) diff --git a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF index df8b1f42fcf..4c7ffed1295 100644 --- a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.aix Bundle-SymbolicName: org.eclipse.cdt.core.aix; singleton:=true Bundle-Version: 5.4.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-PlatformFilter: (osgi.os=aix) diff --git a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF index e7e68426db1..392022587fe 100644 --- a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: %fragmentName.linux.ia64 Bundle-SymbolicName: org.eclipse.cdt.core.linux.ia64;singleton:=true Bundle-Version: 5.2.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF index 2ed85d936f6..bcba2c76725 100644 --- a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: %fragmentName.linux.ppc Bundle-SymbolicName: org.eclipse.cdt.core.linux.ppc;singleton:=true Bundle-Version: 5.2.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=ppc)) diff --git a/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF index f66a7d3ba33..ef0fbdbd5ab 100644 --- a/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %fragmentName.linux.ppc64 Bundle-Version: 5.2.0.qualifier -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Vendor: %providerName Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=ppc64)) diff --git a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF index 386a692d990..c849eb950db 100644 --- a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: %fragmentName.linux.x86 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86;singleton:=true Bundle-Version: 5.3.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86)) diff --git a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF index 718de1d4b6a..e2dab572f61 100644 --- a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: %fragmentName.linux.x86_64 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86_64;singleton:=true Bundle-Version: 5.3.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64)) diff --git a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF index a54b5d531a1..e32e8088c9a 100644 --- a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.linux Bundle-SymbolicName: org.eclipse.cdt.core.linux; singleton:=true Bundle-Version: 5.3.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Eclipse-PlatformFilter: (osgi.os=linux) diff --git a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF index f2b20e81cdd..8eae3f91ce4 100644 --- a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.macosx Bundle-SymbolicName: org.eclipse.cdt.core.macosx; singleton:=true Bundle-Version: 5.3.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-PlatformFilter: (osgi.os=macosx) diff --git a/core/org.eclipse.cdt.core.spawner/.classpath b/core/org.eclipse.cdt.core.native/.classpath similarity index 100% rename from core/org.eclipse.cdt.core.spawner/.classpath rename to core/org.eclipse.cdt.core.native/.classpath diff --git a/core/org.eclipse.cdt.core.spawner/.cvsignore b/core/org.eclipse.cdt.core.native/.cvsignore similarity index 100% rename from core/org.eclipse.cdt.core.spawner/.cvsignore rename to core/org.eclipse.cdt.core.native/.cvsignore diff --git a/core/org.eclipse.cdt.core.spawner/.project b/core/org.eclipse.cdt.core.native/.project similarity index 94% rename from core/org.eclipse.cdt.core.spawner/.project rename to core/org.eclipse.cdt.core.native/.project index ef59af8c889..16748cc2a7f 100644 --- a/core/org.eclipse.cdt.core.spawner/.project +++ b/core/org.eclipse.cdt.core.native/.project @@ -1,6 +1,6 @@ - org.eclipse.cdt.core.spawner + org.eclipse.cdt.core.native diff --git a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.core.prefs rename to core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs diff --git a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.ui.prefs rename to core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.ui.prefs diff --git a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.pde.api.tools.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.pde.api.tools.prefs rename to core/org.eclipse.cdt.core.native/.settings/org.eclipse.pde.api.tools.prefs diff --git a/core/org.eclipse.cdt.core.spawner/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF similarity index 90% rename from core/org.eclipse.cdt.core.spawner/META-INF/MANIFEST.MF rename to core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF index 1326a9839cc..a244d4f5d6b 100644 --- a/core/org.eclipse.cdt.core.spawner/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.cdt.core.spawner; singleton:=true +Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true Bundle-Version: 5.7.0.qualifier Bundle-Activator: org.eclipse.cdt.internal.core.spawner.CSpawnerPlugin Bundle-Vendor: %providerName diff --git a/core/org.eclipse.cdt.core.spawner/about.html b/core/org.eclipse.cdt.core.native/about.html similarity index 100% rename from core/org.eclipse.cdt.core.spawner/about.html rename to core/org.eclipse.cdt.core.native/about.html diff --git a/core/org.eclipse.cdt.core.spawner/build.properties b/core/org.eclipse.cdt.core.native/build.properties similarity index 93% rename from core/org.eclipse.cdt.core.spawner/build.properties rename to core/org.eclipse.cdt.core.native/build.properties index 5af01c019b1..45d3b3aeced 100644 --- a/core/org.eclipse.cdt.core.spawner/build.properties +++ b/core/org.eclipse.cdt.core.native/build.properties @@ -9,8 +9,7 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - [303083] Split out the Spawner ############################################################################### -bin.includes = plugin.xml,\ - plugin.properties,\ +bin.includes = plugin.properties,\ about.html,\ .,\ META-INF/ diff --git a/core/org.eclipse.cdt.core.native/plugin.properties b/core/org.eclipse.cdt.core.native/plugin.properties new file mode 100755 index 00000000000..83aa6b38dc3 --- /dev/null +++ b/core/org.eclipse.cdt.core.native/plugin.properties @@ -0,0 +1,28 @@ +############################################################################### +# Copyright (c) 2003, 2014 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +# Anton Leherbauer (Wind River Systems) +# Martin Oberhuber (Wind River) - [303083] Split out the Spawner +############################################################################### +pluginName=C/C++ Development Tools Core Native Utilities +providerName=Eclipse CDT + +fragmentName.aix = C/C++ Development Tools Core Native Utilities for AIX +fragmentName.linux = C/C++ Development Tools Core Native Utilities for Linux +fragmentName.linux.ia64 = C/C++ Development Tools Core Native Utilities for Linux (ia64) +fragmentName.linux.ppc = C/C++ Development Tools Core Native Utilities for Linux (ppc) +fragmentName.linux.ppc64 = C/C++ Development Tools Core Native Utilities for Linux (ppc64) +fragmentName.linux.x86 = C/C++ Development Tools Core Native Utilities for Linux (x86) +fragmentName.linux.x86_64 = C/C++ Development Tools Core Native Utilities for Linux (x86_64) +fragmentName.qnx = C/C++ Development Tools Core Native Utilities for QNX +fragmentName.solaris = C/C++ Development Tools Core Native Utilities for Solaris +fragmentName.win32 = C/C++ Development Tools Core Native Utilities for Windows +fragmentName.win32.x86 = C/C++ Development Tools Core Native Utilities for Windows (x86) +fragmentName.win32.x86_64 = C/C++ Development Tools Core Native Utilities for Windows (x86_64) +fragmentName.macosx = C/C++ Development Tools Core Native Utilities for MacOS X diff --git a/core/org.eclipse.cdt.core.spawner/pom.xml b/core/org.eclipse.cdt.core.native/pom.xml similarity index 90% rename from core/org.eclipse.cdt.core.spawner/pom.xml rename to core/org.eclipse.cdt.core.native/pom.xml index a7c80e8c25c..162fa17b5e0 100644 --- a/core/org.eclipse.cdt.core.spawner/pom.xml +++ b/core/org.eclipse.cdt.core.native/pom.xml @@ -12,6 +12,6 @@ 5.7.0-SNAPSHOT - org.eclipse.cdt.core.spawner + org.eclipse.cdt.core.native eclipse-plugin diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessInfo.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessInfo.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessInfo.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessInfo.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessList.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessList.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessList.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessList.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/Messages.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/Messages.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/Messages.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/Messages.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/messages.properties b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/messages.properties similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/messages.properties rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/messages.properties diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/WindowsRegistry.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/WindowsRegistry.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/WindowsRegistry.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/WindowsRegistry.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTY.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTY.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTY.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTY.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/Spawner.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/Spawner.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/Spawner.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/Spawner.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java similarity index 100% rename from core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java rename to core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java diff --git a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF index 1efa4d4ea9d..095b95aa734 100644 --- a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.cdt.core.qnx; singleton:=true Bundle-Version: 5.2.0.qualifier Bundle-ClassPath: cdt_qnx.jar Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF index 51f5bdafe43..d9c3782d7c4 100644 --- a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.solaris Bundle-SymbolicName: org.eclipse.cdt.core.solaris; singleton:=true Bundle-Version: 5.3.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-PlatformFilter: (&(osgi.os=solaris)(osgi.arch=sparc)) diff --git a/core/org.eclipse.cdt.core.spawner/plugin.properties b/core/org.eclipse.cdt.core.spawner/plugin.properties deleted file mode 100755 index 1570b3e73e4..00000000000 --- a/core/org.eclipse.cdt.core.spawner/plugin.properties +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2014 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Anton Leherbauer (Wind River Systems) -# Martin Oberhuber (Wind River) - [303083] Split out the Spawner -############################################################################### -pluginName=C/C++ Development Tools Core Spawner -providerName=Eclipse CDT - -fragmentName.aix = C/C++ Development Tools Core for AIX -fragmentName.linux = C/C++ Development Tools Core for Linux -fragmentName.linux.ia64 = C/C++ Development Tools Core for Linux (ia64) -fragmentName.linux.ppc = C/C++ Development Tools Core for Linux (ppc) -fragmentName.linux.ppc64 = C/C++ Development Tools Core for Linux (ppc64) -fragmentName.linux.x86 = C/C++ Development Tools Core for Linux (x86) -fragmentName.linux.x86_64 = C/C++ Development Tools Core for Linux (x86_64) -fragmentName.qnx = C/C++ Development Tools Core for QNX -fragmentName.solaris = C/C++ Development Tools Core for Solaris -fragmentName.win32 = C/C++ Development Tools Core for Windows -fragmentName.win32.x86 = C/C++ Development Tools Core for Windows (x86) -fragmentName.win32.x86_64 = C/C++ Development Tools Core for Windows (x86_64) -fragmentName.macosx = C/C++ Development Tools Core for MacOS X diff --git a/core/org.eclipse.cdt.core.spawner/plugin.xml b/core/org.eclipse.cdt.core.spawner/plugin.xml deleted file mode 100644 index 231f9acc87e..00000000000 --- a/core/org.eclipse.cdt.core.spawner/plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF index 77937da0ea3..5c67778733c 100644 --- a/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.win32.x86 Bundle-SymbolicName: org.eclipse.cdt.core.win32.x86;singleton:=true Bundle-Version: 5.3.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86)) Eclipse-BundleShape: dir diff --git a/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF index 3c5d3bc502f..e001a79fd88 100644 --- a/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName.win32.x86_64 Bundle-SymbolicName: org.eclipse.cdt.core.win32.x86_64;singleton:=true Bundle-Version: 5.3.0.qualifier -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86_64)) Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF index 23c6c93474c..9e7e9f4c028 100644 --- a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.win32 Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true Bundle-Version: 5.4.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-PlatformFilter: (osgi.os=win32) diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 34c052c3b3a..c6eb843c1d2 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -111,7 +111,7 @@ Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core=split;mandatory=org.ec org.eclipse.cdt.utils.som.parser, org.eclipse.cdt.utils.xcoff, org.eclipse.cdt.utils.xcoff.parser -Require-Bundle: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)";visibility:=reexport, org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)", diff --git a/pom.xml b/pom.xml index d31efdd1fae..61af1df530b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,7 @@ - releng/org.eclipse.cdt - core/org.eclipse.cdt.core - core/org.eclipse.cdt.core.spawner + core/org.eclipse.cdt.core.native core/org.eclipse.cdt.core.linux core/org.eclipse.cdt.core.linux.x86 core/org.eclipse.cdt.core.linux.x86_64 @@ -56,6 +54,11 @@ core/org.eclipse.cdt.core.macosx core/org.eclipse.cdt.core.aix core/org.eclipse.cdt.core.solaris + releng/org.eclipse.cdt.native-feature + releng/org.eclipse.cdt.native.source-feature + + releng/org.eclipse.cdt + core/org.eclipse.cdt.core codan/org.eclipse.cdt.codan.core codan/org.eclipse.cdt.codan.ui codan/org.eclipse.cdt.codan.core.cxx @@ -74,8 +77,6 @@ dsf/org.eclipse.cdt.dsf.ui releng/org.eclipse.cdt.platform-feature releng/org.eclipse.cdt.platform.source-feature - releng/org.eclipse.cdt.spawner-feature - releng/org.eclipse.cdt.spawner.source-feature build/org.eclipse.cdt.managedbuilder.gnu.ui build/org.eclipse.cdt.gnu.build-feature diff --git a/releng/org.eclipse.cdt.spawner-feature/.project b/releng/org.eclipse.cdt.native-feature/.project similarity index 84% rename from releng/org.eclipse.cdt.spawner-feature/.project rename to releng/org.eclipse.cdt.native-feature/.project index 615480cbc81..a5e7312a076 100644 --- a/releng/org.eclipse.cdt.spawner-feature/.project +++ b/releng/org.eclipse.cdt.native-feature/.project @@ -1,6 +1,6 @@ - org.eclipse.cdt.spawner-feature + org.eclipse.cdt.native-feature diff --git a/releng/org.eclipse.cdt.spawner-feature/build.properties b/releng/org.eclipse.cdt.native-feature/build.properties similarity index 100% rename from releng/org.eclipse.cdt.spawner-feature/build.properties rename to releng/org.eclipse.cdt.native-feature/build.properties diff --git a/releng/org.eclipse.cdt.spawner-feature/eclipse_update_120.jpg b/releng/org.eclipse.cdt.native-feature/eclipse_update_120.jpg similarity index 100% rename from releng/org.eclipse.cdt.spawner-feature/eclipse_update_120.jpg rename to releng/org.eclipse.cdt.native-feature/eclipse_update_120.jpg diff --git a/releng/org.eclipse.cdt.spawner-feature/feature.properties b/releng/org.eclipse.cdt.native-feature/feature.properties similarity index 96% rename from releng/org.eclipse.cdt.spawner-feature/feature.properties rename to releng/org.eclipse.cdt.native-feature/feature.properties index 218edd443dd..99b92a5f37c 100644 --- a/releng/org.eclipse.cdt.spawner-feature/feature.properties +++ b/releng/org.eclipse.cdt.native-feature/feature.properties @@ -16,7 +16,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=C/C++ Development Platform Spawner +featureName=C/C++ Development Tooling Native Utilities # "providerName" property - name of the company that provides the feature providerName=Eclipse CDT diff --git a/releng/org.eclipse.cdt.spawner-feature/feature.xml b/releng/org.eclipse.cdt.native-feature/feature.xml similarity index 97% rename from releng/org.eclipse.cdt.spawner-feature/feature.xml rename to releng/org.eclipse.cdt.native-feature/feature.xml index c0aeea792eb..531a4049acd 100644 --- a/releng/org.eclipse.cdt.spawner-feature/feature.xml +++ b/releng/org.eclipse.cdt.native-feature/feature.xml @@ -1,6 +1,6 @@ org.eclipse.cdt.features - org.eclipse.cdt.spawner + org.eclipse.cdt.native eclipse-feature diff --git a/releng/org.eclipse.cdt.spawner.source-feature/.project b/releng/org.eclipse.cdt.native.source-feature/.project similarity index 82% rename from releng/org.eclipse.cdt.spawner.source-feature/.project rename to releng/org.eclipse.cdt.native.source-feature/.project index 19d328ca6a3..51da0be829c 100644 --- a/releng/org.eclipse.cdt.spawner.source-feature/.project +++ b/releng/org.eclipse.cdt.native.source-feature/.project @@ -1,6 +1,6 @@ - org.eclipse.cdt.spawner.source-feature + org.eclipse.cdt.native.source-feature diff --git a/releng/org.eclipse.cdt.spawner.source-feature/build.properties b/releng/org.eclipse.cdt.native.source-feature/build.properties similarity index 100% rename from releng/org.eclipse.cdt.spawner.source-feature/build.properties rename to releng/org.eclipse.cdt.native.source-feature/build.properties diff --git a/releng/org.eclipse.cdt.spawner.source-feature/eclipse_update_120.jpg b/releng/org.eclipse.cdt.native.source-feature/eclipse_update_120.jpg similarity index 100% rename from releng/org.eclipse.cdt.spawner.source-feature/eclipse_update_120.jpg rename to releng/org.eclipse.cdt.native.source-feature/eclipse_update_120.jpg diff --git a/releng/org.eclipse.cdt.spawner.source-feature/feature.properties b/releng/org.eclipse.cdt.native.source-feature/feature.properties similarity index 96% rename from releng/org.eclipse.cdt.spawner.source-feature/feature.properties rename to releng/org.eclipse.cdt.native.source-feature/feature.properties index ab87e680e06..ea8ec6c7ff8 100644 --- a/releng/org.eclipse.cdt.spawner.source-feature/feature.properties +++ b/releng/org.eclipse.cdt.native.source-feature/feature.properties @@ -16,7 +16,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=C/C++ Development Platform Spawner Source +featureName=C/C++ Development Tooling Native Utilities Source # "providerName" property - name of the company that provides the feature providerName=Eclipse CDT diff --git a/releng/org.eclipse.cdt.spawner.source-feature/feature.xml b/releng/org.eclipse.cdt.native.source-feature/feature.xml similarity index 94% rename from releng/org.eclipse.cdt.spawner.source-feature/feature.xml rename to releng/org.eclipse.cdt.native.source-feature/feature.xml index d0ec36b8d14..5569405fafe 100644 --- a/releng/org.eclipse.cdt.spawner.source-feature/feature.xml +++ b/releng/org.eclipse.cdt.native.source-feature/feature.xml @@ -1,6 +1,6 @@ org.eclipse.cdt.features - org.eclipse.cdt.spawner.source + org.eclipse.cdt.native.source eclipse-feature diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml index 58251fd22e6..79ca9a70cd2 100644 --- a/releng/org.eclipse.cdt.platform-feature/feature.xml +++ b/releng/org.eclipse.cdt.platform-feature/feature.xml @@ -20,7 +20,7 @@ + + - - diff --git a/releng/org.eclipse.cdt.target/.project b/releng/org.eclipse.cdt.target/.project index 9ce1d2fc6d7..5003445e922 100644 --- a/releng/org.eclipse.cdt.target/.project +++ b/releng/org.eclipse.cdt.target/.project @@ -8,4 +8,11 @@ + + + parent-pom.xml + 1 + PARENT-2-PROJECT_LOC/pom.xml + + diff --git a/releng/org.eclipse.cdt.target/cdt-e4.4.target b/releng/org.eclipse.cdt.target/cdt-e4.4.target index 2a125dd97f7..581d3dd26a5 100644 --- a/releng/org.eclipse.cdt.target/cdt-e4.4.target +++ b/releng/org.eclipse.cdt.target/cdt-e4.4.target @@ -2,16 +2,16 @@ - + - - - - - - + + + + + + @@ -21,7 +21,7 @@ - +