Project

General

Profile

« Previous | Next » 

Revision 6898

Added by Matt Jones over 12 years ago

Modified build to include documentation in the war file that is generated as
part of the build, if the 'documentation' target has been run before the
war target. This is not done automatically because its not clear if all
people will have the proper sphinx environment set up to build the
documentation (as well as make).

View differences:

build.xml
291 291
		<property name="build.metacatnettest"
292 292
			value="${build.tests}/metacatnettest" />
293 293
		<property name="build.data" value="${build.dir}/data" />
294
		<property name="build.javadocs" value="${build.dir}/docs/api" />
294
		<property name="build.docs" value="${build.dir}/docs" />
295
		<property name="build.javadocs" value="${build.docs}/api" />
295 296
		<property name="build.war" value="${build.dir}/war" />
296 297
		<property name="dist.dir" value="dist" />
297 298
		<property name="ver.dir" value="${dist.dir}/${name}-${release}" />
......
403 404
		<mkdir dir="${build.dir}" />
404 405
		<mkdir dir="${build.src}" />
405 406
		<mkdir dir="${build.dest}" />
407
		<mkdir dir="${build.docs}" />
406 408
		<mkdir dir="${build.javadocs}" />
407 409
		<mkdir dir="${build.tmp}" />
408 410

  
......
955 957
				<include name="spatial/geoserver/data/**" />
956 958
			</fileset>
957 959
		</copy>
958
		<copy todir="${war.context.docs}" filtering="yes">
959
			<fileset dir="docs" excludes="**/*gif **/*jpg **/*png" />
960
		</copy>
961 960
		<copy todir="${war.context.docs}" filtering="no">
962
			<fileset dir="docs" includes="**/*gif **/*jpg **/*png" />
961
			<fileset dir="${build.docs}" />
963 962
		</copy>
964 963
		<copy todir="${war.webinf.sql}" filtering="yes">
965 964
			<fileset dir="src">

Also available in: Unified diff