From ca8cc6e1e3efd0e330a525d418abeb8a989cb8b2 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Tue, 27 May 2014 18:30:20 +0200 Subject: [PATCH] Bug 435887 - Update cdt.doc.isv The org.eclipse.cdt.doc.isv bundle had not been updated since Juno. This commit adapts to the changes from bug 303083, and does some more updates to comply with CDT 8.4 Luna: 1. Update the doc.isv bundle version number - I deliberately jumped from 5.2.0 to 5.4.0 in order to leave room for a Kepler version (not sure if it is a good idea to leave out a version) 2. Update CDT Release name to "8.4 (Luna)" and Coppyright Date (2014) 3. Update link to Oracle Java Docs since BREE is now Java 7 4. Add org.eclipse.cdt.core.native to the sourcepath for Javadocs 5. Add o.e.cdt.util.spawner and o.e.cdt.util.pty packages to API docs 6. Remove org.eclipse.cdt.core/search from the source path list That source folder had been removed 8 years ago when PDOM came :) 7. Fix an XHTML validation error in about.html that made it not possible to view Legal Notices from the docs link There might be more CDT API packages that our community currently uses and that are not yet generated into the API docs. Adding them should be easy if that's desired, but I noticed that in many cases the Javadocs themselves are somewhat weak so I didn't want to expose them without the code owner's approval. Change-Id: I6c16aed4408d83994075a9b0505bc7d3e68b11d1 Signed-off-by: Martin Oberhuber Reviewed-on: https://git.eclipse.org/r/27401 Tested-by: Hudson CI Reviewed-by: Doug Schaefer --- doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF | 2 +- doc/org.eclipse.cdt.doc.isv/about.html | 14 +++++++++----- doc/org.eclipse.cdt.doc.isv/cdtOptions | 11 +++++++---- doc/org.eclipse.cdt.doc.isv/cdtOptions.txt | 11 +++++++---- doc/org.eclipse.cdt.doc.isv/notices.html | 2 +- doc/org.eclipse.cdt.doc.isv/pom.xml | 2 +- doc/org.eclipse.cdt.doc.isv/topics_Reference.xml | 2 ++ 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF index 3bb2c36fb44..26395722c50 100644 --- a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true -Bundle-Version: 5.2.0.qualifier +Bundle-Version: 5.4.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/doc/org.eclipse.cdt.doc.isv/about.html b/doc/org.eclipse.cdt.doc.isv/about.html index 6993759237d..a47c46b1c18 100644 --- a/doc/org.eclipse.cdt.doc.isv/about.html +++ b/doc/org.eclipse.cdt.doc.isv/about.html @@ -1,7 +1,10 @@ - - -About - + + + + +About +

About This Content

@@ -21,4 +24,5 @@ provided with the Content. If no such license exists, contact the Redistributor indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at http://www.eclipse.org.

