Skip to main content
summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMarc-Andre Laperle2012-01-15 02:48:01 -0500
committerMarc-Andre Laperle2012-01-15 03:10:29 -0500
commit43c82a33663c4f1cf77def92739241a0a4addf7e (patch)
tree0fc115d40ecf0aacffa50e404cf4c2380c4007cf /doc
parentd81d0b24e75afe2e5463a81d8b1049059ceadca4 (diff)
downloadorg.eclipse.cdt-43c82a33663c4f1cf77def92739241a0a4addf7e.tar.gz
org.eclipse.cdt-43c82a33663c4f1cf77def92739241a0a4addf7e.tar.xz
org.eclipse.cdt-43c82a33663c4f1cf77def92739241a0a4addf7e.zip
Bug 350828 - CDT doc bundles should include a pre-built help index.
Also restore building javadoc and extension documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/org.eclipse.cdt.doc.isv/cdtOptions4
-rw-r--r--doc/org.eclipse.cdt.doc.isv/cdtOptions.txt4
-rw-r--r--doc/org.eclipse.cdt.doc.isv/pom.xml38
-rw-r--r--doc/org.eclipse.cdt.doc.user/pom.xml34
4 files changed, 76 insertions, 4 deletions
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions b/doc/org.eclipse.cdt.doc.isv/cdtOptions
index 5eb0dafc0e..04d754ef85 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 "../org.eclipse.cdt.core/model:../org.eclipse.cdt.core/search:../org.eclipse.cdt.core/parser:../org.eclipse.cdt.debug.core/cdi"
+-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"
-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
@@ -8,7 +8,7 @@
-windowtitle "Eclipse CDT API Specification"
-doctitle "Eclipse CDT API Specification"
-header "<strong>Eclipse CDT</strong><br>7.0"
--bottom "Copyright (c) IBM Corp. and others 2004, 2010. All Rights Reserved."
+-bottom "Copyright (c) IBM Corp. and others 2004, 2012. 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
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
index 5025d71f88..d3c77dd642 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 "../org.eclipse.cdt.core/model;../org.eclipse.cdt.core/search;../org.eclipse.cdt.core/parser;../org.eclipse.cdt.debug.core/cdi"
+-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"
-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
@@ -8,7 +8,7 @@
-windowtitle "Eclipse CDT API Specification"
-doctitle "Eclipse CDT API Specification"
-header "<strong>Eclipse CDT</strong><br>7.0"
--bottom "Copyright (c) IBM Corp. and others 2004, 2010. All Rights Reserved."
+-bottom "Copyright (c) IBM Corp. and others 2004, 2012. 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
diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml
index 3de5e81be7..ae3dcfb2fa 100644
--- a/doc/org.eclipse.cdt.doc.isv/pom.xml
+++ b/doc/org.eclipse.cdt.doc.isv/pom.xml
@@ -14,6 +14,14 @@
<artifactId>org.eclipse.cdt.doc.isv</artifactId>
<packaging>eclipse-plugin</packaging>
+ <!-- Remove when the tycho-eclipserun-plugin is in Maven central repo -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>oss-sonatype-releases</id>
+ <url>https://oss.sonatype.org/content/repositories/releases/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -31,6 +39,36 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.google.code.tycho-eclipserun-plugin</groupId>
+ <artifactId>tycho-eclipserun-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine>
+ <dependencies>
+ <dependency>
+ <artifactId>org.apache.ant</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.eclipse.help.base</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.eclipse.pde.core</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ </dependencies>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>eclipse-run</goal>
+ </goals>
+ <phase>compile</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml
index bdf0f4354b..97a3ae61da 100644
--- a/doc/org.eclipse.cdt.doc.user/pom.xml
+++ b/doc/org.eclipse.cdt.doc.user/pom.xml
@@ -13,6 +13,14 @@
<version>5.2.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.doc.user</artifactId>
<packaging>eclipse-plugin</packaging>
+
+ <!-- Remove when the tycho-eclipserun-plugin is in Maven central repo -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>oss-sonatype-releases</id>
+ <url>https://oss.sonatype.org/content/repositories/releases/</url>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<plugins>
@@ -31,6 +39,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.google.code.tycho-eclipserun-plugin</groupId>
+ <artifactId>tycho-eclipserun-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
+ <dependencies>
+ <dependency>
+ <artifactId>org.apache.ant</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.eclipse.help.base</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ </dependencies>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>eclipse-run</goal>
+ </goals>
+ <phase>compile</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>

Back to the top