diff options
| author | Markus Keller | 2013-03-05 20:04:20 +0000 |
|---|---|---|
| committer | Markus Keller | 2013-03-05 20:04:20 +0000 |
| commit | 994655627213eeb7ed00ab7c7689ae8516e1b862 (patch) | |
| tree | 0d1607b19dc2672027fb57213ddb2d40f67eb6f0 /bundles/org.eclipse.jdt.doc.isv/buildDoc.xml | |
| parent | ebf643fb2d55466e72f1c45d077da3687ed63568 (diff) | |
| download | eclipse.platform.common-994655627213eeb7ed00ab7c7689ae8516e1b862.tar.gz eclipse.platform.common-994655627213eeb7ed00ab7c7689ae8516e1b862.tar.xz eclipse.platform.common-994655627213eeb7ed00ab7c7689ae8516e1b862.zip | |
Bug 402392: build fails during javadoc generation with most recent Orbit repov20130305-200420I20130306-0045I20130305-2300I20130305-2000I20130305-1718I20130305-1653I20130305-1543
Avoids empty ${basedir}/${replaceFile}, which made the <replace> task fail. Workaround for case where no "_" is present in any file/dir name.
Diffstat (limited to 'bundles/org.eclipse.jdt.doc.isv/buildDoc.xml')
| -rw-r--r-- | bundles/org.eclipse.jdt.doc.isv/buildDoc.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml index 36672c7b5..be779c657 100644 --- a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml +++ b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml @@ -93,7 +93,7 @@ <pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="
"/> <pathconvert property="dirList" refid="dirSet" dirsep="/" pathsep="
"/> <property name="replaceFile" value="platformOptions.replace.txt" /> - <echo file="${basedir}/${replaceFile}">dummyForBug402392=dummyForBug402392
${fileList}

${dirList}</echo> + <echo file="${basedir}/${replaceFile}">${fileList}

${dirList}

</echo> <echo>org.eclipse.jdt.doc.isv/buildDoc.xml - generateJavadoc: ${basedir}/${replaceFile} before _* expansion:</echo> @@ -109,6 +109,9 @@ ${basedir}/${replaceFile} before _* expansion:</echo> <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
</echo> + <replace file="${basedir}/${optionsFile}" replacefilterfile="${basedir}/${replaceFile}"/> <echo>${basedir}/${optionsFile} after _* expansion:</echo> |