From b22f451701445298385bf843d055ac7b26ee63cc Mon Sep 17 00:00:00 2001 From: Mat Booth Date: May 02 2016 11:07:07 +0000 Subject: Update to latest snapshot for Neon support --- diff --git a/.gitignore b/.gitignore index a357d22..d5d7f8f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ ammacros-1.9.6.xml /*.src.rpm /.project /org.eclipse.cdt-*/ +/org.eclipse.cdt-0b93e8116ed81f0e5b366262b0af903b0fb3d580.tar.xz +/org.eclipse.tools.templates-476b60a0ca06cba838c98cd7ec5913f6cbeda4c8.tar.xz diff --git a/eclipse-cdt-autotools-test.patch b/eclipse-cdt-autotools-test.patch deleted file mode 100644 index 6706e30..0000000 --- a/eclipse-cdt-autotools-test.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./build/org.eclipse.cdt.autotools.tests/build.properties.fix ./build/org.eclipse.cdt.autotools.tests/build.properties ---- ./build/org.eclipse.cdt.autotools.tests/build.properties.fix 2013-10-07 17:04:35.000000000 -0400 -+++ ./build/org.eclipse.cdt.autotools.tests/build.properties 2013-10-07 17:04:53.000000000 -0400 -@@ -1,6 +1,7 @@ - source.. = src/ - output.. = bin/ - bin.includes = META-INF/,\ -+ .,\ - plugin.properties,\ - zip/,\ - about.html diff --git a/eclipse-cdt-cdtdebug.patch b/eclipse-cdt-cdtdebug.patch index 1d2b52c..0798cfc 100644 --- a/eclipse-cdt-cdtdebug.patch +++ b/eclipse-cdt-cdtdebug.patch @@ -1,6 +1,6 @@ --- ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.orig 2014-10-06 15:52:36.978351369 +0100 +++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh 2014-10-06 16:32:49.816501768 +0100 -@@ -71,26 +71,31 @@ +@@ -74,12 +74,15 @@ done # Make sure local directory exists and has contents initialized @@ -15,22 +15,28 @@ # Calculate platform-specific jar file names -ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd) # install.sh will modify this line. DO NOT REMOVE THE FOLLOWING MARKER: @#@# -+ECLIPSE_HOME="@ECLIPSE_HOME@" ++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,19 +91,21 @@ + fi + PLUGIN_DIR="$ECLIPSE_HOME/plugins" +CDT_PLUGIN_DIR="@CDT_DROPINS@" - OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -printf "%f\n" | head -1` --SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*.jar' -not -name '*source*' -printf "%f\n" | head -1` -+SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*' -not -name '*source*' -printf "%f\n" | head -1` + OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -exec basename {} \; | head -1` +-SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*.jar' -not -name '*source*' -exec basename {} \; | head -1` ++SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*' -not -name '*source*' -exec basename {} \; | head -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*' -printf "%f\n" | grep -v java7 | head -1` + FS_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.core.filesystem.*.jar' -not -name '*source*' -exec basename {} \; | grep -v java7 | head -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*' -printf "%f\n" | head -1` -+LINUX_JAR=`find "$CDT_PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -printf "%f\n" | head -1` +-LINUX_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | head -1` ++LINUX_JAR=`find "$CDT_PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -exec basename {} \; | head -1` LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"` # Run eclipse with the Stand-alone Debugger product specified - "$ECLIPSE_HOME/eclipse" -clean -product org.eclipse.cdt.debug.application.product \ + "$ECLIPSE_EXEC" -clean -product org.eclipse.cdt.debug.application.product \ - -data "$HOME/workspace-cdtdebug" -configuration file\:"$HOME/cdtdebugger" \ - -dev file\:"$HOME/cdtdebugger/dev.properties" $options \ + -application org.eclipse.cdt.debug.application.app \ @@ -39,24 +45,30 @@ -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \ -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home="$ECLIPSE_HOME" ---- ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.orig 2014-10-06 16:24:44.634312348 +0100 -+++ ./debug/org.eclipse.cdt.debug.application/scripts/install.sh 2014-10-06 16:26:59.737416197 +0100 -@@ -15,29 +15,4 @@ +--- ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.orig 2016-05-01 13:26:17.051585461 +0100 ++++ ./debug/org.eclipse.cdt.debug.application/scripts/install.sh 2016-05-01 13:28:17.149888629 +0100 +@@ -15,40 +15,4 @@ SCRIPT_DIR=`dirname $0` +-IS_MAC=0 +- -if [ ! -f "$SCRIPT_DIR/../../../eclipse" ]; then -- echo "$0: error: eclipse executable not found in expected location" -- echo " " -- echo "This can occur if you are running this script from your local .eclipse directory" -- echo "which would mean you are running a shared instance of the Eclipse platform for" -- echo "your distro and have installed the Stand-alone Debugger from an eclipse.org" -- echo "download repo. Downloading the Stand-alone Debugger feature on top of a distro" -- echo "version of Eclipse Debugger is not supported. If you are using a distro version" -- echo "of the Eclipse platform, you should not use this script. Instead, install the" -- echo "corresponding Eclipse CDT package for your distro (e.g. eclipse-cdt package)" -- echo "which will install the Stand-alone Debugger for you." -- exit 1 +- if [ ! -f "$SCRIPT_DIR/../../../../MacOS/eclipse" ]; then +- echo "$0: error: eclipse executable not found in expected location" +- echo " " +- echo "This can occur if you are running this script from your local .eclipse directory" +- echo "which would mean you are running a shared instance of the Eclipse platform for" +- echo "your distro and have installed the Stand-alone Debugger from an eclipse.org" +- echo "download repo. Downloading the Stand-alone Debugger feature on top of a distro" +- echo "version of Eclipse Debugger is not supported. If you are using a distro version" +- echo "of the Eclipse platform, you should not use this script. Instead, install the" +- echo "corresponding Eclipse CDT package for your distro (e.g. eclipse-cdt package)" +- echo "which will install the Stand-alone Debugger for you." +- exit 1 +- else +- IS_MAC=1 +- fi -fi - -if [ ! -d "$HOME/cdtdebugger" ]; then @@ -67,8 +79,15 @@ -cp "$SCRIPT_DIR/cdtdebug.sh" "$HOME/cdtdebugger" -chmod +x "$HOME/cdtdebugger/cdtdebug.sh" - --ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd) +-if [ $IS_MAC -eq 0 ]; then +- ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd) +-else +- ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../../../MacOS" && pwd) +-fi +- -# Replace the entire line with tag @#@# by the actual location of the eclipse installation -sed -i -e "s,^.*@#@#.*$,ECLIPSE_HOME=$ECLIPSE_HOME," "$HOME/cdtdebugger/cdtdebug.sh" -echo "Installation complete" +echo "Installation already done" +--- ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.orig 2016-05-01 13:33:50.907173070 +0100 ++++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh 2016-05-01 16:08:54.478128872 +0100 diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch index 0409cbe..ee82980 100644 --- a/eclipse-cdt-config-ini.patch +++ b/eclipse-cdt-config-ini.patch @@ -5,8 +5,8 @@ diff -up ./debug/org.eclipse.cdt.debug.application/scripts/config.ini.fix ./debu #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.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.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 -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.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.eclipse.e4.core.di.annotations,org.apache.xalan,org.apache.xerces,org.apache.xml.resolver,org.apache.xml.serializer,com.spatial4j,org.apache.regexp ++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,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.eclipse.e4.core.di.annotations,org.apache.xalan,org.apache.xerces,org.apache.xml.resolver,org.apache.xml.serializer,com.spatial4j,org.apache.regexp +osgi.configuration.cascaded=true osgi.bundles.defaultStartLevel=4 diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index a1f847d..376c19f 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -15,12 +15,13 @@ Epoch: 1 -%global major 8 -%global minor 8 +%global major 9 +%global minor 0 %global majmin %{major}.%{minor} -%global micro 1 +%global micro 0 %global eclipse_base %{_libdir}/eclipse -%global cdt_snapshot org.eclipse.cdt-CDT_8_8_1 +%global cdt_snapshot org.eclipse.cdt-0b93e8116ed81f0e5b366262b0af903b0fb3d580 +%global template_snapshot org.eclipse.tools.templates-476b60a0ca06cba838c98cd7ec5913f6cbeda4c8 # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -36,12 +37,15 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 9%{?dist} +Release: 0.1.git0b93e81%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt Source0: http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/%{cdt_snapshot}.tar.xz +# This could be broken out into a separate SRPM if another project starts using it +Source1: http://git.eclipse.org/c/cdt/org.eclipse.tools.templates.git/snapshot/%{template_snapshot}.tar.xz + Source3: eclipse-cdt.desktop # man-page for /usr/bin/cdtdebug @@ -50,9 +54,6 @@ Source4: cdtdebug.man # Script to run the tests in Xvnc Source5: %{name}-runtests.sh -# Following adds current directory to autotools tests build.properties -Patch0: %{name}-autotools-test.patch - # Following fixes cdtdebug.sh script to get proper platform filesystem plugin Patch1: %{name}-cdtdebug.patch @@ -76,14 +77,13 @@ BuildRequires: lpg-java-compat BuildRequires: google-gson BuildRequires: eclipse-platform BuildRequires: eclipse-contributor-tools -BuildRequires: eclipse-swtbot +BuildRequires: eclipse-swtbot >= 2.4.0 BuildRequires: eclipse-launchbar BuildRequires: exec-maven-plugin +BuildRequires: freemarker +BuildRequires: mockito %if %{_enable_container_and_remote_support} -# Docker not available on F22 or earlier -%if 0%{?fedora} >= 23 BuildRequires: eclipse-linuxtools-docker -%endif BuildRequires: eclipse-remote >= 2.0.0-1 BuildRequires: eclipse-rse %endif @@ -124,9 +124,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description arduino Extensions to support Arduino C++ projects in Eclipse. -# Docker not available on F22 or earlier -%if 0%{?fedora} >= 23 - %package docker Summary: C/C++ Docker Launcher Requires: %{name} = %{epoch}:%{version}-%{release} @@ -138,8 +135,6 @@ in Docker Containers. %endif -%endif - %package qt Summary: QT C++ Tools Requires: %{name} = %{epoch}:%{version}-%{release} @@ -158,6 +153,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-llvm = %{epoch}:%{version}-%{release} Requires: %{name}-parsers = %{epoch}:%{version}-%{release} Requires: eclipse-tests +Requires: eclipse-swtbot >= 2.4.0 %description tests Test plugins for the CDT. @@ -180,18 +176,12 @@ cp %{SOURCE3} desktop mkdir man cp %{SOURCE4} man -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -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 %endif TYCHO_ENV="linuxgtk%{eclipse_arch}" @@ -256,13 +246,6 @@ popd %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 -%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 for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch}$|tests$|linux$|native$)'` ; do @@ -272,12 +255,27 @@ for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch} %pom_xpath_remove "plugin[@id='$b']" releng/org.eclipse.cdt.native-feature/feature.xml fi done -for b in aix macosx solaris win32 ; do +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 -# 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 +# Fix hamcrest and mockito deps +sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcrest.core/' \ + dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF + +# Add template tools to the build +tar xf %{SOURCE1} --strip-components=1 --exclude=%{template_snapshot}/pom.xml +for b in org.eclipse.tools.templates.{core,freemarker,ui} ; do + %pom_xpath_inject "pom:modules" "bundles/$b" + %pom_set_parent "org.eclipse.cdt:cdt-parent:%{version}-SNAPSHOT" bundles/$b + %pom_xpath_inject "pom:parent" "../../pom.xml" bundles/$b +done + +# Fix freemarker dep +sed -i -e 's/org.freemarker/org.freemarker.freemarker/' \ + qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF \ + 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 @@ -297,6 +295,7 @@ sed -i -e '/log4j/d' build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST. %mvn_package :org.eclipse.cdt.managedbuilder.llvm* llvm %mvn_package :org.eclipse.cdt.qt* qt %mvn_package :org.eclipse.cdt* +%mvn_package :org.eclipse.tools.templates.* %build @@ -420,15 +419,15 @@ cp man/cdtdebug.man $manInstallDir/cdtdebug.1 %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html -# Docker not available on F22 or earlier -%if 0%{?fedora} >= 23 %files docker -f .mfiles-docker %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html %endif -%endif %changelog +* Sun May 01 2016 Mat Booth - 1:9.0.0-0.1.git0b93e81 +- Update to latest snapshot for Neon support + * Thu Mar 10 2016 Mat Booth - 1:8.8.1-9 - Make standalone debugger work with all versions of lucene diff --git a/sources b/sources index 4b1b4c7..3f202f0 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ da9186b8edfc5f4efaa189ad7c0eb26f eclipse-cdt.desktop -7fbb5ead7e9f8f44e121c65255358692 org.eclipse.cdt-CDT_8_8_1.tar.xz +480b9d5b85518ea6f67a68dd1bc65cf0 org.eclipse.cdt-0b93e8116ed81f0e5b366262b0af903b0fb3d580.tar.xz +42d08b0a49ebd7b144b98781096eb0a1 org.eclipse.tools.templates-476b60a0ca06cba838c98cd7ec5913f6cbeda4c8.tar.xz