Skip to content
Browse files

Merge r4631

SVN: trunk@4632
  • Loading branch information...
1 parent 9448a6a commit af423a0337703516714d1ce198a8f6844794e82a @fabiomaulo fabiomaulo committed
Showing with 56 additions and 14 deletions.
  1. +6 −1 default.build
  2. +42 −0 doc/NHibernate.shfbproj.template
  3. +7 −12 doc/documentation.build
  4. +1 −1 doc/reference/reference.build
View
7 default.build
@@ -156,6 +156,11 @@
description="Builds the Help Documentation">
<nant buildfile="doc/documentation.build" target="manual" />
</target>
+
+ <target name="api" depends="init binaries"
+ description="Builds the API Documentation">
+ <nant buildfile="doc/documentation.build" target="api" />
+ </target>
<target name="build-all-frameworks" depends="init">
<!-- Save the current framework -->
@@ -299,7 +304,7 @@
<nant buildfile="src/NHibernate.Setup/NHibernate.Setup.build" target="msi" />
</target>
- <target name="package" depends="init set-release-project-configuration test binaries manual sources-zip binaries-zip"
+ <target name="package" depends="init binaries manual sources-zip binaries-zip"
description="Creates files for the File Release System on SourceForge">
<property name="dist.output.dir" value="${project::get-base-directory()}/build/" />
View
42 doc/NHibernate.shfbproj.template
@@ -0,0 +1,42 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <!-- The configuration and platform will be used to determine which
+ assemblies to include from solution and project documentation
+ sources -->
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{91f431cd-23fb-4ed4-a690-0344073c65f0}</ProjectGuid>
+ <SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
+ <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
+ Studio adds them anyway -->
+ <AssemblyName>Documentation</AssemblyName>
+ <RootNamespace>Documentation</RootNamespace>
+ <Name>Documentation</Name>
+ <!-- SHFB properties -->
+ <OutputPath>${doc.out.dir}</OutputPath>
+ <HtmlHelpName>NHibernateAPI</HtmlHelpName>
+ <HelpFileFormat>HtmlHelp1x</HelpFileFormat>
+ <CopyrightText>NHibernate</CopyrightText>
+ <CopyrightHref>www.nhforge.org</CopyrightHref>
+ <FeedbackEMailAddress>http://groups.google.com/group/nhibernate-development</FeedbackEMailAddress>
+ <FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText>
+ <HelpTitle>NHibernate API Reference</HelpTitle>
+ <IndentHtml>False</IndentHtml>
+ <HelpFileVersion>${project.version.numeric}</HelpFileVersion>
+ <DocumentationSources>
+ <DocumentationSource sourceFile="${bin.dir}/Iesi.Collections.dll" />
+ <DocumentationSource sourceFile="${bin.dir}/Iesi.Collections.xml" />
+ <DocumentationSource sourceFile="${bin.dir}/NHibernate.dll" />
+ <DocumentationSource sourceFile="${bin.dir}/Nhibernate.xml" />
+ </DocumentationSources>
+ </PropertyGroup>
+ <!-- There are no properties for these two groups but they need to appear in
+ order for Visual Studio to perform the build. -->
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ </PropertyGroup>
+ <!-- Import the SHFB build targets -->
+ <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
+</Project>
View
19 doc/documentation.build
@@ -7,7 +7,6 @@
>
<property name="root.dir" value=".." />
- <include buildfile="${root.dir}/build-common/common.xml"/>
<include buildfile="${root.dir}/build-common/common-project.xml" />
<target name="init" depends="common.init">
@@ -22,7 +21,7 @@
<target name="clean" depends="init">
<nant target="clean" buildfile="reference/reference.build" />
<delete dir="${doc.out.dir}" />
- <delete file="NHibernate.ndoc" />
+ <delete file="NHibernate.shfbproj" />
</target>
<target name="manual" depends="init">
@@ -34,15 +33,15 @@
</nant>
</target>
- <target name="ndoc-project" depends="init">
- <copy file="NHibernate.ndoc.in" tofile="NHibernate.ndoc" overwrite="true">
+ <target name="apidocbuilder-project" depends="init">
+ <copy file="NHibernate.shfbproj.template" tofile="NHibernate.shfbproj" overwrite="true">
<filterchain>
<expandproperties />
</filterchain>
</copy>
</target>
- <target name="api" depends="init common.find-ndoc ndoc-project" description="Generates the API documentation (in MSDN style and VS.NET 2003 if available)">
+ <target name="api" depends="init apidocbuilder-project" description="Generates the API documentation (in MSDN style and VS.NET 2005 if available)">
<uptodate property="api.uptodate">
<sourcefiles>
<include name="${bin.dir}/*.dll" />
@@ -57,13 +56,9 @@
<echo if="${api.uptodate}">API documentation is up to date, skipping generation step.</echo>
<if test="${not api.uptodate}">
- <exec program="${ndoc-console}">
- <arg line="-documenter=MSDN-Help2" />
- <arg line="-project=NHibernate.ndoc" />
- </exec>
- <exec program="${ndoc-console}">
- <arg line="-documenter=MSDN-CHM" />
- <arg line="-project=NHibernate.ndoc" />
+ <property name="apidocbuilder.exe" value="${directory::get-parent-directory(environment::get-folder-path('System'))}\Microsoft.NET\Framework\v3.5\MSBuild.exe" />
+ <exec program="${apidocbuilder.exe}">
+ <arg line="NHibernate.shfbproj" />
</exec>
</if>
</target>
View
2 doc/reference/reference.build
@@ -12,7 +12,7 @@
<property name="lang" value="en" />
<property name="output.dir" value="${build.dir}/doc" />
- <property name="output.html.basename" value="NHibernate.Documentation" />
+ <property name="output.html.basename" value="NHibernate.Reference" />
<property name="output.help2.dir" value="${output.dir}/help2" />
<property name="build.html.dir" value="${output.dir}" />

0 comments on commit af423a0

Please sign in to comment.
Something went wrong with that request. Please try again.