From 8dc4aa15eafaded0812eaf29b11713ed6a57c3f0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:09:01 +0000 Subject: import devtoolset-4-eclipse-cdt-8.8.1-9.4.el7 --- diff --git a/.devtoolset-4-eclipse-cdt.metadata b/.devtoolset-4-eclipse-cdt.metadata index ae9ef16..3887a47 100644 --- a/.devtoolset-4-eclipse-cdt.metadata +++ b/.devtoolset-4-eclipse-cdt.metadata @@ -1 +1 @@ -033d0e1c6626bcd153aaac219f878154d3680fee SOURCES/org.eclipse.cdt-CDT_8_7_0.tar.xz +49e6ef7f27858d8ce1a6f60b5082fa3c073a754a SOURCES/org.eclipse.cdt-CDT_8_8_1.tar.xz diff --git a/.gitignore b/.gitignore index 40d9aa8..e211b8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.eclipse.cdt-CDT_8_7_0.tar.xz +SOURCES/org.eclipse.cdt-CDT_8_8_1.tar.xz diff --git a/SOURCES/eclipse-cdt-config-ini.patch b/SOURCES/eclipse-cdt-config-ini.patch index 117ec6e..d328d09 100644 --- a/SOURCES/eclipse-cdt-config-ini.patch +++ b/SOURCES/eclipse-cdt-config-ini.patch @@ -7,6 +7,6 @@ diff -up ./debug/org.eclipse.cdt.debug.application/scripts/config.ini.fix ./debu osgi.framework=file\:$eclipse.home$/plugins/$osgi.jar$ -osgi.bundles=org.eclipse.cdt.core.linux,org.eclipse.linuxtools.cdt.libhover.library.docs,org.eclipse.cdt.core.native,org.eclipse.core.net,org.eclipse.e4.core.di.extensions,org.eclipse.cdt.debug.ui.memory.floatingpoint,org.eclipse.ui.editors,org.eclipse.equinox.ds@1\:start,org.eclipse.search,org.eclipse.text,org.eclipse.jface.databinding,org.eclipse.cdt.debug.ui.memory.search,org.eclipse.debug.core,org.apache.batik.util,org.eclipse.cdt.debug.ui.memory.memorybrowser,org.eclipse.e4.ui.widgets,org.eclipse.cdt.debug.core,org.eclipse.ui,org.eclipse.cdt.make.core,javax.annotation,org.eclipse.equinox.registry,org.eclipse.cdt.dsf.ui,org.eclipse.cdt.debug.ui.memory.traditional,org.eclipse.cdt.ui,org.eclipse.ui.ide,org.w3c.dom.svg,org.eclipse.jface,org.eclipse.ltk.ui.refactoring,org.w3c.dom.smil,org.eclipse.e4.ui.model.workbench,org.eclipse.equinox.bidi,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.di,org.eclipse.debug.ui,org.eclipse.e4.ui.bindings,org.eclipse.core.contenttype,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.views,org.eclipse.emf.ecore.change,org.eclipse.equinox.app,org.eclipse.e4.ui.services,org.eclipse.ant.core,org.eclipse.equinox.p2.core,org.eclipse.cdt.core,org.eclipse.cdt.debug.application,org.eclipse.cdt.debug.application.doc,org.eclipse.core.resources,org.eclipse.team.ui,org.eclipse.equinox.common@2\:start,org.eclipse.equinox.p2.engine,org.eclipse.cdt.debug.ui,org.eclipse.ui.views.properties.tabbed,org.eclipse.help,org.eclipse.help.ui,org.eclipse.help.base,org.eclipse.help.webapp,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.apache.jasper.glassfish,org.apache.lucene.core,org.apache.lucene.analysis,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.jetty.http,org.eclipse.equinox.http.servlet,org.eclipse.jetty.io,org.eclipse.jetty.server,org.eclipse.jetty.servlet,org.eclipse.jetty.util,org.eclipse.jetty.continuation,org.eclipse.jetty.security,javax.servlet.jsp,javax.el,org.eclipse.core.filesystem,org.eclipse.equinox.event,org.eclipse.cdt.dsf.gdb.ui,org.eclipse.ltk.core.refactoring,org.eclipse.cdt.debug.mi.ui,com.ibm.icu,org.eclipse.swt,org.eclipse.core.filebuffers,org.eclipse.e4.ui.workbench.addons.swt,javax.inject,$swt.plugin$,org.eclipse.core.databinding.observable,org.eclipse.core.jobs,org.eclipse.ui.forms,org.eclipse.e4.core.contexts,javax.xml,org.eclipse.core.variables,org.eclipse.ui.navigator,org.eclipse.e4.core.commands,org.eclipse.core.databinding,org.eclipse.core.commands,org.eclipse.ui.workbench,org.eclipse.equinox.util,org.eclipse.cdt.launch,org.w3c.css.sac,org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.cdt.managedbuilder.core,org.eclipse.jface.text,org.eclipse.cdt.managedbuilder.gnu.ui,org.eclipse.equinox.p2.metadata,org.eclipse.emf.ecore.xmi,org.eclipse.emf.common,org.eclipse.cdt.gdb,org.eclipse.compare.core,$linux.plugin$,org.eclipse.ui.console,org.eclipse.cdt.dsf.gdb,javax.servlet,org.eclipse.equinox.p2.repository,org.eclipse.linuxtools.cdt.libhover.glibc,org.eclipse.equinox.security,org.eclipse.compare,org.eclipse.core.runtime@start,org.eclipse.cdt.dsf,org.eclipse.osgi.services,org.eclipse.e4.ui.workbench3,org.eclipse.equinox.preferences,org.w3c.dom.events,org.eclipse.linuxtools.cdt.libhover,org.eclipse.cdt.debug.mi.core,org.eclipse.ui.navigator.resources,org.eclipse.e4.ui.css.core,org.eclipse.ui.workbench.texteditor,org.eclipse.core.expressions,org.eclipse.e4.ui.css.swt.theme,org.eclipse.core.databinding.property,org.eclipse.emf.ecore,org.eclipse.e4.core.services,org.eclipse.cdt.gdb.ui,org.eclipse.core.runtime.compatibility.registry,org.apache.batik.util.gui,org.eclipse.e4.core.di,$fs.plugin$,org.eclipse.team.core,org.eclipse.cdt.debug.ui.memory.transport,org.eclipse.equinox.p2.metadata.repository,org.eclipse.e4.ui.css.swt,org.apache.batik.css,org.eclipse.e4.emf.xpath,org.apache.commons.jxpath,org.tukaani.xz,org.eclipse.e4.core.di.annotations -osgi.configuration.cascaded=false -+osgi.bundles=org.eclipse.cdt.core.linux,org.eclipse.cdt.core.native,org.eclipse.core.net,org.eclipse.e4.core.di.extensions,org.eclipse.cdt.debug.ui.memory.floatingpoint,org.eclipse.ui.editors,org.eclipse.equinox.ds@1\:start,org.eclipse.search,org.eclipse.text,org.eclipse.jface.databinding,org.eclipse.cdt.debug.ui.memory.search,org.eclipse.debug.core,org.apache.batik.util,org.eclipse.cdt.debug.ui.memory.memorybrowser,org.eclipse.e4.ui.widgets,org.eclipse.cdt.debug.core,org.eclipse.ui,org.eclipse.cdt.make.core,javax.annotation-api,org.eclipse.equinox.registry,org.eclipse.cdt.dsf.ui,org.eclipse.cdt.debug.ui.memory.traditional,org.eclipse.cdt.ui,org.eclipse.ui.ide,org.w3c.dom.svg,org.eclipse.jface,org.eclipse.ltk.ui.refactoring,org.eclipse.e4.ui.model.workbench,org.eclipse.equinox.bidi,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.di,org.eclipse.debug.ui,org.eclipse.e4.ui.bindings,org.eclipse.core.contenttype,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.views,org.eclipse.emf.ecore.change,org.eclipse.equinox.app,org.eclipse.e4.ui.services,org.eclipse.ant.core,org.eclipse.equinox.p2.core,org.eclipse.cdt.core,org.eclipse.cdt.debug.application,org.eclipse.cdt.debug.application.doc,org.eclipse.core.resources,org.eclipse.team.ui,org.eclipse.equinox.common@2\:start,org.eclipse.equinox.p2.engine,org.eclipse.cdt.debug.ui,org.eclipse.ui.views.properties.tabbed,org.eclipse.help,org.eclipse.help.ui,org.eclipse.help.base,org.eclipse.help.webapp,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.glassfish.web.javax.servlet.jsp,org.apache.lucene.core,org.apache.lucene.analysis,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.jetty.http,org.eclipse.equinox.http.servlet,org.eclipse.jetty.io,org.eclipse.jetty.server,org.eclipse.jetty.servlet,org.eclipse.jetty.util,org.eclipse.jetty.continuation,org.eclipse.jetty.security,javax.el-api,javax.servlet.jsp,com.sun.el.javax.el,org.eclipse.core.filesystem,org.eclipse.equinox.event,org.eclipse.cdt.dsf.gdb.ui,org.eclipse.ltk.core.refactoring,org.eclipse.cdt.debug.mi.ui,com.ibm.icu,org.eclipse.swt,org.eclipse.core.filebuffers,org.eclipse.e4.ui.workbench.addons.swt,javax.inject,$swt.plugin$,org.eclipse.core.databinding.observable,org.eclipse.core.jobs,org.eclipse.ui.forms,org.eclipse.e4.core.contexts,javax.xml,org.eclipse.core.variables,org.eclipse.ui.navigator,org.eclipse.e4.core.commands,org.eclipse.core.databinding,org.eclipse.core.commands,org.eclipse.ui.workbench,org.eclipse.equinox.util,org.eclipse.cdt.launch,org.w3c.css.sac,org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.cdt.managedbuilder.core,org.eclipse.jface.text,org.eclipse.cdt.managedbuilder.gnu.ui,org.eclipse.equinox.p2.metadata,org.eclipse.emf.ecore.xmi,org.eclipse.emf.common,org.eclipse.cdt.gdb,org.eclipse.compare.core,$linux.plugin$,org.eclipse.ui.console,org.eclipse.cdt.dsf.gdb,javax.servlet-api,org.eclipse.equinox.p2.repository,org.eclipse.equinox.security,org.eclipse.compare,org.eclipse.core.runtime@start,org.eclipse.cdt.dsf,org.eclipse.osgi.services,org.eclipse.e4.ui.workbench3,org.eclipse.equinox.preferences,org.eclipse.cdt.debug.mi.core,org.eclipse.ui.navigator.resources,org.eclipse.e4.ui.css.core,org.eclipse.ui.workbench.texteditor,org.eclipse.core.expressions,org.eclipse.e4.ui.css.swt.theme,org.eclipse.core.databinding.property,org.eclipse.emf.ecore,org.eclipse.e4.core.services,org.eclipse.cdt.gdb.ui,org.eclipse.core.runtime.compatibility.registry,org.apache.batik.util.gui,org.eclipse.e4.core.di,$fs.plugin$,org.eclipse.team.core,org.eclipse.cdt.debug.ui.memory.transport,org.eclipse.equinox.p2.metadata.repository,org.eclipse.e4.ui.css.swt,org.apache.batik.css,org.eclipse.jdt.core.compiler.batch,org.eclipse.e4.emf.xpath,org.apache.commons.jxpath,org.tukaani.xz,org.eclipse.e4.core.di.annotations ++osgi.bundles=org.eclipse.cdt.core.linux,org.eclipse.cdt.core.native,org.eclipse.core.net,org.eclipse.e4.core.di.extensions,org.eclipse.cdt.debug.ui.memory.floatingpoint,org.eclipse.ui.editors,org.eclipse.equinox.ds@1\:start,org.eclipse.search,org.eclipse.text,org.eclipse.jface.databinding,org.eclipse.cdt.debug.ui.memory.search,org.eclipse.debug.core,org.apache.batik.util,org.eclipse.cdt.debug.ui.memory.memorybrowser,org.eclipse.e4.ui.widgets,org.eclipse.cdt.debug.core,org.eclipse.ui,org.eclipse.cdt.make.core,javax.annotation-api,org.eclipse.equinox.registry,org.eclipse.cdt.dsf.ui,org.eclipse.cdt.debug.ui.memory.traditional,org.eclipse.cdt.ui,org.eclipse.ui.ide,org.w3c.dom.svg,org.eclipse.jface,org.eclipse.ltk.ui.refactoring,org.eclipse.e4.ui.model.workbench,org.eclipse.equinox.bidi,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.di,org.eclipse.debug.ui,org.eclipse.e4.ui.bindings,org.eclipse.core.contenttype,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.views,org.eclipse.emf.ecore.change,org.eclipse.equinox.app,org.eclipse.e4.ui.services,org.eclipse.ant.core,org.eclipse.equinox.p2.core,org.eclipse.cdt.core,org.eclipse.cdt.debug.application,org.eclipse.cdt.debug.application.doc,org.eclipse.core.resources,org.eclipse.team.ui,org.eclipse.equinox.common@2\:start,org.eclipse.equinox.p2.engine,org.eclipse.cdt.debug.ui,org.eclipse.ui.views.properties.tabbed,org.eclipse.help,org.eclipse.help.ui,org.eclipse.help.base,org.eclipse.help.webapp,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.glassfish.web.javax.servlet.jsp,org.apache.lucene.core,org.apache.lucene.analyzers-common,org.apache.lucene.queryparser,org.apache.lucene.queries,org.apache.lucene.sandbox,org.apache.lucene.analyzers-smartcn,org.apache.lucene.spatial,org.apache.lucene.spatial3d,org.apache.lucene.analysis,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.jetty.http,org.eclipse.equinox.http.servlet,org.eclipse.jetty.io,org.eclipse.jetty.server,org.eclipse.jetty.servlet,org.eclipse.jetty.util,org.eclipse.jetty.continuation,org.eclipse.jetty.security,javax.servlet.jsp,com.sun.el.javax.el,org.eclipse.core.filesystem,org.eclipse.equinox.event,org.eclipse.cdt.dsf.gdb.ui,org.eclipse.ltk.core.refactoring,org.eclipse.cdt.debug.mi.ui,com.ibm.icu,org.eclipse.swt,org.eclipse.core.filebuffers,org.eclipse.e4.ui.workbench.addons.swt,javax.inject,$swt.plugin$,org.eclipse.core.databinding.observable,org.eclipse.core.jobs,org.eclipse.ui.forms,org.eclipse.e4.core.contexts,javax.xml,org.eclipse.core.variables,org.eclipse.ui.navigator,org.eclipse.e4.core.commands,org.eclipse.core.databinding,org.eclipse.core.commands,org.eclipse.ui.workbench,org.eclipse.equinox.util,org.eclipse.cdt.launch,org.w3c.css.sac,org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.cdt.managedbuilder.core,org.eclipse.jface.text,org.eclipse.cdt.managedbuilder.gnu.ui,org.eclipse.equinox.p2.metadata,org.eclipse.emf.ecore.xmi,org.eclipse.emf.common,org.eclipse.cdt.gdb,org.eclipse.compare.core,$linux.plugin$,org.eclipse.ui.console,org.eclipse.cdt.dsf.gdb,javax.servlet-api,org.eclipse.equinox.p2.repository,org.eclipse.equinox.security,org.eclipse.compare,org.eclipse.core.runtime@start,org.eclipse.cdt.dsf,org.eclipse.osgi.services,org.eclipse.e4.ui.workbench3,org.eclipse.equinox.preferences,org.eclipse.cdt.debug.mi.core,org.eclipse.ui.navigator.resources,org.eclipse.e4.ui.css.core,org.eclipse.ui.workbench.texteditor,org.eclipse.core.expressions,org.eclipse.e4.ui.css.swt.theme,org.eclipse.core.databinding.property,org.eclipse.emf.ecore,org.eclipse.e4.core.services,org.eclipse.cdt.gdb.ui,org.eclipse.core.runtime.compatibility.registry,org.apache.batik.util.gui,org.eclipse.e4.core.di,$fs.plugin$,org.eclipse.team.core,org.eclipse.cdt.debug.ui.memory.transport,org.eclipse.equinox.p2.metadata.repository,org.eclipse.e4.ui.css.swt,org.apache.batik.css,org.eclipse.jdt.core.compiler.batch,org.eclipse.e4.emf.xpath,org.apache.commons.jxpath,org.tukaani.xz,org.eclipse.e4.core.di.annotations,org.apache.xalan,org.apache.xerces,org.apache.xml.resolver,org.apache.xml.serializer,com.spatial4j,javax.el-api,org.apache.regexp +osgi.configuration.cascaded=true osgi.bundles.defaultStartLevel=4 diff --git a/SOURCES/eclipse-cdt-debug-app-tests.patch b/SOURCES/eclipse-cdt-debug-app-tests.patch new file mode 100644 index 0000000..c06bc3e --- /dev/null +++ b/SOURCES/eclipse-cdt-debug-app-tests.patch @@ -0,0 +1,9 @@ +--- debug/org.eclipse.cdt.debug.application.tests/build.properties.orig 2016-03-31 13:24:12.560823192 +0100 ++++ debug/org.eclipse.cdt.debug.application.tests/build.properties 2016-03-31 13:24:51.766330749 +0100 +@@ -12,5 +12,6 @@ + output.. = bin/ + bin.includes = META-INF/,\ + .,\ ++ projects/,\ + plugin.properties,\ + about.html diff --git a/SOURCES/eclipse-cdt-docker-launch-config.patch b/SOURCES/eclipse-cdt-docker-launch-config.patch new file mode 100644 index 0000000..f793ebf --- /dev/null +++ b/SOURCES/eclipse-cdt-docker-launch-config.patch @@ -0,0 +1,121 @@ +From 8c4c0412ff8371f71e27c28ced9d8c4265e874cc Mon Sep 17 00:00:00 2001 +From: Jeff Johnston +Date: Wed, 6 Apr 2016 17:22:12 -0400 +Subject: [PATCH] Fix Connection drop-down in Run Image Launch configuration + +- drop-down doesn't cause Apply button to activate when + changing Connections from previous connection +- fix setting of default connectionName to avoid NPE +- move setting of connectionURI when user changes drop-down +- add check in isvalid() to verify image exists in connection +- reload images when changing connection and ignore parent images + +Change-Id: I9dbc8828a6e6321e9cd1392d4e8c4dbdf2a954db +--- + .../cdt/internal/docker/launcher/ContainerTab.java | 32 ++++++++++++++----- + .../cdt/internal/docker/launcher/Messages.java | 1 + + .../internal/docker/launcher/messages.properties | 1 + + 3 files changed, 25 insertions(+), 9 deletions(-) + +diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java +index 2cb4f83..85daff9 100644 +--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java ++++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java +@@ -55,7 +55,7 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements + private List directoriesList; + private String imageName; + private String connectionName; +- private String connectionUri; ++ private String connectionUri = ""; + private Boolean keepValue; + private Boolean stdinValue; + private IDockerConnection connection; +@@ -77,11 +77,12 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements + if (connection != null) + connection.removeImageListener(containerTab); + connection = connections[index]; +- if (!connectionName.equals(connection.getName())) ++ connectionUri = connection.getUri(); ++ if (!connectionName.equals(connection.getName())) { + updateLaunchConfigurationDialog(); ++ initializeImageCombo(); ++ } + connectionName = connection.getName(); +- connectionUri = connection.getUri(); +- connection.addImageListener(containerTab); + } + + }; +@@ -321,15 +322,13 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements + defaultIndex = i; + } + if (defaultIndex < 0) { +- setWarningMessage(Messages.bind( +- Messages.ContainerTab_Warning_Connection_Not_Found, +- connectionUri, connections[0].getName())); + defaultIndex = 0; + } + connectionSelector.setItems(connectionNames); + if (connections.length > 0) { + connectionSelector.setText(connectionNames[defaultIndex]); + connection = connections[defaultIndex]; ++ connectionName = connection.getName(); + connectionUri = connection.getUri(); + } + } +@@ -461,11 +460,26 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements + @Override + public boolean isValid(ILaunchConfiguration launchConfig) { + try { +- return launchConfig.getAttribute(ILaunchConstants.ATTR_IMAGE, +- (String) null) != null; ++ String image = launchConfig ++ .getAttribute(ILaunchConstants.ATTR_IMAGE, (String) null); ++ if (image == null) ++ return false; ++ int index = image.lastIndexOf(':'); // $NON-NLS-1$ ++ if (index <= 0) ++ return false; ++ if (connection.hasImage(image.substring(0, index), ++ image.substring(index + 1))) { ++ setWarningMessage(null); ++ return true; ++ } else { ++ setWarningMessage(Messages.bind( ++ Messages.ContainerTab_Warning_Image_Not_Found, ++ image, connections[0].getName())); ++ } + } catch (CoreException e) { + return false; + } ++ return false; + } + + @Override +diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/Messages.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/Messages.java +index e4bf6f5..0ed4662 100644 +--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/Messages.java ++++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/Messages.java +@@ -44,6 +44,7 @@ public class Messages extends NLS { + public static String ContainerTab_Error_No_Connections; + public static String ContainerTab_Error_No_Images; + public static String ContainerTab_Warning_Connection_Not_Found; ++ public static String ContainerTab_Warning_Image_Not_Found; + + public static String Remote_GDB_Debugger_Options; + public static String Gdbserver_Settings_Tab_Name; +diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/messages.properties b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/messages.properties +index 4422fb0..e2cdf46 100644 +--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/messages.properties ++++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/messages.properties +@@ -37,6 +37,7 @@ ContainerTab_Error_Reading_Configuration=Error occurred reading the launch confi + ContainerTab_Error_No_Connections=No Docker Connections exist + ContainerTab_Error_No_Images=No Docker Images exist + ContainerTab_Warning_Connection_Not_Found=Docker Connection: {0} for Launch Configuration not found: defaulting to {1} ++ContainerTab_Warning_Image_Not_Found=Docker Image: {0} is not a valid pulled image in current Connection: {1} + + Remote_GDB_Debugger_Options=Docker Container GDB Debugger Options + Gdbserver_Settings_Tab_Name=Gdbserver Settings +-- +1.7.1 + diff --git a/SOURCES/eclipse-cdt-exit-code.patch b/SOURCES/eclipse-cdt-exit-code.patch deleted file mode 100644 index a1e7d05..0000000 --- a/SOURCES/eclipse-cdt-exit-code.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ddf192339270ae4bdd8990d4df48689140ac08a1 Mon Sep 17 00:00:00 2001 -From: Marc Khouzam -Date: Thu, 17 Sep 2015 10:39:44 -0400 -Subject: [PATCH] Bug 477728 - Exit code not displayed in console for new Run config - -Change-Id: Id1ecdffb5d3a99908f7ac4ee096f2b7f7e3d6440 ---- - -diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java -index 10605ef..9eff261 100644 ---- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java -+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java -@@ -407,6 +407,13 @@ - if (ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE.equals(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN))) - return true; - } -+ if (mode.equals(ILaunchManager.RUN_MODE)) { -+ // We plan on splitting the Run delegate from the Debug one. -+ // For now, to keep backwards-compatibility, we need to keep the same delegate (to keep its id) -+ // However, we can just call the new delegate class -+ new LocalRunLaunchDelegate().preLaunchCheck(config, mode, monitor); -+ } -+ - return super.preLaunchCheck(config, mode, monitor); - } - diff --git a/SOURCES/eclipse-cdt-gdbversion.patch b/SOURCES/eclipse-cdt-gdbversion.patch deleted file mode 100644 index 684cbb4..0000000 --- a/SOURCES/eclipse-cdt-gdbversion.patch +++ /dev/null @@ -1,542 +0,0 @@ -commit 6272b4e523c97678ef29afd8747ba4bdb8f44338 -Author: Marc Khouzam -Date: Wed Sep 2 10:47:27 2015 -0400 - - Bug 476432 - GDB version comparison fails for GDB 7.10 - - Change-Id: I51366e45deabda29a1a5b00166039bad14a146f8 - Signed-off-by: Marc Khouzam - -diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/LaunchUtilsTest.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/LaunchUtilsTest.java -index 7b83d92..44520af 100644 ---- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/LaunchUtilsTest.java -+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/LaunchUtilsTest.java -@@ -1,5 +1,5 @@ - /******************************************************************************* -- * Copyright (c) 2010, 2014 Ericsson and others. -+ * Copyright (c) 2010, 2015 Ericsson 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 -@@ -13,7 +13,9 @@ package org.eclipse.cdt.dsf.gdb.tests; - - import static org.junit.Assert.assertEquals; - -+import java.util.ArrayList; - import java.util.HashMap; -+import java.util.List; - import java.util.Map; - - import org.eclipse.cdt.dsf.gdb.launching.LaunchUtils; -@@ -23,6 +25,18 @@ import org.junit.Test; - - public class LaunchUtilsTest { - -+ private class Versions { -+ private String version1; -+ private String version2; -+ private int expectedResult; -+ -+ public Versions(String v1, String v2, int result) { -+ version1 = v1; -+ version2 = v2; -+ expectedResult = result; -+ } -+ } -+ - @Before - public void init() { - } -@@ -32,8 +46,8 @@ public class LaunchUtilsTest { - } - - @Test -- public void tesetGDBVersionFromText() { -- Map versions = new HashMap(10); -+ public void testGDBVersionFromText() { -+ Map versions = new HashMap<>(10); - - versions.put("GNU gdb 6.8.50.20080730", "6.8.50.20080730"); - versions.put("GNU gdb (GDB) 6.8.50.20080730-cvs", "6.8.50.20080730"); -@@ -61,4 +75,118 @@ public class LaunchUtilsTest { - assertEquals("From \"" + key + "\"", versions.get(key), LaunchUtils.getGDBVersionFromText(key)); - } - } -+ -+ /** -+ * Verify that GDB version comparison is done properly. -+ */ -+ @Test -+ public void testGDBVersionComparison() { -+ List versions = new ArrayList<>(100); -+ -+ versions.add(new Versions("7", "6", 1)); -+ versions.add(new Versions("7", "6.1", 1)); -+ versions.add(new Versions("7", "6.1.1", 1)); -+ versions.add(new Versions("7", "7", 0)); -+ versions.add(new Versions("7", "7.0", 0)); -+ versions.add(new Versions("7", "7.0.0", 0)); -+ versions.add(new Versions("7", "7.1", -1)); -+ versions.add(new Versions("7", "7.1.1", -1)); -+ versions.add(new Versions("7", "8", -1)); -+ versions.add(new Versions("7", "8.0", -1)); -+ versions.add(new Versions("7", "8.1", -1)); -+ versions.add(new Versions("7", "8.1.1", -1)); -+ versions.add(new Versions("7", "10", -1)); -+ versions.add(new Versions("7", "10.0", -1)); -+ versions.add(new Versions("7", "10.1", -1)); -+ versions.add(new Versions("7", "10.1.1", -1)); -+ versions.add(new Versions("7", "70", -1)); -+ versions.add(new Versions("7", "70.1", -1)); -+ versions.add(new Versions("7", "70.1.1", -1)); -+ versions.add(new Versions("7", "72", -1)); -+ versions.add(new Versions("7", "72.1", -1)); -+ versions.add(new Versions("7", "72.1.1", -1)); -+ -+ versions.add(new Versions("7.3", "6", 1)); -+ versions.add(new Versions("7.3", "6.4", 1)); -+ versions.add(new Versions("7.3", "6.4.4", 1)); -+ versions.add(new Versions("7.3", "7", 1)); -+ versions.add(new Versions("7.3", "7.0", 1)); -+ versions.add(new Versions("7.3", "7.3", 0)); -+ versions.add(new Versions("7.3", "7.3.0", 0)); -+ versions.add(new Versions("7.0", "7.0", 0)); -+ versions.add(new Versions("7.3", "7.3.3", -1)); -+ versions.add(new Versions("7.3", "7.30", -1)); -+ versions.add(new Versions("7.3", "7.30.3", -1)); -+ versions.add(new Versions("7.3", "8", -1)); -+ versions.add(new Versions("7.3", "8.0", -1)); -+ versions.add(new Versions("7.3", "8.1", -1)); -+ versions.add(new Versions("7.3", "8.1.1", -1)); -+ versions.add(new Versions("7.3", "8.4", -1)); -+ versions.add(new Versions("7.3", "8.4.4", -1)); -+ versions.add(new Versions("7.3", "10", -1)); -+ versions.add(new Versions("7.3", "10.0", -1)); -+ versions.add(new Versions("7.3", "10.1", -1)); -+ versions.add(new Versions("7.3", "10.1.1", -1)); -+ versions.add(new Versions("7.3", "10.4", -1)); -+ versions.add(new Versions("7.3", "10.4.4", -1)); -+ versions.add(new Versions("7.3", "70", -1)); -+ versions.add(new Versions("7.3", "70.1", -1)); -+ versions.add(new Versions("7.3", "70.1.1", -1)); -+ versions.add(new Versions("7.3", "72", -1)); -+ versions.add(new Versions("7.3", "72.1", -1)); -+ versions.add(new Versions("7.3", "72.1.1", -1)); -+ -+ versions.add(new Versions("7.5.4", "6", 1)); -+ versions.add(new Versions("7.5.4", "6.4", 1)); -+ versions.add(new Versions("7.5.4", "6.4.4", 1)); -+ versions.add(new Versions("7.5.4", "6.5", 1)); -+ versions.add(new Versions("7.5.4", "6.5.4", 1)); -+ versions.add(new Versions("7.5.4", "7", 1)); -+ versions.add(new Versions("7.5.4", "7.0", 1)); -+ versions.add(new Versions("7.5.4", "7.3", 1)); -+ versions.add(new Versions("7.5.4", "7.3.0", 1)); -+ versions.add(new Versions("7.5.4", "7.5", 1)); -+ versions.add(new Versions("7.5.4", "7.5.3", 1)); -+ versions.add(new Versions("7.5.4", "7.5.4", 0)); -+ versions.add(new Versions("7.0.0", "7.0.0", 0)); -+ versions.add(new Versions("7.5.4", "7.7", -1)); -+ versions.add(new Versions("7.5.4", "7.7.6", -1)); -+ versions.add(new Versions("7.5.4", "7.50", -1)); -+ versions.add(new Versions("7.5.4", "7.50.3", -1)); -+ versions.add(new Versions("7.5.4", "7.50.4", -1)); -+ versions.add(new Versions("7.5.4", "8", -1)); -+ versions.add(new Versions("7.5.4", "8.0", -1)); -+ versions.add(new Versions("7.5.4", "8.1", -1)); -+ versions.add(new Versions("7.5.4", "8.1.1", -1)); -+ versions.add(new Versions("7.5.4", "8.5", -1)); -+ versions.add(new Versions("7.5.4", "8.5.4", -1)); -+ versions.add(new Versions("7.5.4", "10", -1)); -+ versions.add(new Versions("7.5.4", "10.0", -1)); -+ versions.add(new Versions("7.5.4", "10.1", -1)); -+ versions.add(new Versions("7.5.4", "10.1.1", -1)); -+ versions.add(new Versions("7.5.4", "10.5", -1)); -+ versions.add(new Versions("7.5.4", "10.5.4", -1)); -+ versions.add(new Versions("7.5.4", "10.7.4", -1)); -+ versions.add(new Versions("7.5.4", "7.10", -1)); -+ versions.add(new Versions("7.5.4", "7.10.1", -1)); -+ versions.add(new Versions("7.5.4", "7.10.5", -1)); -+ versions.add(new Versions("7.5.4", "72", -1)); -+ versions.add(new Versions("7.5.4", "72.1", -1)); -+ versions.add(new Versions("7.5.4", "72.1.1", -1)); -+ -+ versions.add(new Versions("6.8.51", "6.8.50.20080730", 1)); -+ versions.add(new Versions("6.9.4", "6.8.50.20080730", 1)); -+ versions.add(new Versions("6.8.50.20080730", "6.8.50.20080730", 0)); -+ versions.add(new Versions("6.5.4", "6.8.50.20080730", -1)); -+ versions.add(new Versions("6.8.50", "6.8.50.20080730", -1)); -+ -+ for (Versions v : versions) { -+ assertEquals("Comparing " + v.version1 + " and " + v.version2, -+ v.expectedResult, -+ LaunchUtils.compareVersions(v.version1, v.version2)); -+ assertEquals("Comparing " + v.version2 + " and " + v.version1, -+ -v.expectedResult, -+ LaunchUtils.compareVersions(v.version2, v.version1)); -+ } -+ } - } -diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java -index 52ade05..54dfb36 100644 ---- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java -+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java -@@ -364,6 +364,70 @@ public class LaunchUtils { - } - - /** -+ * Compares two version numbers. -+ * Returns -1, 0, or 1 if v1 is less than, equal to, or greater than v2, respectively. -+ * @param v1 The first version -+ * @param v2 The second version -+ * @return -1, 0, or 1 if v1 is less than, equal to, or greater than v2, respectively. -+ * @since 4.8 -+ */ -+ public static int compareVersions(String v1, String v2) { -+ if (v1 == null || v2 == null) throw new NullPointerException(); -+ -+ String[] v1Parts = v1.split("\\."); //$NON-NLS-1$ -+ String[] v2Parts = v2.split("\\."); //$NON-NLS-1$ -+ for (int i = 0; i < v1Parts.length && i < v2Parts.length; i++) { -+ try { -+ int v1PartValue = Integer.parseInt(v1Parts[i]); -+ int v2PartValue = Integer.parseInt(v2Parts[i]); -+ -+ if (v1PartValue > v2PartValue) { -+ return 1; -+ } else if (v1PartValue < v2PartValue) { -+ return -1; -+ } -+ } catch (NumberFormatException e) { -+ // Non-integer part, ignore it -+ continue; -+ } -+ } -+ -+ // If we get here is means the versions are still equal -+ // but there could be extra parts to examine -+ -+ if (v1Parts.length < v2Parts.length) { -+ // v2 has extra parts, which implies v1 is a lower version (e.g., v1 = 7.9 v2 = 7.9.1) -+ // unless each extra part is 0, in which case the two versions are equal (e.g., v1 = 7.9 v2 = 7.9.0) -+ for (int i = v1Parts.length; i < v2Parts.length; i++) { -+ try { -+ if (Integer.parseInt(v2Parts[i]) != 0) { -+ return -1; -+ } -+ } catch (NumberFormatException e) { -+ // Non-integer part, ignore it -+ continue; -+ } -+ } -+ } -+ if (v1Parts.length > v2Parts.length) { -+ // v1 has extra parts, which implies v1 is a higher version (e.g., v1 = 7.9.1 v2 = 7.9) -+ // unless each extra part is 0, in which case the two versions are equal (e.g., v1 = 7.9.0 v2 = 7.9) -+ for (int i = v2Parts.length; i < v1Parts.length; i++) { -+ try { -+ if (Integer.parseInt(v1Parts[i]) != 0) { -+ return 1; -+ } -+ } catch (NumberFormatException e) { -+ // Non-integer part, ignore it -+ continue; -+ } -+ } -+ } -+ -+ return 0; -+ } -+ -+ /** - * Read from the specified stream and return what was read. - * - * @param stream The input stream to be used to read the data. This method will close the stream. -diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactoryNS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactoryNS.java -index 4c6b00d..34e4322 100644 ---- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactoryNS.java -+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactoryNS.java -@@ -1,5 +1,5 @@ - /******************************************************************************* -- * Copyright (c) 2008, 2011 Ericsson and others. -+ * Copyright (c) 2008, 2015 Ericsson 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 -@@ -26,7 +26,7 @@ public class GdbDebugServicesFactoryNS extends GdbDebugServicesFactory { - - @Override - protected IRunControl createRunControlService(DsfSession session) { -- if (GDB_7_2_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBRunControl_7_2_NS(session); - } - return new GDBRunControl_7_0_NS(session); -diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactory.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactory.java -index 1602267..d923259 100644 ---- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactory.java -+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactory.java -@@ -38,19 +38,19 @@ public class GdbExtendedDebugServicesFactory extends GdbDebugServicesFactory { - - @Override - protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) { -- if (GDB_7_7_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_7_VERSION) >= 0) { - return new GDBExtendedControl_7_7(session, config, new GdbExtendedCommandFactory_6_8()); - } -- if (GDB_7_4_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_4_VERSION) >= 0) { - return new GDBControl_7_4(session, config, new GdbExtendedCommandFactory_6_8()); - } -- if (GDB_7_2_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBControl_7_2(session, config, new GdbExtendedCommandFactory_6_8()); - } -- if (GDB_7_0_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBControl_7_0(session, config, new GdbExtendedCommandFactory_6_8()); - } -- if (GDB_6_8_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_6_8_VERSION) >= 0) { - return new GDBControl(session, config, new GdbExtendedCommandFactory_6_8()); - } - return new GDBControl(session, config, new CommandFactory()); -diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactoryNS.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactoryNS.java -index 6e732d8..a4c12aa 100644 ---- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactoryNS.java -+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/service/GdbExtendedDebugServicesFactoryNS.java -@@ -1,5 +1,5 @@ - /******************************************************************************* -- * Copyright (c) 2014 Ericsson and others. -+ * Copyright (c) 2014, 2015 Ericsson 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 -@@ -23,7 +23,7 @@ public class GdbExtendedDebugServicesFactoryNS extends GdbExtendedDebugServicesF - - @Override - protected IRunControl createRunControlService(DsfSession session) { -- if (GDB_7_2_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBRunControl_7_2_NS(session); - } - return new GDBRunControl_7_0_NS(session); -diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java -index b226a1f..208467b 100644 ---- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java -+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java -@@ -1,5 +1,5 @@ - /******************************************************************************* -- * Copyright (c) 2011,2014 Ericsson and others. -+ * Copyright (c) 2011,2015 Ericsson 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 -@@ -30,19 +30,19 @@ public class GdbJtagDebugServicesFactory extends GdbDebugServicesFactory { - - @Override - protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) { -- if (GDB_7_7_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_7_VERSION) >= 0) { - return new GDBJtagControl_7_7(session, config, new CommandFactory_6_8()); - } -- if (GDB_7_4_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_4_VERSION) >= 0) { - return new GDBJtagControl_7_4(session, config, new CommandFactory_6_8()); - } -- if (GDB_7_2_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBJtagControl_7_2(session, config, new CommandFactory_6_8()); - } -- if (GDB_7_0_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBJtagControl_7_0(session, config, new CommandFactory_6_8()); - } -- if (GDB_6_8_VERSION.compareTo(getVersion()) <= 0) { -+ if (compareVersionWith(GDB_6_8_VERSION) >= 0) { - return new GDBJtagControl(session, config, new CommandFactory_6_8()); - } - return new GDBJtagControl(session, config, new CommandFactory()); -diff -up org.eclipse.cdt-CDT_8_7_0/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java.fix org.eclipse.cdt-CDT_8_7_0/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java ---- org.eclipse.cdt-CDT_8_7_0/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java.fix 2015-06-05 22:51:16.000000000 -0400 -+++ org.eclipse.cdt-CDT_8_7_0/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java 2015-10-30 15:59:07.880620100 -0400 -@@ -54,6 +54,7 @@ import org.eclipse.cdt.dsf.mi.service.MI - import org.eclipse.cdt.dsf.mi.service.command.CommandFactory; - import org.eclipse.cdt.dsf.service.DsfSession; - import org.eclipse.debug.core.ILaunchConfiguration; -+import org.eclipse.cdt.dsf.gdb.launching.LaunchUtils; - - public class GdbDebugServicesFactory extends AbstractDsfDebugServicesFactory { - -@@ -127,12 +128,25 @@ public class GdbDebugServicesFactory ext - - return super.createService(clazz, session, optionalArguments); - } -+ -+ /** -+ * Compares the GDB version of the current debug session with the one specified by -+ * parameter 'version'. Returns -1, 0, or 1 if the current version is less than, -+ * equal to, or greater than the specified version, respectively. -+ * @param version The version to compare with -+ * @return -1, 0, or 1 if the current version is less than, equal to, or greater than -+ * the specified version, respectively. -+ * @since 4.8 -+ */ -+ public int compareVersionWith(String version) { -+ return LaunchUtils.compareVersions(getVersion(), version); -+ } - - protected MIBreakpointsManager createBreakpointManagerService(DsfSession session) { -- if (GDB_7_2_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBBreakpointsManager_7_2(session, CDebugCorePlugin.PLUGIN_ID); - } -- if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBBreakpointsManager_7_0(session, CDebugCorePlugin.PLUGIN_ID); - } - return new MIBreakpointsManager(session, CDebugCorePlugin.PLUGIN_ID); -@@ -140,40 +154,40 @@ public class GdbDebugServicesFactory ext - - @Override - protected IBreakpoints createBreakpointService(DsfSession session) { -- if (GDB_7_7_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_7_VERSION) >= 0) { - return new GDBBreakpoints_7_7(session); - } -- if (GDB_7_6_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_6_VERSION) >= 0) { - return new GDBBreakpoints_7_6(session); - } -- if (GDB_7_4_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_4_VERSION) >= 0) { - return new GDBBreakpoints_7_4(session); - } - // This service is available for GDB 7.2 but there is a pre-release of GDB that - // supports the same features and has version of 6.8.50.20090414 -- if (GDB_7_2_VERSION.compareTo(fVersion) <= 0 || "6.8.50.20090414".equals(fVersion)) { //$NON-NLS-1$ -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0 || "6.8.50.20090414".equals(fVersion)) { //$NON-NLS-1$ - return new GDBBreakpoints_7_2(session); - } -- if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBBreakpoints_7_0(session); - } - return new MIBreakpoints(session); - } - - protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) { -- if (GDB_7_7_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_7_VERSION) >= 0) { - return new GDBControl_7_7(session, config, new CommandFactory_6_8()); - } -- if (GDB_7_4_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_4_VERSION) >= 0) { - return new GDBControl_7_4(session, config, new CommandFactory_6_8()); - } -- if (GDB_7_2_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBControl_7_2(session, config, new CommandFactory_6_8()); - } -- if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBControl_7_0(session, config, new CommandFactory_6_8()); - } -- if (GDB_6_8_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_6_8_VERSION) >= 0) { - return new GDBControl(session, config, new CommandFactory_6_8()); - } - return new GDBControl(session, config, new CommandFactory()); -@@ -185,7 +199,7 @@ public class GdbDebugServicesFactory ext - - @Override - protected IDisassembly createDisassemblyService(DsfSession session) { -- if (GDB_7_3_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_3_VERSION) >= 0) { - return new GDBDisassembly_7_3(session); - } - return new MIDisassembly(session); -@@ -203,11 +217,11 @@ public class GdbDebugServicesFactory ext - - @Override - protected IMemory createMemoryService(DsfSession session) { -- if (GDB_7_6_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_6_VERSION) >= 0) { - return new GDBMemory_7_6(session); - } - -- if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBMemory_7_0(session); - } - -@@ -221,22 +235,22 @@ public class GdbDebugServicesFactory ext - - @Override - protected IProcesses createProcessesService(DsfSession session) { -- if (GDB_7_4_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_4_VERSION) >= 0) { - return new GDBProcesses_7_4(session); - } -- if (GDB_7_3_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_3_VERSION) >= 0) { - return new GDBProcesses_7_3(session); - } -- if (GDB_7_2_1_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_2_1_VERSION) >= 0) { - return new GDBProcesses_7_2_1(session); - } -- if (GDB_7_2_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0) { - return new GDBProcesses_7_2(session); - } -- if (GDB_7_1_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_1_VERSION) >= 0) { - return new GDBProcesses_7_1(session); - } -- if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBProcesses_7_0(session); - } - return new GDBProcesses(session); -@@ -249,10 +263,10 @@ public class GdbDebugServicesFactory ext - - @Override - protected IRunControl createRunControlService(DsfSession session) { -- if (GDB_7_6_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_6_VERSION) >= 0) { - return new GDBRunControl_7_6(session); - } -- if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_0_VERSION) >= 0) { - return new GDBRunControl_7_0(session); - } - return new GDBRunControl(session); -@@ -270,12 +284,12 @@ public class GdbDebugServicesFactory ext - - /** @since 3.0 */ - protected IGDBTraceControl createTraceControlService(DsfSession session, ILaunchConfiguration config) { -- if (GDB_7_4_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_4_VERSION) >= 0) { - return new GDBTraceControl_7_4(session, config); - } - // This service is available for GDB 7.2 but there is a pre-release of GDB that - // supports the same features and has version of 6.8.50.20090414 -- if (GDB_7_2_VERSION.compareTo(fVersion) <= 0 || "6.8.50.20090414".equals(fVersion)) { //$NON-NLS-1$ -+ if (compareVersionWith(GDB_7_2_VERSION) >= 0 || "6.8.50.20090414".equals(fVersion)) { //$NON-NLS-1$ - return new GDBTraceControl_7_2(session, config); - } - // There is currently no implementation of the TraceControl service before GDB 7.2 -@@ -287,10 +301,10 @@ public class GdbDebugServicesFactory ext - - /** @since 4.1 */ - protected IGDBHardwareAndOS createHardwareAndOSService(DsfSession session, ILaunchConfiguration config) { -- if (GDB_7_10_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_10_VERSION) >= 0) { - return new GDBHardwareAndOS_7_10(session); - } -- if (GDB_7_5_VERSION.compareTo(fVersion) <= 0) { -+ if (compareVersionWith(GDB_7_5_VERSION) >= 0) { - return new GDBHardwareAndOS_7_5(session); - } - return new GDBHardwareAndOS(session); diff --git a/SOURCES/eclipse-cdt-target.patch b/SOURCES/eclipse-cdt-target.patch deleted file mode 100644 index dd428ff..0000000 --- a/SOURCES/eclipse-cdt-target.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./pom.xml.orig 2014-10-06 16:46:08.449288840 +0100 -+++ ./pom.xml 2014-10-06 16:48:44.255098820 +0100 -@@ -229,8 +229,8 @@ - upc/org.eclipse.cdt.core.parser.upc.tests - xlc/org.eclipse.cdt.core.lrparser.xlc.tests - debug/org.eclipse.cdt.debug.ui.tests ----> - releng/org.eclipse.cdt.target -+--> - releng/org.eclipse.cdt.testing - releng/org.eclipse.cdt.testing-feature - releng/org.eclipse.cdt.testing.repo -@@ -458,14 +458,6 @@ - x86 - - -- -- -- org.eclipse.cdt -- org.eclipse.cdt.target -- ${target-platform} -- 1.0.0 -- -- - - - diff --git a/SOURCES/eclipse-cdt-test-resources.patch b/SOURCES/eclipse-cdt-test-resources.patch deleted file mode 100644 index cd5fe0e..0000000 --- a/SOURCES/eclipse-cdt-test-resources.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up ./core/org.eclipse.cdt.core.tests/build.properties.fix ./core/org.eclipse.cdt.core.tests/build.properties ---- ./core/org.eclipse.cdt.core.tests/build.properties.fix 2015-07-02 15:59:34.707052374 -0400 -+++ ./core/org.eclipse.cdt.core.tests/build.properties 2015-07-02 16:00:05.267565178 -0400 -@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\ - parser/org/eclipse/cdt/internal/pdom/tests/,\ - parser/org/eclipse/cdt/core/parser/tests/ast2/,\ - parser/org/eclipse/cdt/core/parser/tests/scanner/,\ -+ parser/org/eclipse/cdt/core/parser/tests/rewrite/,\ - parser/org/eclipse/cdt/core/parser/tests/prefix/ - - output.. = bin/ -@@ -32,4 +33,4 @@ javacSource=1.7 - javacTarget=1.7 - javacProjectSettings=true - src.includes = about.html -- -\ No newline at end of file -+ -diff -up ./qt/org.eclipse.cdt.qt.tests/build.properties.fix ./qt/org.eclipse.cdt.qt.tests/build.properties ---- ./qt/org.eclipse.cdt.qt.tests/build.properties.fix 2015-07-02 15:53:36.316038589 -0400 -+++ ./qt/org.eclipse.cdt.qt.tests/build.properties 2015-07-02 16:01:41.069172725 -0400 -@@ -1,4 +1,5 @@ - source.. = src/ - output.. = bin/ - bin.includes = META-INF/,\ -+ src/org/eclipse/cdt/qt/tests/,\ - . diff --git a/SOURCES/eclipse-cdt-tycho-build.patch b/SOURCES/eclipse-cdt-tycho-build.patch deleted file mode 100644 index 3254fb9..0000000 --- a/SOURCES/eclipse-cdt-tycho-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up ./pom.xml.orig ./pom.xml ---- ./pom.xml.orig 2014-06-26 17:12:19.158965411 -0400 -+++ ./pom.xml 2014-06-26 17:14:21.166990242 -0400 -@@ -345,46 +345,6 @@ - gtk - x86 - -- -- linux -- gtk -- x86_64 -- -- -- linux -- gtk -- ppc64 -- -- -- win32 -- win32 -- x86 -- -- -- win32 -- win32 -- x86_64 -- -- -- macosx -- cocoa -- x86 -- -- -- macosx -- cocoa -- x86_64 -- -- -- aix -- gtk -- ppc -- -- -- solaris -- gtk -- sparc -- - - - diff --git a/SOURCES/remove-arduino.patch b/SOURCES/remove-arduino.patch deleted file mode 100644 index 6ba960f..0000000 --- a/SOURCES/remove-arduino.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt.repo/category.xml ---- ./releng/org.eclipse.cdt.repo/category.xml.fix 2015-07-09 17:07:26.607902276 -0400 -+++ ./releng/org.eclipse.cdt.repo/category.xml 2015-07-09 17:07:34.230030175 -0400 -@@ -74,6 +74,4 @@ - - - -- -- - diff --git a/SOURCES/remove-remote.patch b/SOURCES/remove-remote.patch index d4ff572..5814aaf 100644 --- a/SOURCES/remove-remote.patch +++ b/SOURCES/remove-remote.patch @@ -1,34 +1,7 @@ -diff -up ./core/org.eclipse.cdt.core.tests/build.properties.fix ./core/org.eclipse.cdt.core.tests/build.properties ---- ./core/org.eclipse.cdt.core.tests/build.properties.fix 2015-07-02 15:59:34.707052374 -0400 -+++ ./core/org.eclipse.cdt.core.tests/build.properties 2015-07-02 16:00:05.267565178 -0400 -@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\ - parser/org/eclipse/cdt/internal/pdom/tests/,\ - parser/org/eclipse/cdt/core/parser/tests/ast2/,\ - parser/org/eclipse/cdt/core/parser/tests/scanner/,\ -+ parser/org/eclipse/cdt/core/parser/tests/rewrite/,\ - parser/org/eclipse/cdt/core/parser/tests/prefix/ - - output.. = bin/ -@@ -32,4 +33,4 @@ javacSource=1.7 - javacTarget=1.7 - javacProjectSettings=true - src.includes = about.html -- -\ No newline at end of file -+ -diff -up ./qt/org.eclipse.cdt.qt.tests/build.properties.fix ./qt/org.eclipse.cdt.qt.tests/build.properties ---- ./qt/org.eclipse.cdt.qt.tests/build.properties.fix 2015-07-02 15:53:36.316038589 -0400 -+++ ./qt/org.eclipse.cdt.qt.tests/build.properties 2015-07-02 16:01:41.069172725 -0400 -@@ -1,4 +1,5 @@ - source.. = src/ - output.. = bin/ - bin.includes = META-INF/,\ -+ src/org/eclipse/cdt/qt/tests/,\ - . -diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt.repo/category.xml ---- ./releng/org.eclipse.cdt.repo/category.xml.fix 2015-07-07 18:44:17.456829932 -0400 -+++ ./releng/org.eclipse.cdt.repo/category.xml 2015-07-07 18:43:23.632926770 -0400 -@@ -44,9 +44,6 @@ +diff -up ./releng/org.eclipse.cdt.repo/category.xml.orig ./releng/org.eclipse.cdt.repo/category.xml +--- ./releng/org.eclipse.cdt.repo/category.xml.orig 2015-09-13 19:40:46.000000000 +0100 ++++ ./releng/org.eclipse.cdt.repo/category.xml 2015-10-07 16:36:15.103331358 +0100 +@@ -45,9 +45,6 @@ @@ -38,7 +11,7 @@ diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt -@@ -59,12 +56,6 @@ +@@ -60,12 +57,6 @@ @@ -51,7 +24,7 @@ diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt -@@ -77,9 +68,6 @@ +@@ -84,16 +69,10 @@ @@ -61,3 +34,10 @@ diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt + + + +- +- +- + diff --git a/SPECS/eclipse-cdt.spec b/SPECS/eclipse-cdt.spec index 706ddf5..1650a76 100644 --- a/SPECS/eclipse-cdt.spec +++ b/SPECS/eclipse-cdt.spec @@ -2,41 +2,47 @@ %{!?scl:%global pkg_name %{name}} %{?java_common_find_provides_and_requires} +%global baserelease 4 %global debug_package %{nil} %global _enable_debug_packages 0 +%global __jar_repack %{nil} + +%if 0%{?fedora} >= 24 +%global droplets droplets +%else +%global droplets dropins +%endif # Change following to 0 to default to no container/remote support when building for # first time in a release...this is needed to build eclipse-linuxtools-docker and -# eclipse.remote which are circular dependencies of eclipse-cdt. Disable both -# first to build eclipse-remote. Later, enable linuxtools when linuxtools is built. -%global _enable_remote 1 -%global _enable_linuxtools 1 +# eclipse.remote which are circular dependencies of eclipse-cdt +%global _enable_container_and_remote_support 1 Epoch: 1 -%define major 8 -%define minor 7 -%define majmin %{major}.%{minor} -%define micro 0 -%define eclipse_base %{_libdir}/eclipse -%define cdt_snapshot org.eclipse.cdt-CDT_8_7_0 +%global major 8 +%global minor 8 +%global majmin %{major}.%{minor} +%global micro 1 +%global eclipse_base %{_libdir}/eclipse +%global cdt_snapshot org.eclipse.cdt-CDT_8_8_1 # All arches line up except i386 -> x86 %ifarch %{ix86} -%define eclipse_arch x86 +%global eclipse_arch x86 %else %ifarch %{arm} -%define eclipse_arch arm +%global eclipse_arch arm %else -%define eclipse_arch %{_arch} +%global eclipse_arch %{_arch} %endif %endif Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: %{?scl_prefix}eclipse-cdt Version: %{majmin}.%{micro} -Release: 8%{?dist} +Release: 9.%{baserelease}%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -50,67 +56,50 @@ Source4: cdtdebug.man # Script to run the tests in Xvnc Source5: %{pkg_name}-runtests.sh -Patch0: %{pkg_name}-tycho-build.patch - # Following adds current directory to autotools tests build.properties -Patch1: %{pkg_name}-autotools-test.patch +Patch0: %{pkg_name}-autotools-test.patch # Following fixes cdtdebug.sh script to get proper platform filesystem plugin -Patch2: %{pkg_name}-cdtdebug.patch +Patch1: %{pkg_name}-cdtdebug.patch # Following fixes Standalone Debugger config.ini file to use bundle symbolic names -Patch3: %{pkg_name}-config-ini.patch +Patch2: %{pkg_name}-config-ini.patch # Following fixes Standalone Debugger README file to refer to /usr/bin/cdtdebug -Patch4: %{pkg_name}-cdtdebug-readme.patch - -# Following fixes jetty reqs in CDT target -Patch5: %{pkg_name}-target.patch +Patch3: %{pkg_name}-cdtdebug-readme.patch # Following removes docker launcher plugins from repo -Patch6: remove-docker.patch +Patch4: remove-docker.patch # Following removes autotools and remote plugins from repo -Patch7: remove-remote.patch - -# Following removes arduino plug-ins/feature -Patch8: remove-arduino.patch +Patch5: remove-remote.patch -# Following adds missing java resources to tests -Patch9: %{pkg_name}-test-resources.patch +# Adds missing test resources +Patch6: eclipse-cdt-debug-app-tests.patch -# Following fixes Bug 1261915 - missing exit code in console -Patch10: %{pkg_name}-exit-code.patch - -# Following also needed to fix Bug 1261915 - missing exit code in console -Patch11: %{pkg_name}-gdbversion.patch +# Fix Connection setting in C/C++ Docker Launch configuration +Patch7: eclipse-cdt-docker-launch-config.patch BuildRequires: %{?scl_prefix}tycho BuildRequires: %{?scl_prefix}tycho-extras -BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0 BuildRequires: %{?scl_prefix}eclipse-license -BuildRequires: %{?scl_prefix_java_common}maven-local BuildRequires: desktop-file-utils BuildRequires: %{?scl_prefix}lpg-java-compat -BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0 -BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0 +BuildRequires: %{?scl_prefix_java_common}google-gson +BuildRequires: %{?scl_prefix}eclipse-platform +BuildRequires: %{?scl_prefix}eclipse-contributor-tools BuildRequires: %{?scl_prefix}eclipse-swtbot BuildRequires: %{?scl_prefix_maven}exec-maven-plugin -%if %{_enable_linuxtools} +%if %{_enable_container_and_remote_support} BuildRequires: %{?scl_prefix}eclipse-linuxtools-docker -%endif -%if %{_enable_remote} -BuildRequires: %{?scl_prefix}eclipse-remote +BuildRequires: %{?scl_prefix}eclipse-remote >= 2.0.0-1 BuildRequires: %{?scl_prefix}eclipse-rse %endif Requires: %{?scl_prefix}gdb make %{?scl_prefix}gcc-c++ -%if %{_enable_remote} +%if %{_enable_container_and_remote_support} Requires: autoconf automake libtool -Requires: %{?scl_prefix}eclipse-remote -%endif -%if %{_enable_linuxtools} -Requires: %{?scl_prefix}eclipse-linuxtools-libhover +Requires: %{?scl_prefix}eclipse-remote >= 2.0.0-1 %endif %description @@ -124,12 +113,12 @@ Requires: %{?scl_prefix}lpg-java-compat %description parsers Optional language-variant parsers for the CDT. -%if %{_enable_linuxtools} == 1 +%if %{_enable_container_and_remote_support} == 1 %package docker -Summary: C/C++ Docker Launcher -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{?scl_prefix}eclipse-linuxtools-docker +Summary: C/C++ Docker Launcher +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}eclipse-linuxtools-docker %description docker Special launcher for CDT to allow launching and debugging C/C++ applications @@ -137,8 +126,15 @@ in Docker Containers. %endif +%package qt +Summary: QT C++ Tools +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description qt +Extensions to support Qt projects and objects in the indexer. + %package tests -Summary: Eclipse C/C++ Development Tools (CDT) Tests +Summary: Eclipse C/C++ Development Tools (CDT) Tests Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-parsers = %{epoch}:%{version}-%{release} Requires: %{?scl_prefix}eclipse-tests @@ -154,9 +150,8 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Source for Eclipse CDT for use within Eclipse. %prep - %{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} - +set -e -x %setup -q -n %{cdt_snapshot} # get desktop info @@ -171,20 +166,22 @@ cp %{SOURCE4} man %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch8 -p0 -%patch9 -p0 -%patch10 -p1 -%patch11 -p1 -%if %{_enable_linuxtools} == 0 -%patch6 -p0 +%patch7 -p1 +%if %{_enable_container_and_remote_support} == 0 +%patch4 -p0 +%patch5 -p0 +%else +# Docker not available on F22 or earlier +%if 0%{?fedora} == 22 +%patch4 -p0 %endif -%if %{_enable_remote} == 0 -%patch7 -p0 %endif +%patch6 -p0 + +TYCHO_ENV="linuxgtk%{eclipse_arch}" +%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" +%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" core/org.eclipse.cdt.core.linux -sed -i -e 's/x86<\/arch>/%{eclipse_arch}<\/arch>/g' pom.xml # Add secondary arch support if we are building there %ifarch %{arm} s390 s390x aarch64 pushd core @@ -194,17 +191,10 @@ sed -i -e 's/\\(x86\\)/(%{eclipse_arch})/g' plugin.properties popd cp -r org.eclipse.cdt.core.linux.x86 org.eclipse.cdt.core.linux.%{eclipse_arch} rm -fr org.eclipse.cdt.core.linux.x86 -pushd org.eclipse.cdt.core.linux -sed -i -e 's/x86<\/arch>/%{eclipse_arch}<\/arch>/g' pom.xml -popd pushd org.eclipse.cdt.core.linux.%{eclipse_arch} sed -i -e 's/x86/%{eclipse_arch}/g' pom.xml -pushd META-INF -sed -i -e 's/x86/%{eclipse_arch}/g' MANIFEST.MF -popd -pushd os/linux -mv x86 %{eclipse_arch} -popd +sed -i -e 's/x86/%{eclipse_arch}/g' META-INF/MANIFEST.MF +mv os/linux/x86 os/linux/%{eclipse_arch} popd popd pushd releng/org.eclipse.cdt.native-feature @@ -219,17 +209,22 @@ pushd core/org.eclipse.cdt.core.linux.%{eclipse_arch} sed -i -e"/Bundle-Localization: plugin/ aEclipse-BundleShape: dir" META-INF/MANIFEST.MF popd +# Don't use the target configuration +%pom_disable_module releng/org.eclipse.cdt.target +%pom_xpath_remove "pom:configuration/pom:target" + +# Don't need to build the repo +%pom_disable_module releng/org.eclipse.cdt.repo + # Disable the jgit provider and force default packaging %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin %pom_remove_plugin org.jacoco:jacoco-maven-plugin # Disable docker, autotools, and remote features if we are building a boot-strap build -%if %{_enable_linuxtools} == 0 +%if %{_enable_container_and_remote_support} == 0 %pom_disable_module launch/org.eclipse.cdt.docker.launcher %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature %pom_disable_module launch/org.eclipse.cdt.docker.launcher.source-feature -%endif -%if %{_enable_remote} == 0 %pom_disable_module build/org.eclipse.cdt.autotools.core %pom_disable_module build/org.eclipse.cdt.autotools.ui %pom_disable_module build/org.eclipse.cdt.autotools.docs @@ -242,14 +237,21 @@ popd %pom_disable_module cross/org.eclipse.cdt.launch.remote-feature %pom_disable_module remote/org.eclipse.cdt.remote.core %pom_disable_module remote/org.eclipse.cdt.remote-feature +%else +# Docker not available on F22 or earlier +%if 0%{?fedora} == 22 +%pom_disable_module launch/org.eclipse.cdt.docker.launcher +%pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature +%pom_disable_module launch/org.eclipse.cdt.docker.launcher.source-feature +%endif %endif -# Remove arduino +# Remove arduino, llvm and p2 installer %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.ui %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino-feature - -# Remove p2 installer +%pom_disable_module llvm/org.eclipse.cdt.managedbuilder.llvm.ui +%pom_disable_module llvm/org.eclipse.cdt.managedbuilder.llvm-feature %pom_disable_module p2/org.eclipse.cdt.p2 %pom_disable_module p2/org.eclipse.cdt.p2-feature @@ -264,14 +266,32 @@ for b in aix macosx solaris win32 ; do %pom_xpath_remove "plugin[@id='org.eclipse.cdt.core.$b.source']" releng/org.eclipse.cdt.native.source-feature/feature.xml done +# Add explicit dep on hamcrest for tests sed -i -e "s|org.junit|org.hamcrest.core, org.junit|g" dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF +# Drop unnecessary dep on log4j +sed -i -e '/log4j/d' build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF + +%mvn_package "::pom::" __noinstall +%mvn_package ::jar:sources: sdk +%mvn_package ":*.source{,.feature}" sdk +%mvn_package :*.sdk sdk +%mvn_package :*.doc.isv sdk +%mvn_package ":*.testsrunner.test" tests +%mvn_package ":*.testsrunner*" +%mvn_package ":*.test{,s}*" tests +%mvn_package :*parser* parsers +%mvn_package ":org.eclipse.cdt.*{xlc,xlupc,bupc}*" parsers +%mvn_package :org.eclipse.cdt.docker* docker +%mvn_package :org.eclipse.cdt.qt* qt +%mvn_package :org.eclipse.cdt* %{?scl:EOF} + %build %{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} - -export JAVA_HOME=%{java_home} +set -e -x +export JAVA_HOME=/usr/lib/jvm/java-1.8.0 # Exclude EquinoxResolver to avoid NPE occuring on arm %ifarch %{arm} @@ -279,246 +299,242 @@ export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/E %endif pushd core/org.eclipse.cdt.core.linux/library -make JAVA_HOME="/usr/lib/jvm/java" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE' +make JAVA_HOME="$JAVA_HOME" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE' popd -xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install - +%mvn_build -j -f -- -Dtycho.local.keepTarget -Dskip-ppc64le %{?scl:EOF} + %install +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +set -e -x +%mvn_install -installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt -testInstallDir=${RPM_BUILD_ROOT}/%{_javadir}/eclipse-cdt-tests/plugins -parsersInstallDir=${installDir}-parsers -%if %{_enable_linuxtools} == 1 -dockerInstallDir=${installDir}-docker -%endif -sdkInstallDir=${installDir}-sdk binInstallDir=${RPM_BUILD_ROOT}/%{_bindir} manInstallDir=${RPM_BUILD_ROOT}/%{_mandir}/man1 -install -d -m755 $installDir -install -d -m755 $parsersInstallDir -install -d -m755 $sdkInstallDir -install -d -m755 $testInstallDir install -d -m755 $binInstallDir install -d -m755 $manInstallDir -%if %{_enable_linuxtools} == 1 -install -d -m755 $dockerInstallDir -%endif -# Unzip contents of the cdt repo, removing all but plugins and features -unzip -q -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \ --d $installDir/eclipse - -#tests -# We need grep to return non-zero status to skip all non eclipse-test-plugins -set +e -for pom in `find . -name pom.xml`; do - grep -q 'eclipse-test-plugin' ${pom} - if [ $? -eq 0 ]; then - testjar=`ls ${pom/pom.xml/}'target/'*.jar | grep -v sources` - cp ${testjar} ${testInstallDir} - fi -done -set -e +cat << EOFSCRIPT > eclipse-runCDTTestBundles +#! /bin/bash +eclipse-runTestBundles %{_javadir}/cdt-tests +EOFSCRIPT -# Unzip CDT Standalone Debug plugin which contains installation scripts for the end-user to use -pushd ${installDir}/eclipse/plugins +install -D -m 755 eclipse-runCDTTestBundles %{buildroot}%{_bindir}/eclipse-runCDTTestBundles + +pushd %{buildroot}%{eclipse_base}/%{droplets}/cdt/eclipse/plugins DEBUGAPPLICATIONVERSION=$(ls . | grep org.eclipse.cdt.debug.application_ | sed 's/org.eclipse.cdt.debug.application_//' |sed 's/.jar//') -unzip org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar -d ./org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION -# Copy the jar file inside the folder to work around issue where standalone application cannot be found without a jar file -mv org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application.jar -# Fix the cdtdebug.sh script to hard-code ECLIPSE_HOME and cdt dropins directory +pushd org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION +# Create the jar file inside the folder to work around issue where standalone application cannot be found without a jar file +jar -cfmv org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar META-INF/MANIFEST.MF * +popd + +# Fix the cdtdebug.sh script to hard-code ECLIPSE_HOME and cdt droplets directory sed -i -e "s,@ECLIPSE_HOME@,%{eclipse_base}," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh -sed -i -e "s,@CDT_DROPINS@,%{eclipse_base}/dropins/cdt/eclipse/plugins," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh +sed -i -e "s,@CDT_DROPINS@,%{eclipse_base}/%{droplets}/cdt/eclipse/plugins," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh # Fix the dropin bundles to have full paths to their respective jar files as Eclipse start-up won't find them otherwise -PLUGIN=$(ls . | grep org.eclipse.cdt.core.linux_) -sed -i -e "s,org.eclipse.cdt.core.linux\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.core_) -sed -i -e "s,org.eclipse.cdt.core\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.ui.memory.floatingpoint_) -sed -i -e "s,org.eclipse.cdt.debug.ui.memory.floatingpoint\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.make.core_) -sed -i -e "s,org.eclipse.cdt.make.core\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.dsf.ui_) -sed -i -e "s,org.eclipse.cdt.dsf.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.ui.memory.traditional_) -sed -i -e "s,org.eclipse.cdt.debug.ui.memory.traditional\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.ui_) -sed -i -e "s,org.eclipse.cdt.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.core_) -sed -i -e "s,org.eclipse.cdt.core\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.application_) -sed -i -e "s,org.eclipse.cdt.debug.application\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN/org.eclipse.cdt.debug.application.jar\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.application.doc_) -sed -i -e "s,org.eclipse.cdt.debug.application.doc\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.dsf.gdb.ui_) -sed -i -e "s,org.eclipse.cdt.dsf.gdb.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.mi.ui_) -sed -i -e "s,org.eclipse.cdt.debug.mi.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.launch_) -sed -i -e "s,org.eclipse.cdt.launch\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.managedbuilder.core_) -sed -i -e "s,org.eclipse.cdt.managedbuilder.core\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.managedbuilder.gnu.ui_) -sed -i -e "s,org.eclipse.cdt.managedbuilder.gnu.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.gdb_) -sed -i -e "s,org.eclipse.cdt.gdb\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.dsf.gdb_) -sed -i -e "s,org.eclipse.cdt.dsf.gdb\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.dsf_) -sed -i -e "s,org.eclipse.cdt.dsf\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.mi.core_) -sed -i -e "s,org.eclipse.cdt.debug.mi.core\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.gdb.ui_) -sed -i -e "s,org.eclipse.cdt.gdb.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.ui.memory.transport_) -sed -i -e "s,org.eclipse.cdt.debug.ui.memory.transport\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.ui.memory.search_) -sed -i -e "s,org.eclipse.cdt.debug.ui.memory.search\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.ui.memory.memorybrowser_) -sed -i -e "s,org.eclipse.cdt.debug.ui.memory.memorybrowser\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.ui_) -sed -i -e "s,org.eclipse.cdt.debug.ui\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.debug.core_) -sed -i -e "s,org.eclipse.cdt.debug.core\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep org.eclipse.cdt.core.native_) -sed -i -e "s,org.eclipse.cdt.core.native\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -PLUGIN=$(ls . | grep 'org.eclipse.cdt.core.linux\..*.jar' | grep -v source) -sed -i -e "s,\$linux.plugin\$\,,file\\\\:%{eclipse_base}/dropins/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini -sed -i -e "s,cp config.ini,cp %{eclipse_base}/dropins/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh -sed -i -e "s,cp dev.properties,cp %{eclipse_base}/dropins/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/dev.properties," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh -cp org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh $binInstallDir/cdtdebug + +for PLUGIN in \ +$(ls . | grep org.eclipse.cdt.core.linux_) \ +$(ls . | grep org.eclipse.cdt.core_) \ +$(ls . | grep org.eclipse.cdt.debug.ui.memory.floatingpoint_) \ +$(ls . | grep org.eclipse.cdt.make.core_) \ +$(ls . | grep org.eclipse.cdt.dsf.ui_) \ +$(ls . | grep org.eclipse.cdt.debug.ui.memory.traditional_) \ +$(ls . | grep org.eclipse.cdt.ui_) \ +$(ls . | grep org.eclipse.cdt.core_) \ +$(ls . | grep org.eclipse.cdt.debug.application.doc_) \ +$(ls . | grep org.eclipse.cdt.dsf.gdb.ui_) \ +$(ls . | grep org.eclipse.cdt.debug.mi.ui_) \ +$(ls . | grep org.eclipse.cdt.launch_) \ +$(ls . | grep org.eclipse.cdt.managedbuilder.core_) \ +$(ls . | grep org.eclipse.cdt.managedbuilder.gnu.ui_) \ +$(ls . | grep org.eclipse.cdt.gdb_) \ +$(ls . | grep org.eclipse.cdt.dsf.gdb_) \ +$(ls . | grep org.eclipse.cdt.dsf_) \ +$(ls . | grep org.eclipse.cdt.debug.mi.core_) \ +$(ls . | grep org.eclipse.cdt.gdb.ui_) \ +$(ls . | grep org.eclipse.cdt.debug.ui.memory.transport_) \ +$(ls . | grep org.eclipse.cdt.debug.ui.memory.search_) \ +$(ls . | grep org.eclipse.cdt.debug.ui.memory.memorybrowser_) \ +$(ls . | grep org.eclipse.cdt.debug.ui_) \ +$(ls . | grep org.eclipse.cdt.debug.core_) \ +$(ls . | grep org.eclipse.cdt.core.native_) \ +$(ls . | grep 'org.eclipse.cdt.core.linux\..*' | grep -v source); +do + sed -i -e "s,${PLUGIN%_*}\,,file\\\\:%{eclipse_base}/%{droplets}/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini +done + +sed -i -e "s,org.eclipse.cdt.debug.application\,,file\\\\:%{eclipse_base}/%{droplets}/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini + +sed -i -e "s,cp config.ini,cp %{eclipse_base}/%{droplets}/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh +sed -i -e "s,cp dev.properties,cp %{eclipse_base}/%{droplets}/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/dev.properties," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh +install -D -m 755 org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh $binInstallDir/cdtdebug popd +echo %{eclipse_base}/%{droplets}/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar >> .mfiles + %{?scl: sed -i -e 's/Exec=cdtdebug/Exec=scl enable %{scl_name} cdtdebug/g' desktop/eclipse-cdt.desktop} %{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktop/eclipse-cdt.desktop} %{?scl: sed -i -e 's,Name=Eclipse C/C++ Debugger,Name=DTS Eclipse C/C++ Debugger,g' desktop/eclipse-cdt.desktop} -install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/%{_root_datadir}/applications/%{?scl_prefix}eclipse-cdt.desktop -desktop-file-validate $RPM_BUILD_ROOT/%{_root_datadir}/applications/%{?scl_prefix}eclipse-cdt.desktop +install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop +desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop # man page cp man/cdtdebug.man $manInstallDir/cdtdebug.1 +%{?scl:EOF} -# Unpack all existing feature jars -for x in $installDir/eclipse/features/*.jar; do - dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'` - mkdir -p $dirname - unzip -q $x -d $dirname - rm $x -done - -# Remove lpgjavaruntime jar file -rm -rf $installDir/eclipse/plugins/net.sourceforge.* - -# Remove llvm-support features/plugins -rm -rf $installDir/eclipse/plugins/*llvm* -rm -rf $installDir/eclipse/features/*llvm* -rm -rf $testInstallDir/*llvm* - -# Move upc, xlc, and lrparser plugins/features to parsers install area. -mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins -mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features -mv $installDir/eclipse/plugins/*xlc* $parsersInstallDir/eclipse/plugins -mv $installDir/eclipse/features/*lrparser* $parsersInstallDir/eclipse/features -mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins -mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features -mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins -pushd $parsersInstallDir/eclipse/plugins -ln -s %{_javadir}/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar -popd - -%if %{_enable_linuxtools} == 1 -# Move docker launcher plugins/features to docker install area. -mkdir -p $dockerInstallDir/eclipse/features $dockerInstallDir/eclipse/plugins -mv $installDir/eclipse/features/*docker* $dockerInstallDir/eclipse/features -mv $installDir/eclipse/plugins/*docker* $dockerInstallDir/eclipse/plugins -%endif - -mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins -mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features -mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins -mv $installDir/eclipse/plugins/org.eclipse.cdt.doc.isv_* $sdkInstallDir/eclipse/plugins -mv $installDir/eclipse/features/*sdk* $sdkInstallDir/eclipse/features -mv $installDir/eclipse/plugins/*sdk* $sdkInstallDir/eclipse/plugins - -rm -rf $installDir/eclipse/features/org.eclipse.cdt.master_* -rm -rf $installDir/eclipse/plugins/org.eclipse.ant.optional.junit_* -rm -rf $installDir/eclipse/plugins/org.eclipse.test_* - -# remove repo stuff that shouldn't be in dropins folder -rm -rf $installDir/eclipse/artifacts.jar -rm -rf $installDir/eclipse/content.jar -rm -rf $installDir/eclipse/binary -%files -%{eclipse_base}/dropins/cdt +%files -f .mfiles %{_bindir}/cdtdebug -%{_root_datadir}/applications/* +/usr/share/applications/* %{_mandir}/man1/cdtdebug.1* %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html -%files sdk -%{eclipse_base}/dropins/cdt-sdk +%files sdk -f .mfiles-sdk +%doc releng/org.eclipse.cdt.releng/epl-v10.html +%doc releng/org.eclipse.cdt.releng/notice.html + +%files parsers -f .mfiles-parsers %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html -%files parsers -%{eclipse_base}/dropins/cdt-parsers +%files tests -f .mfiles-tests +%{_bindir}/eclipse-runCDTTestBundles %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html -%files tests -%{_javadir}/eclipse-cdt-tests +%files qt -f .mfiles-qt %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html -%if %{_enable_linuxtools} == 1 -%files docker -%{eclipse_base}/dropins/cdt-docker +%if %{_enable_container_and_remote_support} == 1 + +%files docker -f .mfiles-docker %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html %endif %changelog -* Fri Oct 30 2015 Jeff Johnston - 1:8.7.0-8 -- Fix additional regression in exit not being shown in console on debug -- Resolves: #rhbz1261915 +* Fri Apr 15 2016 Jeff Johnston - 1:8.8.1-9.4 +- Update previous patch to fix issue with image lists not being updated +- Resolves: #rhbz1279800 -* Thu Sep 17 2015 Jeff Johnston - 1:8.7.0-7 -- Fix regression in exit code being shown in console on run -- Resolves: #rhbz1261915 +* Wed Apr 06 2016 Jeff Johnston - 1:8.8.1-9.3 +- Fix Connection setting in C/C++ Docker launch configuration +- Resolves: #rhbz1279800 -* Wed Aug 05 2015 Jeff Johnston - 1:8.7.0-6 -- Change stand-alone debugger config.ini to use javax.annotation-api - and go back to using org.eclipse.lucene.analysis -- Resolves: #rhbz1247471 +* Thu Mar 31 2016 Mat Booth - 1:8.8.1-9.2 +- Fix missing resources for debug app tests -* Thu Jul 30 2015 Jeff Johnston - 1:8.7.0-5 -- Add missing test resources -- Resolves: #rhbz1236035 +* Tue Mar 29 2016 Mat Booth - 1:8.8.1-9.1 +- Import latest from Fedora -* Tue Jul 28 2015 Jeff Johnston - 1:8.7.0-4 -- Fix stand-alone debugger config.ini to include javax.el-api +* Thu Mar 10 2016 Mat Booth - 1:8.8.1-9 +- Make standalone debugger work with all versions of lucene -* Mon Jul 20 2015 Mat Booth - 1:8.7.0-3.1 -- Apply patches cleanly to avoid shipping leftovers +* Thu Mar 10 2016 Mat Booth - 1:8.8.1-8 +- Use global instead of define +- Move more bundles into SDK that should be there +- Remove forbidden SCL macros +- Minor other changes to make it easier to auto-SCLise -* Thu Jul 16 2015 Jeff Johnston 1:8.7.0-3 -- Enable linuxtools so full CDT build occurs. +* Mon Feb 29 2016 Alexander Kurtakov 1:8.8.1-7 +- Update to upstream 8.8.1 release. -* Wed Jul 15 2015 Jeff Johnston 1:8.7.0-2 -- Break up bootstrap into two phases -- Enable remote phase so eclipse-linuxtools can build -- Remove neko and xerces stuff which isn't needed here any more +* Mon Feb 29 2016 Mat Booth - 1:8.8.0-7.2 +- Rebuild 2016-02-29 -* Thu Jul 09 2015 Jeff Johnston 1:8.7.0-1 -- Initial CDT 8.7.0 offering (Mars SR0 release) -- Use macro to control docker and remote support to allow - boot-strapping CDT for use by eclipse-remote and - eclipse-linuxtools-docker packages +* Tue Feb 16 2016 Mat Booth - 1:8.8.0-7.1 +- Import latest from Fedora + +* Tue Feb 09 2016 Roland Grunberg - 1:8.8.0-7 +- Update to use proper xmvn provided macros. +- Fix CDT GDB Standalone Debugger. + +* Thu Feb 04 2016 Roland Grunberg - 1:8.8.0-6 +- Add symbolic links for google-gson and apache-commons-compress in arduino. +- Resolves: rhbz#1302131. + +* Wed Feb 03 2016 Fedora Release Engineering - 1:8.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 23 2015 Alexander Kurtakov 1:8.8.0-4 +- Drop old patches and organize them. + +* Thu Oct 08 2015 Mat Booth - 1:8.8.0-3 +- Perform full build +- Exclude docker plugins on Fedora < 23 + +* Thu Oct 8 2015 Alexander Kurtakov 1:8.8.0-2 +- Split qt feature into subpackage with proper deps to qml, qtquick, qmake so generated project works. +- Disable brp-repack script as it just slows down the build. + +* Wed Oct 07 2015 Mat Booth - 1:8.8.0-1 +- Update to Mars.1 release +- Bootstrap mode for secondary arches + +* Mon Sep 21 2015 Jeff Johnston - 1:8.7.0-10 +- Fix missing test resources +- Fix missing exit code in console + +* Tue Aug 04 2015 Roland Grunberg - 1:8.7.0-9 +- Add script for automatically launching CDT Test Bundles. + +* Fri Jul 10 2015 Mat Booth - 1:8.7.0-8 +- No longer R/BR nekohtml + +* Tue Jul 07 2015 Jeff Johnston 1:8.7.0-7 +- Change macro controlling docker support to also control remote support - Disable autotools and remote plug-ins/features if macro is 0 -- Make initial build a non-full-build with macro set to 0 +- This allows boot-strapping CDT for use by eclipse-remote and + eclipse-linuxtools-docker packages +* Thu Jul 02 2015 Jeff Johnston 1:8.7.0-6 +- Add missing src file test resources referred to by test cases. + +* Mon Jun 29 2015 Jeff Johnston 1:8.7.0-5 +- Fix for bug 1235942. +- Fix up some dependencies in the config.ini file that have changed their + OSGI reference in rawhide. + +* Fri Jun 26 2015 Jeff Johnston 1:8.7.0-4 +- Fix for bug 1235942. +- Add back patch3 which is needed to set up the config.ini file properly. +- Also add some new dependencies to the config.ini file that were added + as part of CDT 8.7. + +* Fri Jun 26 2015 Jeff Johnston 1:8.7.0-3 +- Fix for bug 1235945. +- Move Docker launcher plug-ins to own package: eclipse-cdt-docker. + +* Thu Jun 25 2015 Jeff Johnston 1:8.7.0-2 +- Use simpler macro to control container support and fix macro tests. + +* Tue Jun 23 2015 Jeff Johnston 1:8.7.0-1 +- Switch to use CDT_8_7 tag. +- Add with conditional to remove container support or add it in. + +* Mon Jun 15 2015 Alexander Kurtakov 1:8.7.0-0.6.gitd13a53c +- Fix build with Tycho 0.23. +- Update to newer snapshot. +- Drop rse R as it's autogen. + +* Thu Jun 4 2015 Alexander Kurtakov 1:8.7.0-0.5.git6c36f7f +- Disable jacoco plugin and remove useless directory from the build. + +* Thu Jun 4 2015 Alexander Kurtakov 1:8.7.0-0.4.git6c36f7f +- Add arduino subpackage and enable building arduino plugins. + +* Wed Jun 3 2015 Alexander Kurtakov 1:8.7.0-0.3.git6c36f7f +- Drop Linux Tools libhover compilation and Recommend eclipse-linuxtools-libhover instead. + +* Wed Jun 3 2015 Alexander Kurtakov 1:8.7.0-0.2.git6c36f7f +- Newer snapshot. +- Enable remote feature now that deps are available. +- Drop Group tags. + +* Mon Jun 1 2015 Alexander Kurtakov 1:8.7.0-0.1.git136c034 +- Update to 8.7.0 pre-release.