From 908a9c8e7a80ba4351685f9bbb12fdc60aef7573 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 26 2017 12:16:50 +0000 Subject: Allow boostrap modes to build against launchbar and tm-terminal when those packages are also bootstrapped Attempt to fix standalone debugger --- diff --git a/.gitignore b/.gitignore index 66dcf6c..9a3e47a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ ammacros-1.9.6.xml /org.eclipse.tools.templates-6f34dc60b008d8cdcd7848c76b13b0f2ef8c6134.tar.xz /org.eclipse.tools.templates-b6038873b1cd4d7f0a86a98deb2b6e3360e75f14.tar.xz /org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac.tar.xz +/org.eclipse.cdt-bfe45e8c74f297fbfaa89e9fc33527891207108e.tar.xz diff --git a/bootstrap.patch b/bootstrap.patch deleted file mode 100644 index a2610a6..0000000 --- a/bootstrap.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF.orig 2016-07-29 10:15:25.158058050 +0100 -+++ dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF 2016-07-29 10:16:35.506239397 +0100 -@@ -14,8 +14,7 @@ - org.eclipse.core.variables, - org.eclipse.cdt.launch;bundle-version="6.1.0", - org.eclipse.cdt.gdb;bundle-version="7.0.0", -- org.eclipse.core.resources, -- org.eclipse.launchbar.core;bundle-version="2.0.0";visibility:=reexport -+ org.eclipse.core.resources - Bundle-ActivationPolicy: lazy - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - Export-Package: org.eclipse.cdt.dsf.gdb, ---- dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java.orig 2016-10-07 17:02:44.516651194 +0100 -+++ dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java 2016-10-07 17:03:32.769159413 +0100 -@@ -98,14 +98,12 @@ - import org.eclipse.debug.core.model.IDisconnect; - import org.eclipse.debug.core.model.ISourceLocator; - import org.eclipse.debug.core.model.ITerminate; --import org.eclipse.launchbar.core.target.ILaunchTarget; --import org.eclipse.launchbar.core.target.launch.ITargetedLaunch; - - /** - * The only object in the model that implements the traditional interfaces. - */ - @ThreadSafe --public class GdbLaunch extends DsfLaunch implements ITerminate, IDisconnect, ITracedLaunch, ITargetedLaunch { -+public class GdbLaunch extends DsfLaunch implements ITerminate, IDisconnect, ITracedLaunch { - private DefaultDsfExecutor fExecutor; - private DsfSession fSession; - private DsfServicesTracker fTracker; -@@ -113,7 +111,6 @@ - private boolean fShutDown = false; - private IMemoryBlockRetrievalManager fMemRetrievalManager; - private IDsfDebugServicesFactory fServiceFactory; -- private ILaunchTarget fLaunchTarget; - - private String fGdbVersion; - -@@ -964,25 +961,4 @@ - IGDBLaunchConfigurationConstants.DEBUGGER_UPDATE_THREADLIST_ON_SUSPEND_DEFAULT); - } - -- /** -- * Set the launch target -- * -- * @param launchTarget -- * the launch target -- * @since 5.0 -- */ -- public void setLaunchTarget(ILaunchTarget launchTarget) { -- this.fLaunchTarget = launchTarget; -- } -- -- /** -- * Return the launch target -- * -- * @since 5.0 -- */ -- @Override -- public ILaunchTarget getLaunchTarget() { -- return fLaunchTarget; -- } -- - } diff --git a/eclipse-cdt-cdtdebug.patch b/eclipse-cdt-cdtdebug.patch index 9a8052f..4f18e8b 100644 --- a/eclipse-cdt-cdtdebug.patch +++ b/eclipse-cdt-cdtdebug.patch @@ -1,5 +1,5 @@ ---- debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.orig 2016-11-28 00:02:54.000000000 +0000 -+++ debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh 2017-01-24 13:38:38.428205883 +0000 +--- debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.orig 2017-06-18 14:05:04.584935592 +0100 ++++ debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh 2017-06-18 14:12:18.867312248 +0100 @@ -74,12 +74,22 @@ done @@ -25,30 +25,8 @@ +ECLIPSE_HOME=$(dirname $(readlink -f $(which eclipse))) ECLIPSE_EXEC="$ECLIPSE_HOME/eclipse" - # On Mac OS X, the application layout is a bit different (Eclipse.app) -@@ -88,18 +98,30 @@ - esac - - PLUGIN_DIR="$ECLIPSE_HOME/plugins" -+DROPLET_NOARCH="$(cd $ECLIPSE_HOME/../../share/eclipse/droplets && pwd)" -+DROPLET_ARCHFUL="$ECLIPSE_HOME/droplets" - OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -exec basename {} \; | tail -1` --SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*.jar' -not -name '*source*' -exec basename {} \; | tail -1` -+LIBHOVER_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.linuxtools.cdt.libhover_*.jar' -not -name '*source*'` -+LIBHOVER_LIB_DOCS_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.linuxtools.cdt.libhover.library.docs_*.jar' -not -name '*source*'` -+LIBHOVER_GLIBC_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.linuxtools.cdt.libhover.glibc_*.jar' -not -name '*source*'` -+LAUNCHBAR_CORE_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.launchbar.core_*.jar' -not -name '*source*'` -+LAUNCHBAR_UI_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.launchbar.ui_*.jar' -not -name '*source*'` -+TERM_CONTROL_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.tm.terminal.control_*.jar' -not -name '*source*'` -+UI_VIEWS_LOG_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.ui.views.log_*.jar' -not -name '*source*'` -+SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*' -not -name '*source*' -exec basename {} \; | tail -1` - SWT_PLUGIN=`echo $SWT_JAR | sed -e "s/_[0-9]*\..*.jar//"` --FS_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.core.filesystem.*.jar' -not -name '*source*' -exec basename {} \; | grep -v java7 | tail -1` -+FS_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.core.filesystem.*' -not -name '*source*' -exec basename {} \; | grep -v java7 | tail -1` - FS_PLUGIN=`echo $FS_JAR | sed -e "s/_[0-9]*\..*.jar//"` --LINUX_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | tail -1` -+LINUX_JAR=`find $DROPLET_ARCHFUL -maxdepth 5 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | tail -1` - LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"` + # On macOS, the application layout is a bit different (Eclipse.app) +@@ -92,7 +102,8 @@ # Run eclipse with the Stand-alone Debugger product specified "$ECLIPSE_EXEC" -clean -product org.eclipse.cdt.debug.application.product \ @@ -57,8 +35,5 @@ + -application org.eclipse.cdt.debug.application.app \ + -data "$HOME/$workspace" -configuration file\:"$HOME/$configdir" \ + -dev file\:"$HOME/$configdir/dev.properties" $options \ - -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \ -+ -Dlaunchbar.core=$LAUNCHBAR_CORE_JAR -Dlaunchbar.ui=$LAUNCHBAR_UI_JAR -Dui.views.log=$UI_VIEWS_LOG_JAR -Dterm.control=$TERM_CONTROL_JAR \ -+ -Dlibhover=$LIBHOVER_JAR -Dlibhover.lib.docs=$LIBHOVER_LIB_DOCS_JAR -Dlibhover.glibc=$LIBHOVER_GLIBC_JAR \ - -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home="$ECLIPSE_HOME" + -vmargs -Dosgi.jar=$OSGI_JAR -Declipse.home="$ECLIPSE_HOME" diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch index 8b74589..00f3713 100644 --- a/eclipse-cdt-config-ini.patch +++ b/eclipse-cdt-config-ini.patch @@ -1,12 +1,101 @@ -diff -up ./debug/org.eclipse.cdt.debug.application/scripts/config.ini.fix ./debug/org.eclipse.cdt.debug.application/scripts/config.ini ---- ./debug/org.eclipse.cdt.debug.application/scripts/config.ini.fix 2017-01-16 16:22:24.557884614 -0500 -+++ ./debug/org.eclipse.cdt.debug.application/scripts/config.ini 2017-01-16 16:35:17.680396251 -0500 -@@ -2,6 +2,6 @@ - #Fri Dec 20 17:38:27 EST 2013 - osgi.install.area=file\:$eclipse.home$ - 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.ui.views.log,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,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.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.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,com.google.gson,org.eclipse.launchbar.core,org.eclipse.launchbar.ui,org.eclipse.tools.templates.core,org.eclipse.tools.templates.ui,org.eclipse.tm.terminal.control --osgi.configuration.cascaded=false -+osgi.bundles=org.eclipse.cdt.core.linux,$libhover.lib.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,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,$ui.views.log$,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.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.analyzers-common,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,javax.el-api,org.eclipse.core.filesystem,org.eclipse.equinox.event,org.eclipse.cdt.dsf.gdb.ui,org.eclipse.ltk.core.refactoring,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,$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,$libhover$,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.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,com.google.gson,$launchbar.core$,$launchbar.ui$,org.eclipse.tools.templates.core,org.eclipse.tools.templates.ui,$term.control$,org.apache.regexp,com.spatial4j -+osgi.configuration.cascaded=true - osgi.bundles.defaultStartLevel=4 +--- ./debug/org.eclipse.cdt.debug.application.product/debug.product.orig 2017-06-26 10:38:53.179468917 +0100 ++++ ./debug/org.eclipse.cdt.debug.application.product/debug.product 2017-06-26 10:52:50.985256677 +0100 +@@ -176,12 +176,11 @@ + + + +- +- ++ ++ + +- ++ + +- + + + +@@ -191,20 +190,15 @@ + + + +- ++ + + + + + + +- + +- + +- +- +- + + + +@@ -235,17 +229,10 @@ + + + +- + +- +- +- + + +- + +- +- + + + +@@ -270,7 +257,6 @@ + + + +- + + + +@@ -298,11 +284,7 @@ + + + +- +- + +- +- + + + +@@ -349,11 +331,7 @@ + + + +- +- + +- +- + + + +@@ -381,8 +359,9 @@ + + + +- + ++ ++ + + + diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index e9253f6..c3fa639 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -1,13 +1,19 @@ -# 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 +%global _eclipsedir %{_prefix}/lib/eclipse + +# Change following to 0 to default to no container/remote support when building +# for the first time in a buildroot -- this is needed to build: +# * eclipse-linuxtools-docker +# * eclipse-remote +# * eclipse-tm-terminal +# * eclipse-launchbar +# which all make circular dependencies on cdt %global _enable_container_and_remote_support 1 %global _enable_container_support 1 Epoch: 1 %global eclipse_base %{_datadir}/eclipse -%global cdt_snapshot org.eclipse.cdt-CDT_9_2_1 +%global cdt_snapshot org.eclipse.cdt-bfe45e8c74f297fbfaa89e9fc33527891207108e %global template_snapshot org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac %ifarch %{ix86} @@ -19,18 +25,18 @@ Epoch: 1 %ifarch ppc64 ppc64p7 %global eclipse_arch ppc64 %endif -%ifarch s390 s390x x86_64 aarch64 ppc64le +%ifarch s390x x86_64 aarch64 ppc64le %global eclipse_arch %{_arch} %endif # Desktop file information -%global app_name %{?app_name_prefix} Eclipse C/C++ Debugger +%global app_name %{?app_name_prefix}%{!?app_name_prefix:Eclipse} C/C++ Debugger %global app_exec %{?app_exec_prefix} cdtdebug Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt -Version: 9.2.1 -Release: 3%{?dist} +Version: 9.3.0 +Release: 0.2.gitbfe45e8%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -56,10 +62,6 @@ Patch2: eclipse-cdt-config-ini.patch # Following fixes Standalone Debugger README file to refer to /usr/bin/cdtdebug Patch3: eclipse-cdt-cdtdebug-readme.patch -%if ! %{_enable_container_and_remote_support} -Patch4: bootstrap.patch -%endif - BuildRequires: make BuildRequires: gcc-c++ BuildRequires: tycho @@ -72,6 +74,8 @@ BuildRequires: eclipse-platform BuildRequires: eclipse-pde BuildRequires: eclipse-contributor-tools BuildRequires: eclipse-swtbot >= 2.4.0 +BuildRequires: eclipse-launchbar +BuildRequires: eclipse-tm-terminal BuildRequires: exec-maven-plugin BuildRequires: maven-antrun-plugin BuildRequires: freemarker @@ -81,14 +85,14 @@ BuildRequires: mockito BuildRequires: eclipse-linuxtools-docker >= 5.3.0 %endif BuildRequires: eclipse-remote >= 2.1.0 -BuildRequires: eclipse-launchbar >= 1:2.1.0 +BuildRequires: eclipse-tm-terminal-connectors >= 4.3.0 %endif Requires: gdb make gcc-c++ %if %{_enable_container_and_remote_support} Requires: autoconf automake libtool Requires: eclipse-remote >= 2.1.0 -Requires: eclipse-launchbar >= 1:2.1.0 +Requires: eclipse-tm-terminal-connectors >= 4.3.0 %endif Recommends: eclipse-linuxtools-libhover @@ -128,6 +132,7 @@ Optional llvm parsers for the CDT. %package arduino Summary: Arduino C++ Tools Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: eclipse-tm-terminal-connectors >= 4.3.0 %description arduino Extensions to support Arduino C++ projects in Eclipse. @@ -206,12 +211,10 @@ TYCHO_ENV="linuxgtk%{eclipse_arch}|org.eclipse.cdt.core.linux.%{eclipse_arch}|g" pom.xml +sed -i -e 's/"org.eclipse.cdt.core.linux.x86"/"org.eclipse.cdt.core.linux.%{eclipse_arch}"/g' \ + -e 's/arch="x86"/arch="%{eclipse_arch}"/' releng/org.eclipse.cdt.native-feature/feature.xml +sed -i -e "s|org.eclipse.cdt.core.linux.x86|org.eclipse.cdt.core.linux.%{eclipse_arch}|g" core/pom.xml %endif %ifarch s390x x86_64 aarch64 ppc64le ppc64 sed -i -e 's|linux/x86_64/|linux/%{eclipse_arch}/|' \ @@ -237,6 +238,10 @@ sed -i -e 's|linux/x86/|linux/%{eclipse_arch}/|' \ sed -i -e 's|-m.. -fPIC -D_REENTRANT|$(CFLAGS)|' \ native/org.eclipse.cdt.native.serial/jni/Makefile +# Ensure correct platform fragments appear in config.ini +sed -i -e 's/x86_64/%{eclipse_arch}/' \ + debug/org.eclipse.cdt.debug.application.product/debug.product + # Force the arch-specific plug-ins to be dir-shaped so that binary stripping works and the native files # aren't loaded into the user.home .eclipse configuration echo "Eclipse-BundleShape: dir" >> core/org.eclipse.cdt.core.linux.%{eclipse_arch}/META-INF/MANIFEST.MF @@ -251,78 +256,61 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \ core/org.eclipse.cdt.core.linux.%{eclipse_arch}/os/linux/%{eclipse_arch} # Don't use the target configuration -%pom_disable_module releng/org.eclipse.cdt.target +%pom_disable_module org.eclipse.cdt.target releng %pom_xpath_remove "pom:configuration/pom:target" # Don't need to build the repo -%pom_disable_module releng/org.eclipse.cdt.repo -%pom_disable_module releng/org.eclipse.cdt.testing.repo +%pom_disable_module org.eclipse.cdt.repo releng +%pom_disable_module org.eclipse.cdt.testing.repo releng # Disable the jgit provider and force default packaging %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin + +# Unnecessary plugins for RPM builds %pom_remove_plugin org.jacoco:jacoco-maven-plugin # Disable docker, autotools, and remote features if we are building a boot-strap build %if ! %{_enable_container_and_remote_support} -%patch4 -%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 -%pom_disable_module build/org.eclipse.cdt.autotools.core -%pom_disable_module build/org.eclipse.cdt.autotools.docs -%pom_disable_module build/org.eclipse.cdt.autotools.tests -%pom_disable_module build/org.eclipse.cdt.autotools.ui -%pom_disable_module build/org.eclipse.cdt.autotools.ui.tests -%pom_disable_module build/org.eclipse.cdt.autotools-feature -%pom_disable_module build/org.eclipse.cdt.autotools.source-feature -%pom_disable_module cross/org.eclipse.cdt.launch.remote -%pom_disable_module cross/org.eclipse.cdt.launch.remote-feature -%pom_disable_module qt/org.eclipse.cdt.qt.core -%pom_disable_module qt/org.eclipse.cdt.qt.ui -%pom_disable_module qt/org.eclipse.cdt.qt.ui.tests -%pom_disable_module qt/org.eclipse.cdt.qt-feature -%pom_disable_module build/org.eclipse.cdt.cmake.core -%pom_disable_module build/org.eclipse.cdt.cmake.ui -%pom_disable_module build/org.eclipse.cdt.cmake-feature -%pom_disable_module remote/org.eclipse.cdt.remote.core -%pom_disable_module remote/org.eclipse.cdt.remote-feature -%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 +%pom_disable_module org.eclipse.cdt.docker.launcher launch +%pom_disable_module org.eclipse.cdt.docker.launcher-feature launch +%pom_disable_module org.eclipse.cdt.autotools.core build +%pom_disable_module org.eclipse.cdt.autotools.docs build +%pom_disable_module org.eclipse.cdt.autotools.tests build +%pom_disable_module org.eclipse.cdt.autotools.ui build +%pom_disable_module org.eclipse.cdt.autotools.ui.tests build +%pom_disable_module org.eclipse.cdt.autotools-feature build +%pom_disable_module org.eclipse.cdt.cmake.core build +%pom_disable_module org.eclipse.cdt.cmake.ui build +%pom_disable_module org.eclipse.cdt.cmake-feature build +%pom_disable_module cross +%pom_disable_module remote +%pom_disable_module qt +%pom_disable_module toolchains/arduino %else %if ! %{_enable_container_support} -%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 +%pom_disable_module org.eclipse.cdt.docker.launcher launch +%pom_disable_module org.eclipse.cdt.docker.launcher-feature launch %endif - # Always disable arduino support on rhel %if 0%{?rhel} -%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 +%pom_disable_module toolchains/arduino +%endif %endif # Disable all bundles not relavent to the platform we currently building -%pom_xpath_inject "pom:modules" "core/org.eclipse.cdt.core.linux.ppc64le" for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch}$|tests$|linux$|native$)'` ; do - module=$(grep ">core/$b<" pom.xml || :) + module=$(grep ">$b<" core/pom.xml || :) if [ -n "$module" ] ; then - %pom_disable_module core/$b + %pom_disable_module $b core %pom_xpath_remove "plugin[@id='$b']" releng/org.eclipse.cdt.native-feature/feature.xml fi done -for b in aix macosx win32 ; do - %pom_xpath_remove "plugin[@id='org.eclipse.cdt.core.$b.source']" releng/org.eclipse.cdt.native.source-feature/feature.xml -done # Fix hamcrest and mockito deps sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcrest.library/' \ - dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF - -sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcrest.library/' \ - codan/org.eclipse.cdt.codan.checkers.ui.test/META-INF/MANIFEST.MF + dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF \ + codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF \ + core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF # Add template tools to the build tar xf %{SOURCE1} --strip-components=1 --exclude=%{template_snapshot}/pom.xml @@ -338,19 +326,14 @@ sed -i -e 's/org.freemarker/org.freemarker.freemarker/' \ bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF \ build/org.eclipse.cdt.cmake.core/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 ":*.{testing,tests,tests.dsf,tests.dsf.gdb}" tests %mvn_package "::jar:sources{,-feature}:" sdk -%mvn_package ":*.source{,.feature}" sdk %mvn_package :*.sdk sdk %mvn_package :*.doc.isv sdk %mvn_package ":org.eclipse.cdt.core{,.native,.linux,.linux.%{eclipse_arch}}" native %mvn_package ":org.eclipse.cdt.native{,.serial}" native -%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.tools.templates.* @@ -424,11 +407,12 @@ $(ls . | grep org.eclipse.tools.templates.ui_) ; do sed -i -e "s,${PLUGIN%_*}\,,file\\\\:%{eclipse_base}/droplets/cdt/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini done for PLUGIN in \ -$(cd %{buildroot}%{_libdir}/eclipse/droplets/cdt-native/eclipse/plugins && ls . | grep com.google.gson_) \ -$(cd %{buildroot}%{_libdir}/eclipse/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core_) \ -$(cd %{buildroot}%{_libdir}/eclipse/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core.linux_) \ -$(cd %{buildroot}%{_libdir}/eclipse/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core.native_) ; do - sed -i -e "s,${PLUGIN%_*}\,,file\\\\:%{_libdir}/eclipse/droplets/cdt-native/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini +$(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | grep com.google.gson_) \ +$(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core_) \ +$(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core.linux_) \ +$(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core.linux.%{eclipse_arch}_) \ +$(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core.native_) ; do + sed -i -e "s,${PLUGIN%_*}\,,file\\\\:%{_eclipsedir}/droplets/cdt-native/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 @@ -530,6 +514,14 @@ fi %endif %changelog +* Mon Jun 19 2017 Mat Booth - 1:9.3.0-0.2.gitbfe45e8 +- Allow boostrap modes to build against launchbar and tm-terminal when those + packages are also bootstrapped +- Attempt to fix standalone debugger + +* Sun Jun 18 2017 Mat Booth - 1:9.3.0-0.1.gitbfe45e8 +- Update to Oxygen snapshot + * Tue May 02 2017 Mat Booth - 1:9.2.1-3 - Rebuilt for multilib change diff --git a/sources b/sources index c98e19e..a1d05f8 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (eclipse-cdt.desktop) = 8b4b8613c6ca174b91d48cac5823fe304886cfd63473e8c0814d08d7923b40b488db27232ae4a81248f2f200c0e8211ba6b60797cfc1b7f61b4309a97c2aaeec -SHA512 (org.eclipse.cdt-CDT_9_2_1.tar.xz) = 8367b738ec37bf822e69a778d9d752dad90f1b53c64db4a04a89bae471e42ba6ce059be5ef6060245c20f6bb7f2c6cbd9be27f0076998e2ebaee6c7fe09f82e3 +SHA512 (org.eclipse.cdt-bfe45e8c74f297fbfaa89e9fc33527891207108e.tar.xz) = 655f5a13fd2ded3eecf5cd6c8e2949c3dc89c467b743a25242a2530017c7beeaa83b8a57faebad9b10bcb9533e8b53866eb1257d7f248459299d6b29b86067d0 SHA512 (org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac.tar.xz) = 02e05bbbf0f2d8bff8809a9d317b1710ba5a21e52fe4b63990a731e918c81605ddf10c42f59070c054a996798af37ea40d041db94f62be2e30df21e7dfa39343