[568553] Update how the BREE is used for doc generation
Change-Id: Ied9eb73c19e6adbcac856b9f06a3805c04224bb0
diff --git a/docs/org.eclipse.wst.jsdt.doc/buildDoc.xml b/docs/org.eclipse.wst.jsdt.doc/buildDoc.xml
index 5b81f24..a6035a1 100755
--- a/docs/org.eclipse.wst.jsdt.doc/buildDoc.xml
+++ b/docs/org.eclipse.wst.jsdt.doc/buildDoc.xml
@@ -28,9 +28,8 @@
</target>
<target name="convertSchemaToHtml" if="eclipse.running">
- <property name="dest" value="reference/extension-points" />
- <record name="${basedir}/workspace/jsdtconvert.txt" action="start"/>
-
+ <property name="dest" value="reference/extension-points" />
+ <!--<record name="${basedir}/target/eclipserun-work/data/jsdtconvert.txt" action="start"/>-->
<pde.convertSchemaToHTML manifest="../../bundles/org.eclipse.wst.jsdt.chromium.debug.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../bundles/org.eclipse.wst.jsdt.chromium.debug.js/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../bundles/org.eclipse.wst.jsdt.chromium.debug.jsdtbridge/plugin.xml" destination="${dest}" />
@@ -55,18 +54,18 @@
<pde.convertSchemaToHTML manifest="../../nodejs/org.eclipse.wst.jsdt.js.node/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../nodejs/org.eclipse.wst.jsdt.js.npm/plugin.xml" destination="${dest}" />
- <record name="${basedir}/workspace/jsdtconvert.txt" action="stop"/>
+ <!--<record name="${basedir}/target/eclipserun-work/data/jsdtconvert.txt" action="stop"/>-->
</target>
<target name="getJavadocPath">
- <available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe"/>
- <available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
+ <available file="${java.home}/bin/javadoc.exe" property="javadoc" value="${java.home}/bin/javadoc.exe"/>
+ <available file="${java.home}/bin/javadoc" property="javadoc" value="${java.home}/bin/javadoc" />
</target>
<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
- <property name="optionsFile" value="workspace/jsdtOptions.tmp.txt" />
+ <property name="optionsFile" value="target/eclipserun-work/data/jsdtOptions.tmp.txt" />
<copy file="jsdtOptions.txt" tofile="${optionsFile}" overwrite="true" />
<condition property="argsListDelimiter" value=":">
diff --git a/docs/org.eclipse.wst.jsdt.doc/pom.xml b/docs/org.eclipse.wst.jsdt.doc/pom.xml
index 8f24111..f2eaafe 100644
--- a/docs/org.eclipse.wst.jsdt.doc/pom.xml
+++ b/docs/org.eclipse.wst.jsdt.doc/pom.xml
@@ -45,11 +45,18 @@
<id>build_java_doc</id>
<phase>compile</phase>
<configuration>
+ <useJDK>BREE</useJDK>
<skip>false</skip>
- <executionEnvironment>JavaSE-11</executionEnvironment>
<!-- call buildDoc.xml -->
<!-- TODO switch to new parameter when we've moved up to Tycho 1.0, as appArgLine is deprecated
- <applicationsArgs>-consolelog -debug -application org.eclipse.ant.core.antRunner -quiet -buildfile buildDoc.xml</applicationsArgs>
+ <applicationsArgs>
+ <args>-consolelog</args>
+ <args>-debug</args>
+ <args>-application</args>
+ <args>org.eclipse.ant.core.antRunner</args>
+ <args>-quiet</args>
+ <args>-buildfile</args>
+ <args>buildDoc.xml</applicationsArgs>
-->
<appArgLine>-consolelog -debug -application org.eclipse.ant.core.antRunner -quiet -buildfile buildDoc.xml</appArgLine>
<dependencies>
@@ -83,6 +90,7 @@
<type>eclipse-plugin</type>
</dependency>
</dependencies>
+ <project>${project}</project>
<repositories>
<repository>
<id>eclipse</id>
