Bug 396272 - Javadoc generation broken (links cannot be resolved)v20121211-155134

Missing some buildDoc token replacements

4 files changed, 37 insertions, 1 deletions

diff --git a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
index 5bcbb3629..a3b1c7e58 100644
--- a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
@@ -61,11 +61,25 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
+                <replace file="${basedir}/${optionsFile}" token="@dependency.dir@" value="${dependency.dir}" />
+                <replace file="${basedir}/${optionsFile}" token="@dot.classes@" value="${dot.classes}" />
 		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${baseLocation}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.core@" value="${eclipse.jdt.core}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.debug@" value="${eclipse.jdt.debug}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ant@" value="${eclipse.platform.ant}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.debug@" value="${eclipse.platform.debug}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.resources.bundles@" value="${eclipse.platform.resources.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.runtime.bundles@" value="${eclipse.platform.runtime.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.bundles@" value="${eclipse.platform.team.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.text@" value="${eclipse.platform.text}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ua@" value="${eclipse.platform.ua}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.bundles@" value="${eclipse.platform.ui.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.bundles.bundles@" value="${rt.equinox.bundles.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.framework.bundles@" value="${rt.equinox.framework.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.p2.bundles@" value="${rt.equinox.p2.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.supplement@" value="${eclipse.equinox.supplement}" />
+		<replace file="${basedir}/${optionsFile}" token="@org.apache.ant.jar@" value="${org.apache.ant.jar}" />
 
 		
 		<!-- expand _* to actual version -->
diff --git a/bundles/org.eclipse.pde.doc.user/buildDoc.xml b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
index 543ba835b..edffb3517 100644
--- a/bundles/org.eclipse.pde.doc.user/buildDoc.xml
+++ b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
@@ -62,8 +62,26 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
+                <replace file="${basedir}/${optionsFile}" token="@dependency.dir@" value="${dependency.dir}" />
+                <replace file="${basedir}/${optionsFile}" token="@dot.classes@" value="${dot.classes}" />
+                <replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.core@" value="${eclipse.jdt.core}" />
+                <replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.debug@" value="${eclipse.jdt.debug}" />
+                <replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde.ui.ui@" value="${eclipse.pde.ui.ui}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde.build@" value="${eclipse.pde.build}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.debug@" value="${eclipse.platform.debug}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.resources.bundles@" value="${eclipse.platform.resources.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.runtime.bundles@" value="${eclipse.platform.runtime.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.binaries.bundles@" value="${eclipse.platform.swt.binaries.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.bundles@" value="${eclipse.platform.team.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.text@" value="${eclipse.platform.text}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ua@" value="${eclipse.platform.ua}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.bundles@" value="${eclipse.platform.ui.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.update@" value="${eclipse.platform.update}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.bundles.bundles@" value="${rt.equinox.bundles.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.framework.bundles@" value="${rt.equinox.framework.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.p2.bundles@" value="${rt.equinox.p2.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.supplement@" value="${eclipse.equinox.supplement}" />
 
 
 		<!-- expand _* to actual version -->
diff --git a/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties b/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
index 0349fe6f0..33fee376e 100644
--- a/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
+++ b/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
@@ -9,10 +9,11 @@ eclipse.pde.build=..
 eclipse.platform.debug=..
 eclipse.platform.resources.bundles=..
 eclipse.platform.runtime.bundles=..
+eclipse.platform.swt.binaries.bundles=..
 eclipse.platform.team.bundles=..
 eclipse.platform.text=..
 eclipse.platform.ua=..
-eclipse.platform.ui=..
+eclipse.platform.ui.bundles=..
 eclipse.platform.update=..
 rt.equinox.bundles.bundles=..
 rt.equinox.framework.bundles=..
diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
index e47abb014..0bf9c780b 100644
--- a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -118,6 +118,8 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
+		<replace file="${basedir}/${optionsFile}" token="@dependency.dir@" value="${dependency.dir}" />
+		<replace file="${basedir}/${optionsFile}" token="@dot.classes@" value="${dot.classes}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde@" value="${eclipse.pde}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ant@" value="${eclipse.platform.ant}" />
@@ -137,6 +139,7 @@
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.examples@" value="${eclipse.platform.team.examples}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.examples@" value="${eclipse.platform.swt.examples}" />
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.examples@" value="${eclipse.platform.ui.examples}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.supplement@" value="${eclipse.equinox.supplement}" />
                 <replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.http.jetty@" value="${eclipse.equinox.http.jetty}" />
 		
 		<!-- expand _* to actual version -->