diff --git a/.cvsignore b/.cvsignore index b3c2105..7ca0e5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ eclipse-cdt-fetched-src-3.1.0.tar.bz2 eclipse-cdt-autotools-0.0.3.tar.gz +eclipse-cdt-autotools-0.0.4.tar.gz diff --git a/eclipse-cdt-scannerinfoplus.patch b/eclipse-cdt-scannerinfoplus.patch new file mode 100644 index 0000000..729bb75 --- /dev/null +++ b/eclipse-cdt-scannerinfoplus.patch @@ -0,0 +1,82 @@ +--- ./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/eclipse-cdt.spec b/eclipse-cdt.spec index d1aa29c..9fe98de 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -21,7 +21,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: %{eclipse_name}-cdt Version: %{majmin}.%{micro} -Release: 1jpp_12fc +Release: 1jpp_13fc License: Eclipse Public License - v 1.0 (EPL) Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/cdt @@ -43,16 +43,14 @@ Requires: eclipse-platform # -DdontUnzip=true fetch # cd .. && tar jcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng Source0: %{name}-fetched-src-%{version}.tar.bz2 -Source1: %{name}-autotools-0.0.3.tar.gz +Source1: %{name}-autotools-0.0.4.tar.gz Patch1: %{name}-no-cvs2-patch Patch2: %{name}-platform-build-linux.patch Patch3: %{name}-sdk-build-linux.patch Patch4: %{name}-no-tests.patch -Patch5: %{name}-dynamic-scannerinfo-ext.patch -Patch6: %{name}-libhover-jar.patch -Patch7: %{name}-mm-builder.patch -Patch8: %{name}-configuration.patch +Patch5: %{name}-subconsole.patch +Patch6: %{name}-scannerinfoplus.patch BuildRequires: eclipse-pde %if %{gcj_support} @@ -94,6 +92,7 @@ pushd "org.eclipse.cdt.releng" %patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p0 popd # Autotools stuff @@ -101,9 +100,6 @@ popd mkdir autotools pushd autotools tar -xzf %{SOURCE1} -%patch6 -p0 -%patch7 -p0 -%patch8 -p0 popd # Upstream CVS includes random .so files. Let's remove them now. @@ -272,6 +268,11 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue Aug 29 2006 Jeff Johnston 3.1.0-1jpp_13fc +- Rebase autotools to 0.0.4 source. +- Use ScannerInfoProvider extension instead of DynamicScannerInfoProvider. +- Add sub-console support to CDT. + * Mon Aug 21 2006 Jeff Johnston 3.1.0-1jpp_12fc - Fix build special targets when project hasn't configured yet. - Fix to fully reconfigure after configuration options change. diff --git a/sources b/sources index 2aad39a..d913601 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 8ea0a06e13227728d3922bab3496509e eclipse-cdt-fetched-src-3.1.0.tar.bz2 -c475012b6bf7e3cd3aea20a690b50c15 eclipse-cdt-autotools-0.0.3.tar.gz +1402fa414d57828fc1d55f72048d05d0 eclipse-cdt-autotools-0.0.4.tar.gz