Bug 463648: [doc build] "[exec] return 1" sometimes in log, but no obvious signs of error?

3 files changed, 20 insertions, 3 deletions

diff --git a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
index 6f0c9b710..bd81c1314 100644
--- a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
@@ -95,14 +95,15 @@
 		</dirset>
 		<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
 		<pathconvert property="dirList" refid="dirSet" dirsep="/" pathsep="&#xA;"/>
-		<property name="replaceFile" value="platformOptions.replace.txt" />
+		<property name="replaceFile" value="jdtOptions.replace.txt" />
 		<echo file="${basedir}/${replaceFile}">${fileList}&#xA;&#xA;${dirList}&#xA;&#xA;</echo>
 
 <echo>org.eclipse.jdt.doc.isv/buildDoc.xml - generateJavadoc:
       Using javadocExecutable: ${javadocExecutable}</echo>
+<!--
 <echo>${basedir}/${replaceFile} before _* expansion:</echo>
 <concat><filelist files="${basedir}/${replaceFile}"></filelist></concat>
-
+-->
 			<!-- strip away leading path -->
 		<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^.*/([^/]*)$$" replace="\1" />
 			<!-- remove lines without version pattern "[_-]\d+\.\d+\.\d+"; version pattern is a workaround for bug 402392 -->
@@ -110,16 +111,20 @@
 			<!-- create "<aa>_*[.jar]=<aa><version>[.jar]" property for lines with a version -->
 		<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^(.*)[-_]\d+\.\d+\.\d+.*?(.jar)?$$" replace="\1_*\2=\0" />
 		
+<!--
 <echo>${basedir}/${replaceFile} after _* expansion:</echo>
 <concat><filelist files="${basedir}/${replaceFile}"></filelist></concat>
+-->
 		
 		<!-- workaround for bug 402392, which can make the ${replaceFile} end up empty: -->
 		<echo file="${basedir}/${replaceFile}" append="true">dummyForBug402392=dummyForBug402392&#xA;</echo>
 		
 		<replace file="${basedir}/${optionsFile}" replacefilterfile="${basedir}/${replaceFile}"/>
 
+<!--
 <echo>${basedir}/${optionsFile} after _* expansion:</echo>
 <concat><filelist files="${basedir}/${optionsFile}"></filelist></concat>
+-->
 
 		<!--scrub isv plugin directories of any preexisting api doc content-->
 		<delete dir="reference/api"/>
diff --git a/bundles/org.eclipse.pde.doc.user/buildDoc.xml b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
index 3f4683e5e..8564332c0 100644
--- a/bundles/org.eclipse.pde.doc.user/buildDoc.xml
+++ b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
@@ -94,13 +94,15 @@
 		</dirset>
 		<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
 		<pathconvert property="dirList" refid="dirSet" dirsep="/" pathsep="&#xA;"/>
-		<property name="replaceFile" value="platformOptions.replace.txt" />
+		<property name="replaceFile" value="pdeOptions.replace.txt" />
 		<echo file="${basedir}/${replaceFile}">${fileList}&#xA;&#xA;${dirList}&#xA;&#xA;</echo>
 
 <echo>org.eclipse.pde.doc.user/buildDoc.xml - generateJavadoc:
       Using javadocExecutable: ${javadocExecutable}</echo>
+<!--
 <echo>${basedir}/${replaceFile} before _* expansion:</echo>
 <concat><filelist files="${basedir}/${replaceFile}"></filelist></concat>
+-->
 
 			<!-- strip away leading path -->
 		<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^.*/([^/]*)$$" replace="\1" />
@@ -109,16 +111,20 @@
 			<!-- create "<aa>_*[.jar]=<aa><version>[.jar]" property for lines with a version -->
 		<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^(.*)[-_]\d+\.\d+\.\d+.*?(.jar)?$$" replace="\1_*\2=\0" />
 		
+<!--
 <echo>${basedir}/${replaceFile} after _* expansion:</echo>
 <concat><filelist files="${basedir}/${replaceFile}"></filelist></concat>
+-->
 		
 		<!-- workaround for bug 402392, which can make the ${replaceFile} end up empty: -->
 		<echo file="${basedir}/${replaceFile}" append="true">dummyForBug402392=dummyForBug402392&#xA;</echo>
 		
 		<replace file="${basedir}/${optionsFile}" replacefilterfile="${basedir}/${replaceFile}"/>
 
+<!--
 <echo>${basedir}/${optionsFile} after _* expansion:</echo>
 <concat><filelist files="${basedir}/${optionsFile}"></filelist></concat>
+-->
 
 		<!--scrub isv plugin directories of any preexisting api doc content-->
 		<delete dir="reference/api"/>
diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
index 2db20deda..6bb7b2478 100644
--- a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -159,8 +159,10 @@
 
 <echo>org.eclipse.platform.doc.isv/buildDoc.xml - generateJavadoc:
       Using javadocExecutable: ${javadocExecutable}</echo>
+<!--
 <echo>${basedir}/${replaceFile} before _* expansion:</echo>
 <concat><filelist files="${basedir}/${replaceFile}"></filelist></concat>
+-->
 
 			<!-- strip away leading path -->
 		<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^.*/([^/]*)$$" replace="\1" />
@@ -169,16 +171,20 @@
 			<!-- create "<aa>_*[.jar]=<aa><version>[.jar]" property for lines with a version -->
 		<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^(.*)[-_]\d+\.\d+\.\d+.*?(.jar)?$$" replace="\1_*\2=\0" />
 		
+<!--
 <echo>${basedir}/${replaceFile} after _* expansion:</echo>
 <concat><filelist files="${basedir}/${replaceFile}"></filelist></concat>
+-->
 		
 		<!-- workaround for bug 402392, which can make the ${replaceFile} end up empty: -->
 		<echo file="${basedir}/${replaceFile}" append="true">dummyForBug402392=dummyForBug402392&#xA;</echo>
 		
 		<replace file="${basedir}/${optionsFile}" replacefilterfile="${basedir}/${replaceFile}"/>
 
+<!--
 <echo>${basedir}/${optionsFile} after _* expansion:</echo>
 <concat><filelist files="${basedir}/${optionsFile}"></filelist></concat>
+-->
 
 		<!--scrub isv plugin directories of any preexisting api doc content-->
 		<delete dir="reference/api"/>