[Nhibernate-commit] nhibernate/doc/reference doc.build,1.8,1.9

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/doc/reference
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv760/doc/reference

Modified Files:
	doc.build 
Log Message:
Fixed up the build files and doc generation to reduce amount of
copying.

Index: doc.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/doc.build,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** doc.build	6 May 2005 08:22:12 -0000	1.8
--- doc.build	7 May 2005 04:27:11 -0000	1.9
***************
*** 7,11 ****
  	<!--
  		Required properties:
! 			* build.dir	- (path) root level to copy built documentation to.  Only needed by package task.
  	-->
  	
--- 7,12 ----
  	<!--
  		Required properties:
! 			* build.dir	- (path) root level to build documentation to.  If this is not supplied
! 				then it will be built to a folder named build under the doc folder.
  	-->
  	
***************
*** 32,36 ****
--- 33,46 ----
  	
  	<property name="lang" value="en" />
+ 	
+ 	<!-- 
+ 		set the default for where all the files are output to, if this file is being 
+ 		run as part of the NHSolution build then a build.dir property will be passed 
+ 		in that specifies a location to output all the files
+ 	-->
  	<property name="output.dir" value="build/${lang}" />
+ 	<if propertyexists="build.dir">
+ 		<property name="output.dir" value="${build.dir}/doc/${lang}" />
+ 	</if>
  	
  	<target name="clean" description="Cleans any previous builds">
***************
*** 125,128 ****
--- 135,139 ----
  		<property name="build.help2.dir" value="${output.dir}/help2" />
  		
+ 		<!-- convert the chm into the HxC -->
  		<exec program="HxConv.exe" basedir="${vshik.path}">
  			<arg path="${output.dir}/chm/reference.chm" />
***************
*** 132,151 ****
  		</exec>
  		
  		<exec program="HxComp.exe" basedir="${vshik.path}">
  			<arg value="-p" />
  			<arg path="${build.help2.dir}/reference/reference.HxC" />
  			<arg value="-o" />
! 			<arg path="${build.help2.dir}/reference.HxS" />
  		</exec>
  		
  		<delete dir="${build.help2.dir}/reference" />
! 	</target>
! 	
! 	<target name="package" depends="build" description="Copies the files built into the local build dir into the NH build dir.">
! 		<move todir="${build.dir}/doc/help">
! 			<fileset basedir="${output.dir}">
  				<include name="**/*" />
  			</fileset>
! 		</move>
  	</target>
  </project>
--- 143,171 ----
  		</exec>
  		
+ 		<mkdir dir="${build.help2.dir}/Titles" failonerror="false" />
+ 		<!-- 
+ 			Compile the HxC into an HxS that can be included
+ 			in a Help2 collection 
+ 		-->
  		<exec program="HxComp.exe" basedir="${vshik.path}">
  			<arg value="-p" />
  			<arg path="${build.help2.dir}/reference/reference.HxC" />
  			<arg value="-o" />
! 			<arg path="${build.help2.dir}/Titles/reference.HxS" />
  		</exec>
  		
  		<delete dir="${build.help2.dir}/reference" />
! 		
! 		<!-- 
! 			copying the Help2 files from cvs that describe the
! 			Help collection, not the files generated by the build 
! 			that contain the content	
! 		-->
! 		<copy todir="${build.help2.dir}" overwrite="true" >
! 			<fileset basedir="../Help2">
  				<include name="**/*" />
  			</fileset>
! 		</copy>
! 		
  	</target>
  </project>