rpms/eclipse-cdt/F-11 eclipse-cdt-libhover-oldcdt.patch, 1.1, 1.2 eclipse-cdt.spec, 1.125, 1.126
Jeff Johnston
jjohnstn at fedoraproject.org
Fri Oct 2 19:42:29 UTC 2009
- Previous message: rpms/mdadm/F-12 .cvsignore, 1.25, 1.26 mdadm.spec, 1.74, 1.75 mdmonitor.init, 1.8, 1.9 sources, 1.25, 1.26
- Next message: rpms/mdadm/F-12 mdadm-3.0-mdmon-dev-.mdadm.patch, NONE, 1.1 mdadm-3.0-rh526761.patch, NONE, 1.1 mdadm-3.0-calloc.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2912
Modified Files:
eclipse-cdt-libhover-oldcdt.patch eclipse-cdt.spec
Log Message:
Another scratch build.
eclipse-cdt-libhover-oldcdt.patch:
META-INF/MANIFEST.MF | 1
src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java | 1
src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java | 388 +++++-----
src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java | 10
4 files changed, 209 insertions(+), 191 deletions(-)
Index: eclipse-cdt-libhover-oldcdt.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt-libhover-oldcdt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-libhover-oldcdt.patch 2 Oct 2009 18:58:22 -0000 1.1
+++ eclipse-cdt-libhover-oldcdt.patch 2 Oct 2009 19:42:26 -0000 1.2
@@ -1,14 +1,14 @@
diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
---- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix 2009-10-02 14:32:05.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF 2009-10-02 14:33:28.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix 2009-10-02 15:31:47.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF 2009-10-02 15:32:51.000000000 -0400
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jface.text;bundle-version="3.4.1"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix 2009-10-02 14:32:28.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java 2009-10-02 14:33:28.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix 2009-10-02 15:32:06.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java 2009-10-02 15:32:51.000000000 -0400
@@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
* The constructor
*/
@@ -18,8 +18,8 @@ diff -up ./org.eclipse.linuxtools.cdt.li
/*
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix 2009-10-02 14:32:44.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java 2009-10-02 14:41:53.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix 2009-10-02 15:32:21.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java 2009-10-02 15:39:10.000000000 -0400
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc.
@@ -27,7 +27,16 @@ diff -up ./org.eclipse.linuxtools.cdt.li
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
-@@ -213,44 +213,44 @@ public class LibHover implements ICHelpP
+@@ -49,8 +49,6 @@ import org.eclipse.cdt.ui.ICHelpResource
+ import org.eclipse.cdt.ui.IFunctionSummary;
+ import org.eclipse.cdt.ui.IRequiredInclude;
+ import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
+-import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext;
+-import org.eclipse.cdt.ui.text.SharedASTJob;
+ import org.eclipse.core.runtime.IConfigurationElement;
+ import org.eclipse.core.runtime.IExtensionRegistry;
+ import org.eclipse.core.runtime.IStatus;
+@@ -213,44 +211,44 @@ public class LibHover implements ICHelpP
return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':';
}
@@ -110,12 +119,9 @@ diff -up ./org.eclipse.linuxtools.cdt.li
public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
IFunctionSummary f;
-@@ -264,146 +264,146 @@ public class LibHover implements ICHelpP
- ITranslationUnit t = context.getTranslationUnit();
-
+@@ -266,155 +264,155 @@ public class LibHover implements ICHelpP
String className = null;
-- ICPPFunctionType methodType = null;
-+// ICPPFunctionType methodType = null;
+ ICPPFunctionType methodType = null;
- if (t.isCXXLanguage()) {
- try {
@@ -396,7 +402,23 @@ diff -up ./org.eclipse.linuxtools.cdt.li
// Loop through all the documents we have and report first match.
for (int i = 0; i < helpBooks.length; ++i) {
-@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP
+ LibHoverLibrary l = libraries.get(helpBooks[i]);
+ if (name != null) {
+- if (className != null) {
+- if (l.isCPP())
+- f = getMemberSummary(l, className, name, methodType);
+- } else {
++// if (className != null) {
++// if (l.isCPP())
++// f = getMemberSummary(l, className, name, methodType);
++// } else {
+ f = getFunctionSummary(l, name);
+- }
++// }
+ if (f != null)
+ return f;
+ }
+@@ -451,7 +449,7 @@ public class LibHover implements ICHelpP
return null;
if (methodType != null) {
try {
@@ -405,7 +427,7 @@ diff -up ./org.eclipse.linuxtools.cdt.li
returnType = methodType.getReturnType();
} catch (DOMException e) {
// TODO Auto-generated catch block
-@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP
+@@ -465,11 +463,11 @@ public class LibHover implements ICHelpP
MemberInfo member = info.getMember(memberName);
if (member != null) {
MemberInfo m = null;
@@ -419,7 +441,7 @@ diff -up ./org.eclipse.linuxtools.cdt.li
m = k;
break;
}
-@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP
+@@ -513,12 +511,18 @@ public class LibHover implements ICHelpP
}
@@ -440,7 +462,7 @@ diff -up ./org.eclipse.linuxtools.cdt.li
String[] templateParms = info.getTemplateParms();
String[] result = new String[parameterTypes.length];
for (int i = 0; i < parameterTypes.length; ++i) {
-@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP
+@@ -529,7 +533,11 @@ public class LibHover implements ICHelpP
while (index >= 0) {
// We assume no class has more than 9 template parms.
int digit = param.charAt(index + 1) - '0';
@@ -454,8 +476,8 @@ diff -up ./org.eclipse.linuxtools.cdt.li
}
result[i] = param;
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix 2009-10-02 14:32:52.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java 2009-10-02 14:33:28.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix 2009-10-02 15:32:31.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java 2009-10-02 15:32:51.000000000 -0400
@@ -21,10 +21,12 @@ import java.net.URL;
import java.util.ArrayList;
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- eclipse-cdt.spec 2 Oct 2009 18:58:22 -0000 1.125
+++ eclipse-cdt.spec 2 Oct 2009 19:42:28 -0000 1.126
@@ -20,7 +20,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 5.1%{?dist}
+Release: 5.2%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
- Previous message: rpms/mdadm/F-12 .cvsignore, 1.25, 1.26 mdadm.spec, 1.74, 1.75 mdmonitor.init, 1.8, 1.9 sources, 1.25, 1.26
- Next message: rpms/mdadm/F-12 mdadm-3.0-mdmon-dev-.mdadm.patch, NONE, 1.1 mdadm-3.0-rh526761.patch, NONE, 1.1 mdadm-3.0-calloc.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list