Merge branch 'master' of ssh://emerks@git.eclipse.org/gitroot/emf/org.eclipse.emf.git

1 files changed, 30 insertions, 5 deletions

diff --git a/releng/org.eclipse.emf.releng.buckminster/javadoc/javadoc.ant b/releng/org.eclipse.emf.releng.buckminster/javadoc/javadoc.ant
index 21de8212c..b0b2b9c46 100644
--- a/releng/org.eclipse.emf.releng.buckminster/javadoc/javadoc.ant
+++ b/releng/org.eclipse.emf.releng.buckminster/javadoc/javadoc.ant
@@ -25,12 +25,16 @@
 		<echo message="Force javadoc generation? ${force.javadoc}" />
 		<echo message="Skip javadoc generation? ${skip.javadoc}" />
 
+		<!--	<antcall target="-collect-docfiles" inheritall="true">
+			<param name="projectName" value="EMF" />
+			<param name="subproject" value="emf" />
+		</antcall>-->
 		<!-- EMF -->
 		<antcall target="-generate.javadoc" inheritall="true">
 			<param name="projectName" value="EMF" />
 			<param name="subproject" value="emf" />
 		</antcall>
-		<!-- XSD -->
+		<!--XSD -->
 		<antcall target="-generate.javadoc" inheritall="true">
 			<param name="projectName" value="XSD" />
 			<param name="subproject" value="xsd" />
@@ -38,7 +42,7 @@
 	</target>
 
 	<target name="-generate.javadoc" if="generate.javadoc" unless="skip.javadoc">
-		<property name="sourcesLocation" value="${checkoutRoot}/org.eclipse.${subproject}/plugins/" />
+		<property name="sourcesLocation" value="${checkoutRoot}/org.eclipse.${subproject}/" />
 		<property name="output" value="./javadoc-${subproject}" />
 
 		<echo message="Generate ${subproject}" />
@@ -59,13 +63,14 @@
 
 		<javadoc destdir="${output}" use="false" Encoding="ISO-8859-1" classpathref="javadoc-classpath" maxmemory="1024m" source="1.5" useexternalfile="true" author="true" version="true" Verbose="no" windowtitle="${projectName} Documentation">
 			<fileset dir="${sourcesLocation}" defaultexcludes="true">
-				<include name="**/org.eclipse.${subproject}*/**/org/eclipse/${subproject}/**/*.java" />
+				<include name="**/plugins/org.eclipse.${subproject}*/**/org/eclipse/${subproject}/**/*.java" />
+				<!--<include name="**/tests/org.eclipse.${subproject}*/**/org/eclipse/${subproject}/**/*.java" />-->
 				<!--
 				<exclude name="**/org.eclipse.xtend.standalone.maven/**" />
-				<exclude name="**/testdata/**" />
 				<exclude name="**/packrat/**" />
 				<exclude name="**/antlr/internal/**" />
 				-->
+				<exclude name="**/java/io/**" />
 			</fileset>
 
 			<tag name="generated" description="EMF generated code" />
@@ -77,10 +82,30 @@
 			<tag name="noreference" description="This method is not intended to be referenced by clients." />
 			<tag name="nooverride" description="This method is not intended to be extended (re-implement with a call to the overridden parent) or re-implemented (with no call to the overridden parent) by clients." />
 		</javadoc>
-
+		<!-- copy doc-files files -->
+		<antcall target="-collect-docfiles" inheritall="true" />
 		<!-- Compress the output javadoc in a zip file -->
 		<zip destfile="${output}/javadoc.zip" basedir="${output}">
 			<exclude name="*-${subproject}.zip" />
 		</zip>
 	</target>
+
+	<target name="-collect-docfiles">
+		<!-- copy doc-files files -->
+		<!--org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/doc-files/ChangeAPI.gif-->
+		<fileset id="docFiles" dir="${sourcesLocation}/plugins" includes="org.eclipse.${subproject}*/src/**/doc-files/*" />
+		<echo>${toString:docFiles}</echo>
+		<pathconvert property="docFilesToCopy" refid="docFiles" pathsep=" ">
+			<mapper>
+				<regexpmapper handledirsep="yes" from=".*\/src\/(.*)doc-files(.*)" to="\1doc-files\2" />
+			</mapper>
+		</pathconvert>
+		<echo>${docFilesToCopy}</echo>
+		<copy todir="${output}">
+			<fileset refid="docFiles" />
+			<mapper>
+				<regexpmapper handledirsep="yes" from=".*\/src\/(.*)doc-files(.*)" to="\1doc-files\2" />
+			</mapper>
+		</copy>
+	</target>
 </project>
\ No newline at end of file