[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. 6a9945818ad9e5d44c74b11ed0f0ef7a81c14eb2
Niels Thykier
nthykier-guest at alioth.debian.org
Thu Jun 10 13:46:15 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.".
The branch, master has been updated
via 6a9945818ad9e5d44c74b11ed0f0ef7a81c14eb2 (commit)
from 331cf206a3a5a2537725638bd2299d4128d14e86 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6a9945818ad9e5d44c74b11ed0f0ef7a81c14eb2
Author: Niels Thykier <niels at thykier.net>
Date: Thu Jun 10 15:41:44 2010 +0200
Threw out all old patches and replaced debian/rules.
-----------------------------------------------------------------------
Summary of changes:
debian/orig-tar.sh | 1 +
debian/patches/eclipse-cdt-build-linux.patch | 40 ----
.../patches/eclipse-cdt-build-on-sparc-s390.patch | 133 ------------
debian/patches/eclipse-cdt-buildconsole.patch | 227 --------------------
.../patches/eclipse-cdt-definedsymbolhover.patch | 96 --------
.../eclipse-cdt-managedbuild-failcheck.patch | 68 ------
debian/patches/eclipse-cdt-no-cvs2.patch | 123 -----------
debian/patches/eclipse-cdt-no-tests.patch | 11 -
debian/patches/eclipse-cdt-scannerinfoplus.patch | 82 -------
debian/rules | 176 +---------------
10 files changed, 3 insertions(+), 954 deletions(-)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 24c00b8..096686e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -47,5 +47,6 @@ java -cp /usr/lib/eclipse/startup.jar \
#eclipse -nosplash -console
find . -name net.*.jar -exec rm {} \;
+find . -name '*.so' -delete
cd .. && tar jcf eclipse-cdt-fetched-src-$CDTTAG.tar.bz2 org.eclipse.cdt.releng
diff --git a/debian/patches/eclipse-cdt-build-linux.patch b/debian/patches/eclipse-cdt-build-linux.patch
deleted file mode 100644
index 7eee721..0000000
--- a/debian/patches/eclipse-cdt-build-linux.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r -u source-tree.orig/org.eclipse.cdt.releng/platform/build.properties source-tree/org.eclipse.cdt.releng/platform/build.properties
---- source-tree.orig/org.eclipse.cdt.releng/platform/build.properties 2005-11-18 02:41:32.000000000 +0100
-+++ source-tree/org.eclipse.cdt.releng/platform/build.properties 2005-11-18 02:45:38.000000000 +0100
-@@ -71,15 +71,7 @@
- # configs=win32,win32,x86 & linux,motif,x86
- # By default the value is *,*,*
- configs=\
-- aix,motif,ppc \
-- & linux,gtk,x86 \
-- & linux,gtk,x86_64 \
-- & linux,gtk,ppc \
-- & linux,gtk,ia64 \
-- & macosx,carbon,ppc \
-- & qnx,photon,x86 \
-- & solaris,motif,sparc \
-- & win32,win32,x86
-+ linux,gtk, at ARCH@
-
- archivesFormat=\
- aix,motif,ppc-tar \
-diff -r -u source-tree.orig/org.eclipse.cdt.releng/sdk/build.properties source-tree/org.eclipse.cdt.releng/sdk/build.properties
---- source-tree.orig/org.eclipse.cdt.releng/sdk/build.properties 2005-11-18 02:41:29.000000000 +0100
-+++ source-tree/org.eclipse.cdt.releng/sdk/build.properties 2005-11-18 02:44:59.000000000 +0100
-@@ -71,15 +71,7 @@
- # configs=win32,win32,x86 & linux,motif,x86
- # By default the value is *,*,*
- configs=\
-- aix,motif,ppc\
-- & linux,gtk,x86 \
-- & linux,gtk,x86_64 \
-- & linux,gtk,ppc \
-- & linux,gtk,ia64 \
-- & macosx,carbon,ppc \
-- & qnx,photon,x86 \
-- & solaris,motif,sparc \
-- & win32,win32,x86
-+ linux,gtk, at ARCH@
-
- archivesFormat=\
- aix,motif,ppc-tar \
diff --git a/debian/patches/eclipse-cdt-build-on-sparc-s390.patch b/debian/patches/eclipse-cdt-build-on-sparc-s390.patch
deleted file mode 100644
index b3211e7..0000000
--- a/debian/patches/eclipse-cdt-build-on-sparc-s390.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- orig/org.eclipse.cdt.releng/results/features/org.eclipse.cdt/feature.xml
-+++ mod/org.eclipse.cdt.releng/results/features/org.eclipse.cdt/feature.xml
-@@ -217,6 +217,51 @@
- fragment="true"/>
-
- <plugin
-+ id="org.eclipse.cdt.core.linux.ppc64"
-+ os="linux"
-+ arch="ppc64"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"/>
-+
-+ <plugin
-+ id="org.eclipse.cdt.core.linux.s390"
-+ os="linux"
-+ arch="s390"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"/>
-+
-+ <plugin
-+ id="org.eclipse.cdt.core.linux.s390x"
-+ os="linux"
-+ arch="s390x"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"/>
-+
-+ <plugin
-+ id="org.eclipse.cdt.core.linux.sparc"
-+ os="linux"
-+ arch="sparc"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"/>
-+
-+ <plugin
-+ id="org.eclipse.cdt.core.linux.sparc64"
-+ os="linux"
-+ arch="sparc64"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"/>
-+
-+ <plugin
- id="org.eclipse.cdt.managedbuilder.gnu.ui"
- download-size="0"
- install-size="0"
-
---- orig/org.eclipse.cdt.releng/platform/customTargets.xml
-+++ mod/org.eclipse.cdt.releng/platform/customTargets.xml
-@@ -68,6 +68,36 @@
- </ant>
- </target>
-
-+<target name="assemble.org.eclipse.cdt.linux.gtk.ppc64">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc64.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.linux.gtk.s390">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.s390.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.linux.gtk.s390x">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.s390x.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.linux.gtk.sparc">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.sparc.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.linux.gtk.sparc64">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.sparc64.tar.gz"/>
-+ </ant>
-+</target>
-+
- <target name="assemble.org.eclipse.cdt.linux.gtk.ia64">
- <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
- <property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
---- orig/org.eclipse.cdt.releng/sdk/customTargets.xml
-+++ mod/org.eclipse.cdt.releng/sdk/customTargets.xml
-@@ -73,6 +73,36 @@
- </ant>
- </target>
-
-+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc64">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc64.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.s390">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.s390.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.s390x">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.s390x.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.sparc">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.sparc.tar.gz"/>
-+ </ant>
-+</target>
-+
-+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.sparc64">
-+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-+ <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.sparc64.tar.gz"/>
-+ </ant>
-+</target>
-+
- <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64">
- <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
- <property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
diff --git a/debian/patches/eclipse-cdt-buildconsole.patch b/debian/patches/eclipse-cdt-buildconsole.patch
deleted file mode 100644
index fe07cb5..0000000
--- a/debian/patches/eclipse-cdt-buildconsole.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java.fix 2007-02-21 15:11:53.000000000 -0500
-+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java 2007-02-21 15:16:17.000000000 -0500
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * QNX Software Systems - initial API and implementation
-+ * Red Hat Inc. - multiple build console support
- *******************************************************************************/
- package org.eclipse.cdt.internal.ui.buildconsole;
-
-@@ -52,11 +53,14 @@ public class BuildConsoleManager impleme
- private Map fConsoleMap = new HashMap();
- Color infoColor, outputColor, errorColor;
- BuildConsoleStream infoStream, outputStream, errorStream;
-+ String fName, fSubMenuId, fContextMenuId;
-
- static public final int BUILD_STREAM_TYPE_INFO = 0;
- static public final int BUILD_STREAM_TYPE_OUTPUT = 1;
- static public final int BUILD_STREAM_TYPE_ERROR = 2;
- private IProject fLastProject;
-+
-+ static public final String DEFAULT_CONTEXT_MENU_ID = CUIPlugin.PLUGIN_ID + ".CBuildConole"; //$NON-NLS-1$
-
- public BuildConsoleManager() {
- }
-@@ -168,10 +172,12 @@ public class BuildConsoleManager impleme
- }
- }
-
-- public void startup() {
-+ public void startup(String name, String id) {
- infoStream = new BuildConsoleStream();
- outputStream = new BuildConsoleStream();
- errorStream = new BuildConsoleStream();
-+ fName = name;
-+ fContextMenuId = id;
-
- runUI(new Runnable() {
-
-@@ -182,7 +188,7 @@ public class BuildConsoleManager impleme
- */
- public void run() {
- // install colors
-- fConsole = new BuildConsole(BuildConsoleManager.this);
-+ fConsole = new BuildConsole(BuildConsoleManager.this, fName, fContextMenuId);
- ConsolePlugin.getDefault().getConsoleManager().addConsoles(new org.eclipse.ui.console.IConsole[]{fConsole});
- infoStream.setConsole(fConsole);
- infoColor = createColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_INFO_COLOR);
-@@ -199,6 +205,7 @@ public class BuildConsoleManager impleme
- CUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
- }
-
-+
- /*
- * (non-Javadoc)
- *
---- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java.fix 2007-02-21 15:12:09.000000000 -0500
-+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java 2007-02-21 15:16:17.000000000 -0500
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * QNX Software Systems - Initial API and implementation
-+ * Red Hat Inc. - Multiple build console support
- *******************************************************************************/
- package org.eclipse.cdt.internal.ui.buildconsole;
-
-@@ -26,18 +27,22 @@ public class BuildConsole extends Abstra
- public static final String P_STREAM_COLOR = CUIPlugin.PLUGIN_ID + ".CONSOLE_P_STREAM_COLOR"; //$NON-NLS-1$
-
- private IBuildConsoleManager fConsoleManager;
-+ private String fConsoleName;
-+ private String fConsoleId;
-
-- public BuildConsole(IBuildConsoleManager manager) {
-- super(ConsoleMessages.getString("BuildConsole.buildConsole"), CPluginImages.DESC_BUILD_CONSOLE); //$NON-NLS-1$
-+ public BuildConsole(IBuildConsoleManager manager, String name, String id) {
-+ super(name, CPluginImages.DESC_BUILD_CONSOLE);
- fConsoleManager = manager;
-+ fConsoleName = name;
-+ fConsoleId = id;
- }
-
- public IPageBookViewPage createPage(IConsoleView view) {
-- return new BuildConsolePage(view, this);
-+ return new BuildConsolePage(view, this, fConsoleId);
- }
-
- public void setTitle(IProject project) {
-- String title = ConsoleMessages.getString("BuildConsole.buildConsole"); //$NON-NLS-1$
-+ String title = fConsoleName;
- if (project != null) {
- title += " [" + project.getName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
- }
---- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java.fix 2007-02-21 15:12:28.000000000 -0500
-+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java 2007-02-21 15:16:17.000000000 -0500
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * QNX Software Systems - initial API and implementation
-+ * Red Hat Inc. - multiple build console support
- *******************************************************************************/
- package org.eclipse.cdt.internal.ui.buildconsole;
-
-@@ -85,6 +86,7 @@ public class BuildConsolePage extends Pa
-
- private BuildConsole fConsole;
- private IConsoleView fConsoleView;
-+ private String fContextMenuId;
- private BuildConsoleViewer fViewer;
- private IProject fProject;
-
-@@ -109,10 +111,13 @@ public class BuildConsolePage extends Pa
- /**
- * @param view
- * @param console
-+ * @param contextId
- */
-- public BuildConsolePage(IConsoleView view, BuildConsole console) {
-+ public BuildConsolePage(IConsoleView view, BuildConsole console,
-+ String contextId) {
- fConsole = console;
- fConsoleView = view;
-+ fContextMenuId = contextId;
- }
-
- protected void setProject(IProject project) {
-@@ -187,7 +192,7 @@ public class BuildConsolePage extends Pa
- fMenu = manager.createContextMenu(getControl());
- getControl().setMenu(fMenu);
- IPageSite site = getSite();
-- site.registerContextMenu(CUIPlugin.PLUGIN_ID + ".CBuildConole", manager, getViewer()); //$NON-NLS-1$
-+ site.registerContextMenu(CUIPlugin.PLUGIN_ID + "." + fContextMenuId, manager, getViewer()); //$NON-NLS-1$
- site.setSelectionProvider(getViewer());
- createActions();
- configureToolBar(site.getActionBars().getToolBarManager());
---- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java.fix 2007-02-21 15:15:37.000000000 -0500
-+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java 2007-02-21 15:16:17.000000000 -0500
-@@ -14,8 +14,10 @@ package org.eclipse.cdt.ui;
- import java.io.IOException;
- import java.text.MessageFormat;
- import java.util.ArrayList;
-+import java.util.HashMap;
- import java.util.HashSet;
- import java.util.List;
-+import java.util.Map;
- import java.util.MissingResourceException;
- import java.util.ResourceBundle;
- import java.util.Set;
-@@ -32,6 +34,7 @@ import org.eclipse.cdt.internal.ui.ICSta
- import org.eclipse.cdt.internal.ui.IContextMenuConstants;
- import org.eclipse.cdt.internal.ui.ResourceAdapterFactory;
- import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager;
-+import org.eclipse.cdt.internal.ui.buildconsole.ConsoleMessages;
- import org.eclipse.cdt.internal.ui.editor.CDocumentProvider;
- import org.eclipse.cdt.internal.ui.editor.CustomBufferFactory;
- import org.eclipse.cdt.internal.ui.editor.ExternalSearchDocumentProvider;
-@@ -336,7 +339,7 @@ public class CUIPlugin extends AbstractU
- private CTextTools fTextTools;
- private AsmTextTools fAsmTextTools;
- private ProblemMarkerManager fProblemMarkerManager;
-- private BuildConsoleManager fBuildConsoleManager;
-+ private Map fBuildConsoleManagers;
- private ResourceAdapterFactory fResourceAdapterFactory;
- private CElementAdapterFactory fCElementAdapterFactory;
-
-@@ -356,7 +359,8 @@ public class CUIPlugin extends AbstractU
- public CUIPlugin() {
- fgCPlugin = this;
- fDocumentProvider = null;
-- fTextTools = null;
-+ fTextTools = null;
-+ fBuildConsoleManagers = new HashMap();
- }
-
- /**
-@@ -408,12 +412,28 @@ public class CUIPlugin extends AbstractU
- return fAsmTextTools;
- }
-
-+ /**
-+ * Return the default console manager.
-+ * @return IBuildConsoleManager
-+ */
- public IBuildConsoleManager getConsoleManager() {
-- if ( fBuildConsoleManager == null ) {
-- fBuildConsoleManager = new BuildConsoleManager();
-- fBuildConsoleManager.startup();
-+ return getConsoleManager(ConsoleMessages.getString("BuildConsole.buildConsole"), BuildConsoleManager.DEFAULT_CONTEXT_MENU_ID); //$NON-NLS-1$
-+ }
-+
-+ /**
-+ * Return a console manager specified by id.
-+ * @param name console name
-+ * @param id console id
-+ * @return IBuildConsoleManager
-+ */
-+ public IBuildConsoleManager getConsoleManager(String name, String id) {
-+ BuildConsoleManager manager = (BuildConsoleManager)fBuildConsoleManagers.get(id);
-+ if (manager == null ) {
-+ manager = new BuildConsoleManager();
-+ fBuildConsoleManagers.put(id, manager);
-+ manager.startup(name, id);
- }
-- return fBuildConsoleManager;
-+ return manager;
- }
-
- /* (non-Javadoc)
-@@ -443,9 +463,15 @@ public class CUIPlugin extends AbstractU
- }
- if (fImageDescriptorRegistry != null)
- fImageDescriptorRegistry.dispose();
-- if ( fBuildConsoleManager != null ) {
-- fBuildConsoleManager.shutdown();
-- fBuildConsoleManager = null;
-+
-+ if (fBuildConsoleManagers != null ) {
-+ Object[] bcm = fBuildConsoleManagers.values().toArray();
-+ for (int i = 0; i < bcm.length; ++i) {
-+ BuildConsoleManager m = (BuildConsoleManager)bcm[i];
-+ if (m != null)
-+ m.shutdown();
-+ }
-+ fBuildConsoleManagers.clear();
- }
-
- unregisterAdapters();
diff --git a/debian/patches/eclipse-cdt-definedsymbolhover.patch b/debian/patches/eclipse-cdt-definedsymbolhover.patch
deleted file mode 100644
index 4c166d2..0000000
--- a/debian/patches/eclipse-cdt-definedsymbolhover.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/DefinedSymbolHover.java.fix 2006-09-11 15:53:00.000000000 -0400
-+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/DefinedSymbolHover.java 2006-09-11 15:52:51.000000000 -0400
-@@ -0,0 +1,67 @@
-+package org.eclipse.cdt.internal.ui.text.c.hover;
-+
-+import java.util.Map;
-+
-+import org.eclipse.cdt.core.CCorePlugin;
-+import org.eclipse.cdt.core.model.IWorkingCopy;
-+import org.eclipse.cdt.core.parser.IScannerInfo;
-+import org.eclipse.cdt.core.parser.IScannerInfoProvider;
-+import org.eclipse.cdt.ui.CUIPlugin;
-+import org.eclipse.cdt.ui.IWorkingCopyManager;
-+import org.eclipse.core.resources.IResource;
-+import org.eclipse.jface.text.BadLocationException;
-+import org.eclipse.jface.text.IRegion;
-+import org.eclipse.jface.text.ITextViewer;
-+import org.eclipse.ui.IEditorInput;
-+import org.eclipse.ui.IEditorPart;
-+
-+public class DefinedSymbolHover extends AbstractCEditorTextHover {
-+
-+ /**
-+ *
-+ */
-+ public DefinedSymbolHover() {
-+ super();
-+ }
-+
-+ /*
-+ * @see ITextHover#getHoverInfo(ITextViewer, IRegion)
-+ */
-+ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-+ IEditorPart editor = getEditor();
-+ if (editor != null) {
-+ IEditorInput input= editor.getEditorInput();
-+ IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager();
-+ IWorkingCopy copy = manager.getWorkingCopy(input);
-+ if (copy == null) {
-+ return null;
-+ }
-+
-+ String expression;
-+ try {
-+ expression = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
-+ expression = expression.trim();
-+ if (expression.length() == 0)
-+ return null;
-+
-+ String source = null;
-+ IResource res = copy.getUnderlyingResource();
-+
-+ IScannerInfo info;
-+ IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(res.getProject());
-+ if (provider != null) {
-+ info = provider.getScannerInformation(res);
-+ Map definedSymbols = info.getDefinedSymbols();
-+ String x = (String)definedSymbols.get(expression);
-+ if (x != null) {
-+ source = "-D" + expression + (x.length() > 0 ? " = " +
-+ x : "");
-+ }
-+ }
-+ return source;
-+ } catch (BadLocationException e) {
-+ }
-+ }
-+ return null;
-+ }
-+}
---- ./results/plugins/org.eclipse.cdt.ui/plugin.properties.fix 2006-09-11 15:50:03.000000000 -0400
-+++ ./results/plugins/org.eclipse.cdt.ui/plugin.properties 2006-09-11 15:50:43.000000000 -0400
-@@ -283,6 +283,8 @@ ViewCommand.typeHierarchy.description= S
- CEditorTextHoversName=C Editor Text Hovers
- sourceHover= Source
- sourceHoverDescription= Shows the source of the selected element.
-+definedSymbolHover= Defined Symbol
-+definedSymbolHoverDescription= Shows the definition of a selected defined symbol.
- cdocHover= Documentation
- cdocHoverDescription= Shows the documentation of the selected element.
- sequentialHover= Combined Hover
---- ./results/plugins/org.eclipse.cdt.ui/plugin.xml.fix 2006-09-11 15:49:54.000000000 -0400
-+++ ./results/plugins/org.eclipse.cdt.ui/plugin.xml 2006-09-11 15:51:19.000000000 -0400
-@@ -145,6 +145,12 @@
- class="org.eclipse.cdt.internal.ui.text.c.hover.CSourceHover"
- id="org.eclipse.cdt.ui.CSourceHover">
- </hover>
-+ <hover
-+ label="%definedSymbolHover"
-+ description="%definedSymbolHoverDescription"
-+ class="org.eclipse.cdt.internal.ui.text.c.hover.DefinedSymbolHover"
-+ id="org.eclipse.cdt.ui.DefinedSymbolHover">
-+ </hover>
- <!--hover
- label="%problemHover"
- description="%problemHoverDescription"
diff --git a/debian/patches/eclipse-cdt-managedbuild-failcheck.patch b/debian/patches/eclipse-cdt-managedbuild-failcheck.patch
deleted file mode 100644
index dc3bb58..0000000
--- a/debian/patches/eclipse-cdt-managedbuild-failcheck.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java.fix 2007-01-26 19:22:27.000000000 -0500
-+++ ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java 2007-01-26 19:43:53.000000000 -0500
-@@ -700,34 +700,40 @@ public class GeneratedMakefileBuilder ex
- }
- }
- }
--
-- // Now call make
-- checkCancel(monitor);
-- statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$
-- monitor.subTask(statusMsg);
-- IPath topBuildDir = generator.getBuildWorkingDir();
-- if (topBuildDir != null) {
-- invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor);
-+
-+ if (result.getCode() != IStatus.ERROR) {
-+ // Now call make
-+ checkCancel(monitor);
-+ statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$
-+ monitor.subTask(statusMsg);
-+ IPath topBuildDir = generator.getBuildWorkingDir();
-+ if (topBuildDir != null) {
-+ invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor);
-+ } else {
-+ statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$
-+ monitor.subTask(statusMsg);
-+ return;
-+ }
-+
-+ // Now regenerate the dependencies
-+ checkCancel(monitor);
-+ statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$
-+ monitor.subTask(statusMsg);
-+ try {
-+ generator.regenerateDependencies(false);
-+ } catch (CoreException e) {
-+ // Throw the exception back to the builder
-+ throw e;
-+ }
-+
-+ // Build finished message
-+ statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$
-+ monitor.subTask(statusMsg);
- } else {
-- statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$
-+ // Build finished message
-+ statusMsg = ManagedMakeMessages.getFormattedString(BUILD_STOPPED_ERR, getProject().getName()); //$NON-NLS-1$
- monitor.subTask(statusMsg);
-- return;
-- }
--
-- // Now regenerate the dependencies
-- checkCancel(monitor);
-- statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$
-- monitor.subTask(statusMsg);
-- try {
-- generator.regenerateDependencies(false);
-- } catch (CoreException e) {
-- // Throw the exception back to the builder
-- throw e;
- }
--
-- // Build finished message
-- statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$
-- monitor.subTask(statusMsg);
- }
-
- /* (non-Javadoc)
diff --git a/debian/patches/eclipse-cdt-no-cvs2.patch b/debian/patches/eclipse-cdt-no-cvs2.patch
deleted file mode 100644
index f5657a8..0000000
--- a/debian/patches/eclipse-cdt-no-cvs2.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- /home/tromey/OS/rpms/eclipse-cdt/eclipse-cdt-2.0/org.eclipse.cdt.releng/platform/customTargets.xml 2004-07-23 12:53:33.000000000 -0600
-+++ platform/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
-@@ -9,13 +9,39 @@
- <!-- Run a given ${target} on all elements being built -->
- <!-- Add on <ant> task for each top level element being built. -->
- <!-- ===================================================================== -->
-+
- <target name="allElements">
-+ <antcall target="${target}ForAllElements"/>
-+</target>
-+
-+<target name="fetchElementForAllElements" unless="dontFetchAnything">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="generateScriptForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="processElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="assembleElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="cleanElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="genericAllElements">
- <ant antfile="${genericTargets}" target="${target}" >
- <property name="type" value="feature" />
- <property name="id" value="org.eclipse.cdt" />
- </ant>
- </target>
-
-+
- <!-- ===================================================================== -->
- <!-- Targets to assemble the built elements for particular configurations -->
- <!-- These generally call the generated assemble scripts (named in -->
---- /home/tromey/OS/rpms/eclipse-cdt/eclipse-cdt-2.0/org.eclipse.cdt.releng/sdk/customTargets.xml 2004-07-23 12:53:33.000000000 -0600
-+++ sdk/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
-@@ -10,12 +10,38 @@
- <!-- Add on <ant> task for each top level element being built. -->
- <!-- ===================================================================== -->
- <target name="allElements">
-+ <antcall target="${target}ForAllElements"/>
-+</target>
-+
-+<target name="fetchElementForAllElements" unless="dontFetchAnything">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="generateScriptForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="processElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="assembleElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="cleanElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="genericAllElements">
- <ant antfile="${genericTargets}" target="${target}" >
- <property name="type" value="feature" />
- <property name="id" value="org.eclipse.cdt.sdk" />
- </ant>
- </target>
-
-+
-+
- <!-- ===================================================================== -->
- <!-- Targets to assemble the built elements for particular configurations -->
- <!-- These generally call the generated assemble scripts (named in -->
---- /home/tromey/OS/rpms/eclipse-cdt/eclipse-cdt-2.0/org.eclipse.cdt.releng/testing/customTargets.xml 2004-03-08 11:41:52.000000000 -0700
-+++ testing/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
-@@ -10,12 +10,37 @@
- <!-- Add on <ant> task for each top level element being built. -->
- <!-- ===================================================================== -->
- <target name="allElements">
-+ <antcall target="${target}ForAllElements"/>
-+</target>
-+
-+<target name="fetchElementForAllElements" unless="dontFetchAnything">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="generateScriptForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="processElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="assembleElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="cleanElementForAllElements">
-+ <antcall target="genericAllElements"/>
-+</target>
-+
-+<target name="genericAllElements">
- <ant antfile="${genericTargets}" target="${target}" >
- <property name="type" value="feature" />
- <property name="id" value="org.eclipse.cdt.testing" />
- </ant>
- </target>
-
-+
- <!-- ===================================================================== -->
- <!-- Targets to assemble the built elements for particular configurations -->
- <!-- These generally call the generated assemble scripts (named in -->
diff --git a/debian/patches/eclipse-cdt-no-tests.patch b/debian/patches/eclipse-cdt-no-tests.patch
deleted file mode 100644
index f3931df..0000000
--- a/debian/patches/eclipse-cdt-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig 2006-06-08 11:34:05.000000000 -0400
-+++ build.xml 2006-06-08 11:57:56.000000000 -0400
-@@ -4,7 +4,7 @@
- <echo message="${eclipse.home}"/>
- </target>
-
-- <target name="build" depends="zips,test"/>
-+ <target name="build" depends="zips"/>
- <target name="nightly" depends="tag,zips,test,copy"/>
- <target name="cdtbuild" depends="tag,zips,test,upload"/>
-
diff --git a/debian/patches/eclipse-cdt-scannerinfoplus.patch b/debian/patches/eclipse-cdt-scannerinfoplus.patch
deleted file mode 100644
index 729bb75..0000000
--- a/debian/patches/eclipse-cdt-scannerinfoplus.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- ./results/plugins/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScannerInfoPlus.java.fix 2006-08-29 14:28:17.000000000 -0400
-+++ ./results/plugins/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScannerInfoPlus.java 2006-08-29 14:28:54.000000000 -0400
-@@ -0,0 +1,16 @@
-+package org.eclipse.cdt.core.parser;
-+
-+import org.eclipse.core.resources.IFile;
-+import org.eclipse.core.resources.IResource;
-+
-+public interface IScannerInfoPlus extends IScannerInfo {
-+
-+ /**
-+ * Map an open include file as being included by a specific resource.
-+ *
-+ * @param include the include file
-+ * @param res the resource that included the include file
-+ */
-+ public void createIncludeChain(IFile include, IResource res);
-+
-+}
---- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java.fix 2006-08-29 14:32:46.000000000 -0400
-+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java 2006-08-29 14:33:19.000000000 -0400
-@@ -24,6 +24,7 @@ import org.eclipse.cdt.core.model.ICElem
- import org.eclipse.cdt.core.model.ICProject;
- import org.eclipse.cdt.core.model.ITranslationUnit;
- import org.eclipse.cdt.core.parser.IScannerInfo;
-+import org.eclipse.cdt.core.parser.IScannerInfoPlus;
- import org.eclipse.cdt.core.parser.IScannerInfoProvider;
- import org.eclipse.cdt.internal.ui.CPluginImages;
- import org.eclipse.cdt.internal.ui.dialogs.ElementListSelectionDialog;
-@@ -37,8 +38,10 @@ import org.eclipse.core.resources.IResou
- import org.eclipse.core.resources.IResourceProxyVisitor;
- import org.eclipse.core.resources.ResourcesPlugin;
- import org.eclipse.core.runtime.CoreException;
-+import org.eclipse.core.runtime.IConfigurationElement;
- import org.eclipse.core.runtime.IPath;
- import org.eclipse.core.runtime.Path;
-+import org.eclipse.core.runtime.QualifiedName;
- import org.eclipse.jface.action.Action;
- import org.eclipse.jface.viewers.ILabelProvider;
- import org.eclipse.jface.viewers.ISelection;
-@@ -79,17 +82,16 @@ public class OpenIncludeAction extends A
- if (include == null) {
- return;
- }
--
- try {
- IResource res = include.getUnderlyingResource();
-+ IScannerInfo info = null;
- ArrayList filesFound = new ArrayList(4);
- if (res != null) {
- IProject proj = res.getProject();
- String includeName = include.getElementName();
-- // Search in the scannerInfo information
-- IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(proj);
-+ IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(proj);
- if (provider != null) {
-- IScannerInfo info = provider.getScannerInformation(res);
-+ info = provider.getScannerInformation(res);
- // XXXX this should fall back to project by itself
- if (info == null) {
- info = provider.getScannerInformation(proj);
-@@ -110,7 +112,7 @@ public class OpenIncludeAction extends A
- if (nElementsFound == 0) {
- noElementsFound();
- fileToOpen= null;
-- } else if (nElementsFound == 1) {
-+ } else if (nElementsFound == 1 || info instanceof IScannerInfoPlus) {
- fileToOpen= (IPath) filesFound.get(0);
- } else {
- fileToOpen= chooseFile(filesFound);
-@@ -119,6 +121,11 @@ public class OpenIncludeAction extends A
- if (fileToOpen != null) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(fileToOpen);
- if (file != null) {
-+ // If dealing with an IScannerInfoPlus, we want to register
-+ // the resource with the include file it includes.
-+ if (info instanceof IScannerInfoPlus) {
-+ ((IScannerInfoPlus)info).createIncludeChain(file, res);
-+ }
- EditorUtility.openInEditor(file);
- } else {
- ICProject cproject = include.getCProject();
diff --git a/debian/rules b/debian/rules
index 0de5021..6f3f979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,177 +1,5 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh --with eclipse-helper $@
-export LC_ALL=C
-CURDIR=$(shell pwd)
-
-SOURCE=$(shell echo upstream/*.tar.bz2)
-SOURCE_TREE=source-tree
-JAVA_HOME=/usr/lib/jvm/default-java
-export JAVA_HOME
-JAVA_RUN=$(JAVA_HOME)/bin/java
-ANT_RUN=ant
-homedir=$(CURDIR)/home
-ECLIPSE_BASE=/usr/lib/eclipse
-ECLIPSE_PLATFORM=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq ($(DEB_HOST_ARCH),i386)
- ECLIPSE_PLATFORM=x86
-endif
-ifeq ($(DEB_HOST_ARCH),ia64)
- ECLIPSE_PLATFORM=ia64
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
- ECLIPSE_PLATFORM=x86_64
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
- ECLIPSE_PLATFORM=ppc
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
- ECLIPSE_PLATFORM=s390
-endif
-
-RELENG := org.eclipse.cdt.releng
-PLUGINS := $(SOURCE_TREE)/$(RELENG)/results/plugins
-CDT_LNX := $(PLUGINS)/org.eclipse.cdt.core.linux
-
-PATCHES = \
- eclipse-cdt-build-linux \
- eclipse-cdt-build-on-sparc-s390 \
- eclipse-cdt-no-cvs2 \
- eclipse-cdt-no-tests \
- eclipse-cdt-buildconsole \
- eclipse-cdt-scannerinfoplus \
- eclipse-cdt-definedsymbolhover \
- eclipse-cdt-managedbuild-failcheck
-
-clean:
- dh_testdir
- rm -rf $(SOURCE_TREE) $(homedir) debian/tmp debian/eclipse-cdt
- rm -f *-stamp
- dh_clean
-
-uncompress: uncompress-stamp
-uncompress-stamp: debian/control
- dh_testdir
- # The building happens inside the source-tree directory. This makes
- # cleanup much easier.
- mkdir -p "$(SOURCE_TREE)"
- (cd "$(SOURCE_TREE)" && tar xjf ../"$(SOURCE)" > /dev/null)
-
- touch uncompress-stamp
-
-patch: patch-stamp
-patch-stamp: uncompress-stamp
- dh_testdir
- # This patch system was orginally copied off of the one found in cdbs.
- @cd $(SOURCE_TREE)/$(RELENG); \
- test $$(find $(CURDIR)/debian/patches/ -maxdepth 1 -name '*.patch' | wc -l) -eq 0 && exit 0; \
- for patchname in $(PATCHES); do \
- patch=$(CURDIR)/debian/patches/$$patchname.patch; \
- success=""; \
- echo -n "trying patch $$patchname at level "; \
- for level in 0 1 2 3; do \
- if test -z "$$success"; then \
- echo -n "$$level..."; \
- if patch -f -p$$level -E --dry-run < $$patch > /dev/null 2>&1; then \
- if patch -f -p$$level -E -V never < $$patch > /dev/null 2>&1; then \
- success=yes; \
- echo "success."; \
- fi; \
- fi; \
- fi; \
- done; \
- if test -z "$$success"; then \
- echo "failure."; \
- exit 1; \
- fi; \
- done
-
- sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i $(CURDIR)/$(SOURCE_TREE)/$(RELENG)/platform/build.properties
- sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i $(CURDIR)/$(SOURCE_TREE)/$(RELENG)/sdk/build.properties
- touch patch-stamp
-
-prepare: prepare-stamp
-prepare-stamp: patch-stamp
- dh_testdir
- # Copy ia64 configuration for unsupported arches. Based on eclipse trick.
- for arch in ppc64 s390 s390x sparc sparc64 ; do \
- cp -a $(CDT_LNX).ia64 $(CDT_LNX).$$arch ; \
- rm -Rf $(CDT_LNX).$$arch/os/linux/ia64 ; \
- mkdir $(CDT_LNX).$$arch/os/linux/$$arch ; \
- find $(CDT_LNX).$$arch -type f -exec sed --in-place "s,ia64,$$arch,g" "{}" \; ; \
- done
-
- touch $@
-
-build: build-stamp
-build-stamp: prepare-stamp
- dh_testdir
- # Create home.
- mkdir -p home
- # build native code.
- cd $(PLUGINS)/org.eclipse.cdt.core.linux/library && make ARCH=$(ECLIPSE_PLATFORM) CC='gcc -D_GNU_SOURCE'
- # add a missing icon before launching the build
- uudecode -o /dev/stdout debian/eclipse-cdt-target_filter.gif.gz.uu | \
- gzip -dc - > $(SOURCE_TREE)/$(RELENG)/results/plugins/org.eclipse.cdt.make.ui/icons/dtool16/eclipse-cdt-target_filter.gif
- # Call eclipse headless to process CDT releng build scripts
- cd $(SOURCE_TREE)/$(RELENG) && \
- $(JAVA_RUN) -cp $(ECLIPSE_BASE)/startup.jar \
- -Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration \
- -Duser.home=$(homedir) \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -DjavacFailOnError=true \
- -DdontUnzip=true \
- -DbaseLocation=$(ECLIPSE_BASE) \
- -Dpde.build.scripts=$(ECLIPSE_BASE)/plugins/org.eclipse.pde.build_3.2.1.r321_v20060823/scripts \
- -DdontFetchAnything=true \
- -Dconfigs="linux,gtk,$(ECLIPSE_PLATFORM)" \
- -Dbaseos=linux \
- -Dbasews=gtk \
- -Dbasearch=$(ECLIPSE_PLATFORM)
- touch build-stamp
-
-
-install: install-stamp
-install-stamp: build
- dh_testdir
- dh_testroot
- # Install the tar file into our destination directory.
- install -d debian/tmp/$(ECLIPSE_BASE)
- tar xzf $(SOURCE_TREE)/$(RELENG)/results/I.*/org.eclipse.cdt.sdk*.$(ECLIPSE_PLATFORM).tar.gz -C debian/tmp/$(ECLIPSE_BASE)/..
- dh_installdirs
- dh_install
- touch install-stamp
-
-binary-indep: install
- # Nothing to do here.
-
-binary-arch: install
- dh_testdir -a
- dh_testroot -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installmenu -a
- dh_installman -a
- dh_installinfo -a
- dh_installchangelogs -a
- dh_link -a
- dh_fixperms -a
- dh_strip -a
- dh_compress -a
- dh_shlibdeps -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-get-orig-source:
- sh debian/get-orig-source
-
-binary: binary-indep binary-arch
-.PHONY: binary binary-arch binary-indep install clean build prepare uncompress patch
hooks/post-receive
--
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.
More information about the pkg-java-commits
mailing list