aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-11-23 08:32:22 (EST)
committerPaul Webster2012-11-23 08:32:22 (EST)
commit137c945c93db0728a1a2ce913a6a5468eb956e98 (patch)
treeaf7c38492fcd6dbeb0fcec04f9c73632c87da008
parent432cc4369ab33b9997a546ba0de212321be57a98 (diff)
downloadeclipse.platform.common-137c945c93db0728a1a2ce913a6a5468eb956e98.zip
eclipse.platform.common-137c945c93db0728a1a2ce913a6a5468eb956e98.tar.gz
eclipse.platform.common-137c945c93db0728a1a2ce913a6a5468eb956e98.tar.bz2
Bug 390982 - Build documentation in CBI buildv20121123-133222M20121128-1200
Run the API doc generation.
-rw-r--r--bundles/org.eclipse.jdt.doc.isv/buildDoc.xml4
-rw-r--r--bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties15
-rw-r--r--bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt110
-rw-r--r--bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties14
-rw-r--r--bundles/org.eclipse.jdt.doc.isv/pom.xml43
-rw-r--r--bundles/org.eclipse.pde.doc.user/buildDoc.xml4
-rw-r--r--bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties20
-rw-r--r--bundles/org.eclipse.pde.doc.user/pdeOptions.txt98
-rw-r--r--bundles/org.eclipse.pde.doc.user/pde_basedirs.properties19
-rw-r--r--bundles/org.eclipse.pde.doc.user/pom.xml38
-rw-r--r--bundles/org.eclipse.platform.doc.isv/buildDoc.xml4
-rw-r--r--bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties4
-rw-r--r--bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties5
-rw-r--r--bundles/org.eclipse.platform.doc.isv/platformOptions.txt86
-rw-r--r--bundles/org.eclipse.platform.doc.isv/pom.xml193
15 files changed, 504 insertions, 153 deletions
diff --git a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
index 9ecae3f..5bcbb36 100644
--- a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
@@ -70,10 +70,10 @@
<!-- expand _* to actual version -->
<!-- prepare ${replaceFile} with all files and folders from workspace -->
- <fileset dir="${basedir}/.." id="fileSet">
+ <fileset dir="${basedir}/${dependency.dir}" id="fileSet">
<include name="*"/>
</fileset>
- <dirset dir="${basedir}/.." id="dirSet">
+ <dirset dir="${basedir}/${dependency.dir}" id="dirSet">
<include name="*"/>
</dirset>
<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
diff --git a/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties b/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
index a72f429..6781757 100644
--- a/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
+++ b/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
@@ -1,4 +1,19 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
eclipse.jdt.core=../../../eclipse.jdt.core
eclipse.jdt.ui=../../../eclipse.jdt.ui
eclipse.jdt.debug=../../../eclipse.jdt.debug
eclipse.platform.ant=../../../eclipse.platform/ant
+eclipse.platform.debug=../../../eclipse.platform.debug
+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
+eclipse.platform.text=../../../eclipse.platform.text
+eclipse.platform.ua=../../../eclipse.platform.ua
+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
+
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
diff --git a/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt b/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
index 721792c..0bd36f0 100644
--- a/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
+++ b/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
@@ -32,61 +32,61 @@
;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui refactoring"
-d reference/api
-classpath @rt@
-;../com.ibm.icu_*.jar
-;../org.apache.ant_*/lib/ant.jar
-;../org.eclipse.ant.core/@dot
-;../org.eclipse.compare/@dot
-;../org.eclipse.compare.core/@dot
-;../org.eclipse.core.commands/@dot
-;../org.eclipse.core.contenttype/@dot
-;../org.eclipse.core.expressions/@dot
-;../org.eclipse.core.externaltools/@dot
-;../org.eclipse.core.filebuffers/@dot
-;../org.eclipse.core.filesystem/@dot
-;../org.eclipse.core.jobs/@dot
-;../org.eclipse.core.resources/@dot
-;../org.eclipse.core.runtime/@dot
-;../org.eclipse.core.runtime.content/@dot
-;../org.eclipse.core.runtime.jobs/@dot
-;../org.eclipse.core.runtime.preferences/@dot
-;../org.eclipse.core.variables/@dot
-;../org.eclipse.debug.core/@dot
-;../org.eclipse.debug.ui/@dot
-;../org.eclipse.equinox.app/@dot
-;../org.eclipse.equinox.common/@dot
-;../org.eclipse.equinox.preferences/@dot
-;../org.eclipse.equinox.registry/@dot
-;../org.eclipse.equinox.supplement/@dot
-;../org.eclipse.help/@dot
-;../org.eclipse.help.ui/@dot
-;../org.eclipse.jdt.apt.core/mirrorapi.jar
-;../org.eclipse.jdt.core.manipulation/@dot
-;../org.eclipse.jdt.debug/jdi.jar
-;../org.eclipse.jdt.junit/@dot
-;../org.eclipse.jdt.junit.core/@dot
-;../org.eclipse.jface/@dot
-;../org.eclipse.jface.text/@dot
-;../org.eclipse.ltk.core.refactoring/@dot
-;../org.eclipse.ltk.ui.refactoring/@dot
-;../org.eclipse.osgi/@dot
-;../org.eclipse.osgi.services/@dot
-;../org.eclipse.osgi.util/@dot
-;../org.eclipse.search/@dot
-;../org.eclipse.swt.win32.win32.x86/@dot
-;../org.eclipse.team.core/@dot
-;../org.eclipse.team.ui/@dot
-;../org.eclipse.text/@dot
-;../org.eclipse.ui/@dot
-;../org.eclipse.ui.console/@dot
-;../org.eclipse.ui.editors/@dot
-;../org.eclipse.ui.externaltools/@dot
-;../org.eclipse.ui.forms/@dot
-;../org.eclipse.ui.ide/@dot
-;../org.eclipse.ui.navigator/@dot
-;../org.eclipse.ui.views/@dot
-;../org.eclipse.ui.workbench/@dot
-;../org.eclipse.ui.workbench.texteditor/@dot
-;../org.junit/junit.jar
+;@dependency.dir@/com.ibm.icu_*.jar
+;@dependency.dir@/@org.apache.ant.jar@
+;@eclipse.platform.ant@/org.eclipse.ant.core/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.core.externaltools/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.core.filebuffers/@dot.classes@
+;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
+;@eclipse.equinox.supplement@/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
+;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/mirrorapi.jar
+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/@dot.classes@
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.swt.win32.win32.x86/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.team.core/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.team.ui/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.ui.console/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.ui.externaltools/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
+;@dependency.dir@/org.junit/junit.jar
-breakiterator
-use
-splitIndex
diff --git a/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties b/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties
index a3076df..f671e17 100644
--- a/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties
+++ b/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties
@@ -1,5 +1,19 @@
+dot.classes=@dot
+dependency.dir=..
+
eclipse.jdt.core=..
eclipse.jdt.ui=..
eclipse.jdt.debug=..
eclipse.platform.ant=..
+eclipse.platform.debug=..
+eclipse.platform.resources.bundles=..
+eclipse.platform.runtime.bundles=..
+eclipse.platform.team.bundles=..
+eclipse.platform.text=..
+eclipse.platform.ua=..
+eclipse.platform.ui.bundles=..
+rt.equinox.bundles.bundles=..
+rt.equinox.framework.bundles=..
+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
+org.apache.ant.jar=org.apache.ant_*/lib/ant.jar
diff --git a/bundles/org.eclipse.jdt.doc.isv/pom.xml b/bundles/org.eclipse.jdt.doc.isv/pom.xml
index c6f4457..9f441ba 100644
--- a/bundles/org.eclipse.jdt.doc.isv/pom.xml
+++ b/bundles/org.eclipse.jdt.doc.isv/pom.xml
@@ -32,6 +32,49 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>com.ibm.icu</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.ant</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.junit</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <overwriteReleases>true</overwriteReleases>
+ <overwriteSnapshots>true</overwriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
diff --git a/bundles/org.eclipse.pde.doc.user/buildDoc.xml b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
index 3a03589..543ba83 100644
--- a/bundles/org.eclipse.pde.doc.user/buildDoc.xml
+++ b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
@@ -68,10 +68,10 @@
<!-- expand _* to actual version -->
<!-- prepare ${replaceFile} with all files and folders from workspace -->
- <fileset dir="${basedir}/.." id="fileSet">
+ <fileset dir="${basedir}/${dependency.dir}" id="fileSet">
<include name="*"/>
</fileset>
- <dirset dir="${basedir}/.." id="dirSet">
+ <dirset dir="${basedir}/${dependency.dir}" id="dirSet">
<include name="*"/>
</dirset>
<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
diff --git a/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties b/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
index e50ce12..4306cf0 100644
--- a/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
+++ b/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
@@ -1,2 +1,22 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
+eclipse.jdt.core=../../../eclipse.jdt.core
+eclipse.jdt.debug=../../../eclipse.jdt.debug
+eclipse.jdt.ui=../../../eclipse.jdt.ui
eclipse.pde.ui.ui=../../../eclipse.pde.ui/ui
eclipse.pde.build=../../../eclipse.pde.build
+eclipse.platform.debug=../../../eclipse.platform.debug
+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
+eclipse.platform.swt.binaries.bundles=../../../eclipse.platform.swt.binaries/bundles
+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
+eclipse.platform.text=../../../eclipse.platform.text
+eclipse.platform.ua=../../../eclipse.platform.ua
+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
+eclipse.platform.update=../../../eclipse.platform/update
+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
+rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
+
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
diff --git a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
index acc8116..c7eee99 100644
--- a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
+++ b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
@@ -6,55 +6,55 @@
;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/src"
-d reference/api
-classpath @rt@
-;../org.eclipse.compare/@dot
-;../org.eclipse.compare.core/@dot
-;../org.eclipse.core.boot/@dot
-;../org.eclipse.core.contenttype/@dot
-;../org.eclipse.core.jobs/@dot
-;../org.eclipse.core.resources/@dot
-;../org.eclipse.core.runtime/@dot
-;../org.eclipse.core.runtime.content/@dot
-;../org.eclipse.core.runtime.jobs/@dot
-;../org.eclipse.core.runtime.preferences/@dot
-;../org.eclipse.core.variables/@dot
-;../org.eclipse.debug.core/@dot
-;../org.eclipse.debug.ui/@dot
-;../org.eclipse.equinox.common/@dot
-;../org.eclipse.equinox.frameworkadmin/@dot
-;../org.eclipse.equinox.p2.metadata/@dot
-;../org.eclipse.equinox.p2.publisher.eclipse/@dot
-;../org.eclipse.equinox.preferences/@dot
-;../org.eclipse.equinox.registry/@dot
-;../org.eclipse.equinox.supplement/@dot
-;../org.eclipse.help/@dot
-;../org.eclipse.help.ui/@dot
-;../org.eclipse.jdt.core/@dot
-;../org.eclipse.jdt.debug/jdi.jar
-;../org.eclipse.jdt.debug.ui/@dot
-;../org.eclipse.jdt.junit/@dot
-;../org.eclipse.jdt.junit/junitsupport.jar
-;../org.eclipse.jdt.junit.core/@dot
-;../org.eclipse.jdt.launching/@dot
-;../org.eclipse.jdt.ui/@dot
-;../org.eclipse.jface/@dot
-;../org.eclipse.jface.text/@dot
-;../org.eclipse.osgi/@dot
-;../org.eclipse.osgi.services/@dot
-;../org.eclipse.osgi.util/@dot
-;../org.eclipse.pde.core/@dot
-;../org.eclipse.pde.ui/@dot
-;../org.eclipse.pde.build/@dot
-;../org.eclipse.pde.launching/@dot
-;../org.eclipse.search/@dot
-;../org.eclipse.swt.win32.win32.x86/@dot
-;../org.eclipse.text/@dot
-;../org.eclipse.ui/@dot
-;../org.eclipse.ui.editors/@dot
-;../org.eclipse.ui.ide/@dot
-;../org.eclipse.ui.views/@dot
-;../org.eclipse.ui.workbench/@dot
-;../org.eclipse.ui.workbench.texteditor/@dot
-;../org.eclipse.update.configurator/@dot
+;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.boot/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher.eclipse/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
+;@eclipse.equinox.supplement@/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
+;@eclipse.jdt.core@/org.eclipse.jdt.core/@dot.classes@
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/junitsupport.jar
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
+;@eclipse.jdt.debug@/org.eclipse.jdt.launching/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
+;@eclipse.pde.ui.ui@/org.eclipse.pde.core/@dot.classes@
+;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/@dot.classes@
+;@eclipse.pde.build@/org.eclipse.pde.build/@dot.classes@
+;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
+;@eclipse.platform.swt.binaries.bundles@/org.eclipse.swt.win32.win32.x86/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
+;@eclipse.platform.update@/org.eclipse.update.configurator/@dot.classes@
-breakiterator
-use
-splitIndex
diff --git a/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties b/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
index a5109ae..0349fe6 100644
--- a/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
+++ b/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
@@ -1,2 +1,21 @@
+dot.classes=@dot
+dependency.dir=..
+
+eclipse.jdt.core=..
+eclipse.jdt.debug=..
+eclipse.jdt.ui=..
eclipse.pde.ui.ui=..
eclipse.pde.build=..
+eclipse.platform.debug=..
+eclipse.platform.resources.bundles=..
+eclipse.platform.runtime.bundles=..
+eclipse.platform.team.bundles=..
+eclipse.platform.text=..
+eclipse.platform.ua=..
+eclipse.platform.ui=..
+eclipse.platform.update=..
+rt.equinox.bundles.bundles=..
+rt.equinox.framework.bundles=..
+rt.equinox.p2.bundles=..
+
+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
diff --git a/bundles/org.eclipse.pde.doc.user/pom.xml b/bundles/org.eclipse.pde.doc.user/pom.xml
index cfb11d6..2775289 100644
--- a/bundles/org.eclipse.pde.doc.user/pom.xml
+++ b/bundles/org.eclipse.pde.doc.user/pom.xml
@@ -33,6 +33,44 @@
<build>
<plugins>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jdt.debug</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jdt.junit</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <overwriteReleases>true</overwriteReleases>
+ <overwriteSnapshots>true</overwriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho.version}</version>
diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
index 33277ef..1d4a613 100644
--- a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -140,10 +140,10 @@
<!-- expand _* to actual version -->
<!-- prepare ${replaceFile} with all files and folders from workspace -->
- <fileset dir="${basedir}/.." id="fileSet">
+ <fileset dir="${basedir}/${dependency.dir}" id="fileSet">
<include name="*"/>
</fileset>
- <dirset dir="${basedir}/.." id="dirSet">
+ <dirset dir="${basedir}/${dependency.dir}" id="dirSet">
<include name="*"/>
</dirset>
<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
diff --git a/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties b/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
index 3c2cb13..8e80a10 100644
--- a/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
+++ b/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
@@ -1,3 +1,6 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
eclipse.jdt.ui=../../../eclipse.jdt.ui
eclipse.pde=../../../eclipse.pde
eclipse.platform.ant=../../../eclipse.platform/ant
@@ -18,3 +21,4 @@ eclipse.platform.team.examples=../../../eclipse.platform.team/examples
eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
diff --git a/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties b/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
index 071cbb5..4b93106 100644
--- a/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
+++ b/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
@@ -1,3 +1,6 @@
+dot.classes=@dot
+dependency.dir=..
+
eclipse.jdt.ui=..
eclipse.pde=..
eclipse.platform.ant=..
@@ -17,3 +20,5 @@ rt.equinox.p2.bundles=..
eclipse.platform.team.examples=..
eclipse.platform.swt.examples=..
eclipse.platform.ui.examples=..
+
+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index 53d405e..42f159b 100644
--- a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -131,49 +131,49 @@
;@eclipse.platform.update@/org.eclipse.update.configurator/src
-d reference/api
-classpath @rt@
-;../com.ibm.icu_*.jar
-;../com.jcraft.jsch_*.jar
-;../javax.annotation_*.jar
-;../javax.el_*.jar
-;../javax.inject_*.jar
-;../javax.servlet_*.jar
-;../javax.servlet.jsp_*.jar
-;../org.apache.ant_*/lib/ant.jar
-;../org.apache.batik.css_*.jar
-;../org.apache.jasper.glassfish_*.jar
-;../org.apache.lucene.analysis_*.jar
-;../org.apache.lucene.core_*.jar
-;../org.eclipse.core.runtime.compatibility.auth/@dot
-;../org.eclipse.ecf.provider.filetransfer_*.jar
-;../org.eclipse.ecf.filetransfer_*.jar
-;../org.eclipse.ecf_*.jar
-;../org.eclipse.ecf.ssl_*.jar
-;../org.eclipse.ecf.identity_*.jar
-;../org.eclipse.ecf.provider.filetransfer.ssl_*.jar
-;../org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
-;../org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
-;../org.eclipse.emf.common_*.jar
-;../org.eclipse.emf.ecore_*.jar
-;../org.eclipse.emf.ecore.xmi_*.jar
-;../org.eclipse.equinox.p2.director/@dot
-;../org.eclipse.equinox.p2.garbagecollector/@dot
-;../org.eclipse.equinox.p2.metadata.repository/@dot
-;../org.eclipse.equinox.p2.publisher/@dot
-;../org.eclipse.equinox.simpleconfigurator/@dot
-;../org.eclipse.equinox.supplement/@dot
-;../org.eclipse.help.appserver/@dot
-;../org.eclipse.osgi.services/@dot
-;../org.eclipse.osgi/@dot
-;../org.eclipse.jetty.continuation_*.jar
-;../org.eclipse.jetty.http_*.jar
-;../org.eclipse.jetty.io_*.jar
-;../org.eclipse.jetty.security_*.jar
-;../org.eclipse.jetty.server_*.jar
-;../org.eclipse.jetty.servlet_*.jar
-;../org.eclipse.jetty.util_*.jar
-;../org.sat4j.core_*.jar
-;../org.sat4j.pb_*.jar
-;../org.w3c.css.sac_*.jar
+;@dependency.dir@/com.ibm.icu_*.jar
+;@dependency.dir@/com.jcraft.jsch_*.jar
+;@dependency.dir@/javax.annotation_*.jar
+;@dependency.dir@/javax.el_*.jar
+;@dependency.dir@/javax.inject_*.jar
+;@dependency.dir@/javax.servlet_*.jar
+;@dependency.dir@/javax.servlet.jsp_*.jar
+;@dependency.dir@/org.apache.ant_*/lib/ant.jar
+;@dependency.dir@/org.apache.batik.css_*.jar
+;@dependency.dir@/org.apache.jasper.glassfish_*.jar
+;@dependency.dir@/org.apache.lucene.analysis_*.jar
+;@dependency.dir@/org.apache.lucene.core_*.jar
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility.auth/@dot.classes@
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer_*.jar
+;@dependency.dir@/org.eclipse.ecf.filetransfer_*.jar
+;@dependency.dir@/org.eclipse.ecf_*.jar
+;@dependency.dir@/org.eclipse.ecf.ssl_*.jar
+;@dependency.dir@/org.eclipse.ecf.identity_*.jar
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
+;@dependency.dir@/org.eclipse.emf.common_*.jar
+;@dependency.dir@/org.eclipse.emf.ecore_*.jar
+;@dependency.dir@/org.eclipse.emf.ecore.xmi_*.jar
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.garbagecollector/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.simpleconfigurator/@dot.classes@
+;@eclipse.platform.supplement@/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help.appserver/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
+;@dependency.dir@/org.eclipse.jetty.continuation_*.jar
+;@dependency.dir@/org.eclipse.jetty.http_*.jar
+;@dependency.dir@/org.eclipse.jetty.io_*.jar
+;@dependency.dir@/org.eclipse.jetty.security_*.jar
+;@dependency.dir@/org.eclipse.jetty.server_*.jar
+;@dependency.dir@/org.eclipse.jetty.servlet_*.jar
+;@dependency.dir@/org.eclipse.jetty.util_*.jar
+;@dependency.dir@/org.sat4j.core_*.jar
+;@dependency.dir@/org.sat4j.pb_*.jar
+;@dependency.dir@/org.w3c.css.sac_*.jar
-breakiterator
-use
-splitIndex
diff --git a/bundles/org.eclipse.platform.doc.isv/pom.xml b/bundles/org.eclipse.platform.doc.isv/pom.xml
index cd857a3..1db5153 100644
--- a/bundles/org.eclipse.platform.doc.isv/pom.xml
+++ b/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -32,6 +32,199 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>com.ibm.icu</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>com.jcraft.jsch</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>javax.annotation</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>javax.el</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>javax.inject</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>javax.servlet</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>javax.servlet.jsp</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.ant</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.batik.css</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.jasper.glassfish</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.analysis</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.lucene.core</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.provider.filetransfer</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.filetransfer</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.ssl</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.identity</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.provider.filetransfer.ssl</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.provider.filetransfer.httpclient</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.ecf.provider.filetransfer.httpclient.ssl</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.emf.common</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.emf.ecore</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.emf.ecore.xmi</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.continuation</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.http</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.io</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.security</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.server</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.servlet</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jetty.util</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.sat4j.core</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.sat4j.pb</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.w3c.css.sac</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <overwriteReleases>true</overwriteReleases>
+ <overwriteSnapshots>true</overwriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>