- \ No newline at end of file + + \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions b/doc/org.eclipse.cdt.doc.isv/cdtOptions index 04d754ef859..56c723d9fac 100644 --- a/doc/org.eclipse.cdt.doc.isv/cdtOptions +++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions @@ -1,5 +1,5 @@ -charset "iso-8859-1" --sourcepath "../../core/org.eclipse.cdt.core/model:../../core/org.eclipse.cdt.core/search:../../core/org.eclipse.cdt.core/parser:../../debug/org.eclipse.cdt.debug.core/cdi" +-sourcepath "../../core/org.eclipse.cdt.core.native/src:../../core/org.eclipse.cdt.core/model:../../core/org.eclipse.cdt.core/parser:../../debug/org.eclipse.cdt.debug.core/cdi" -d reference/api -classpath ${bootclasspath}:../org.apache.ant/lib/ant.jar:../org.eclipse.debug.core/dtcore.jar:../org.eclipse.compare/compare.jar:../org.eclipse.help/help.jar:../org.eclipse.help.ui/helpworkbench.jar:../org.eclipse.core.resources/resources.jar:../org.eclipse.core.runtime/runtime.jar:../org.eclipse.core.filebuffers/filebuffers.jar:../org.eclipse.core.expressions/expressions.jar:../org.eclipse.swt.win32/ws/win32/swt.jar:../org.eclipse.swt.motif/ws/motif/swt.jar:../org.eclipse.ui/ui.jar:../org.eclipse.jdt.debug/jdi.jar:../org.eclipse.debug.ui/dtui.jar:../org.eclipse.search/search.jar:../org.eclipse.jface/jface.jar:../org.eclipse.jface.text/jfacetext.jar:../org.eclipse.text/text.jar:../org.eclipse.ui.editors/editors.jar:../org.eclipse.ui.views/views.jar:../org.eclipse.ui.workbench/workbench.jar:../org.eclipse.ui.workbench.texteditor/texteditor.jar:../org.eclipse.core.variables/variables.jar:../org.eclipse.ui.ide/ide.jar:../org.eclipse.jdt.junit/junitsupport.jar:../org.eclipse.osgi/osgi.jar:../org.eclipse.osgi/core.jar:../org.eclipse.osgi/eclipseAdaptor.jar:../org.eclipse.osgi.services/services.jar:../org.eclipse.osgi.util/util.jar -breakiterator @@ -7,12 +7,13 @@ -splitIndex -windowtitle "Eclipse CDT API Specification" -doctitle "Eclipse CDT API Specification" --header "Eclipse CDT
7.0" --bottom "Copyright (c) IBM Corp. and others 2004, 2012. All Rights Reserved." +-header "Eclipse CDT
8.4 (Luna)" +-bottom "Copyright (c) IBM Corp. and others 2004, 2014. All Rights Reserved." -group "C/C++ Development Tools Core Plug-in Packages" "org.eclipse.cdt.core:org.eclipse.cdt.core.*" -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core:org.eclipse.cdt.debug.core.*" --link http://java.sun.com/j2se/1.4/docs/api +-link http://docs.oracle.com/javase/7/docs/api/ +org.eclipse.cdt.core org.eclipse.cdt.core.model org.eclipse.cdt.core.search org.eclipse.cdt.core.dom.ast @@ -25,3 +26,5 @@ org.eclipse.cdt.debug.core.cdi org.eclipse.cdt.debug.core.cdi.event org.eclipse.cdt.debug.core.cdi.model org.eclipse.cdt.debug.core.cdi.model.type +org.eclipse.cdt.utils.pty +org.eclipse.cdt.utils.spawner diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt index d3c77dd6420..49a3bb091e9 100644 --- a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt +++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt @@ -1,5 +1,5 @@ -charset "iso-8859-1" --sourcepath "../../core/org.eclipse.cdt.core/model;../../core/org.eclipse.cdt.core/search;../../core/org.eclipse.cdt.core/parser;../../debug/org.eclipse.cdt.debug.core/cdi" +-sourcepath "../../core/org.eclipse.cdt.core.native/src;../../core/org.eclipse.cdt.core/model;../../core/org.eclipse.cdt.core/parser;../../debug/org.eclipse.cdt.debug.core/cdi" -d reference/api -classpath ${bootclasspath};../org.apache.ant/lib/ant.jar;../org.eclipse.debug.core/dtcore.jar;../org.eclipse.compare/compare.jar;../org.eclipse.help/help.jar;../org.eclipse.help.ui/helpworkbench.jar;../org.eclipse.core.resources/resources.jar;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.filebuffers/filebuffers.jar;../org.eclipse.core.expressions/expressions.jar;../org.eclipse.swt.win32/ws/win32/swt.jar;../org.eclipse.swt.motif/ws/motif/swt.jar;../org.eclipse.ui/ui.jar;../org.eclipse.jdt.debug/jdi.jar;../org.eclipse.debug.ui/dtui.jar;../org.eclipse.search/search.jar;../org.eclipse.jface/jface.jar;../org.eclipse.jface.text/jfacetext.jar;../org.eclipse.text/text.jar;../org.eclipse.ui.editors/editors.jar;../org.eclipse.ui.views/views.jar;../org.eclipse.ui.workbench/workbench.jar;../org.eclipse.ui.workbench.texteditor/texteditor.jar;../org.eclipse.core.variables/variables.jar;../org.eclipse.ui.ide/ide.jar;../org.eclipse.jdt.junit/junitsupport.jar;../org.eclipse.osgi/osgi.jar;../org.eclipse.osgi/core.jar;../org.eclipse.osgi/eclipseAdaptor.jar;../org.eclipse.osgi.services/services.jar;../org.eclipse.osgi.util/util.jar -breakiterator @@ -7,12 +7,13 @@ -splitIndex -windowtitle "Eclipse CDT API Specification" -doctitle "Eclipse CDT API Specification" --header "Eclipse CDT
7.0" --bottom "Copyright (c) IBM Corp. and others 2004, 2012. All Rights Reserved." +-header "Eclipse CDT
8.4 (Luna)" +-bottom "Copyright (c) IBM Corp. and others 2004, 2014. All Rights Reserved." -group "C/C++ Development Tools Core Plug-in Packages" "org.eclipse.cdt.core;org.eclipse.cdt.core.*" -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core;org.eclipse.cdt.debug.core.*" --link http://java.sun.com/j2se/1.4/docs/api +-link http://docs.oracle.com/javase/7/docs/api/ +org.eclipse.cdt.core org.eclipse.cdt.core.model org.eclipse.cdt.core.search org.eclipse.cdt.core.dom.ast @@ -25,3 +26,5 @@ org.eclipse.cdt.debug.core.cdi org.eclipse.cdt.debug.core.cdi.event org.eclipse.cdt.debug.core.cdi.model org.eclipse.cdt.debug.core.cdi.model.type +org.eclipse.cdt.utils.pty +org.eclipse.cdt.utils.spawner diff --git a/doc/org.eclipse.cdt.doc.isv/notices.html b/doc/org.eclipse.cdt.doc.isv/notices.html index e36cc9a5b8e..a67817f73cc 100644 --- a/doc/org.eclipse.cdt.doc.isv/notices.html +++ b/doc/org.eclipse.cdt.doc.isv/notices.html @@ -12,7 +12,7 @@ Notices

The material in this guide is Copyright (c) IBM Corporation and others -2004, 2010. +2004, 2014.

Terms and conditions regarding the use of this diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml index 598b1b2e936..80c7c24adfb 100644 --- a/doc/org.eclipse.cdt.doc.isv/pom.xml +++ b/doc/org.eclipse.cdt.doc.isv/pom.xml @@ -10,7 +10,7 @@ ../../pom.xml - 5.2.0-SNAPSHOT + 5.4.0-SNAPSHOT org.eclipse.cdt.doc.isv eclipse-plugin diff --git a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml index c7c25170bb8..1baeb6550b3 100644 --- a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml @@ -16,6 +16,8 @@ + +