Skip to content

Commit 725d0e2

Browse files
author
Sergey Koshcheyev
committed
Install and register Help2 documentation (rough implementation for now)
SVN: trunk@2628
1 parent f25698e commit 725d0e2

File tree

2 files changed

+43
-2
lines changed

2 files changed

+43
-2
lines changed

src/NHibernate.Setup/NHibernate.Setup.wixproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
</PropertyGroup>
1111
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
1212
<OutputPath>bin\Debug\</OutputPath>
13-
<IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
13+
<IntermediateOutputPath>
14+
</IntermediateOutputPath>
1415
<DefineConstants>Version=1.2.0.CR1;NumericVersion=1.2.0.3001;BuildDir=..\..\..\..\build\NHibernate-1.2.0.CR1</DefineConstants>
1516
<IncludeSearchPaths>
1617
</IncludeSearchPaths>
@@ -56,7 +57,7 @@
5657
<OutputPath>bin\Release\</OutputPath>
5758
<IntermediateOutputPath>
5859
</IntermediateOutputPath>
59-
<DefineConstants>Version=1.2.0.CR1;BuildDir=..\..\..\..\build\NHibernate-1.2.0.CR1</DefineConstants>
60+
<DefineConstants>Version=1.2.0.CR1;NumericVersion=1.2.0.3001;BuildDir=..\..\..\..\build\NHibernate-1.2.0.CR1</DefineConstants>
6061
<IncludeSearchPaths>
6162
</IncludeSearchPaths>
6263
<Pedantic>True</Pedantic>
@@ -72,6 +73,7 @@
7273
</ItemGroup>
7374
<ItemGroup>
7475
<WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
76+
<WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixVSExtension.dll" />
7577
</ItemGroup>
7678
<ItemGroup>
7779
<Content Include="lgpl.rtf" />

src/NHibernate.Setup/NHibernate.Setup.wxs

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,35 @@
324324
<Component Id="nhibernate_reference.pdf" Guid="{A760C7CB-354B-419E-90DD-C27AA24F434E}">
325325
<File Id="nhibernate_reference.pdf" Name="nhibernate_reference.pdf" KeyPath="yes" />
326326
</Component>
327+
<Directory Id="help2" Name="help2">
328+
<Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\VSIPCC_Collection_Files_RTL_---_---.msm"
329+
DiskId="1" Language="1033" Id="Merge.VSIPCC" />
330+
<Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\HTML_Help_Registration__RTL_X86_---.msm"
331+
DiskId="1" Language="1033" Id="Merge.HelpReg" />
332+
333+
<Component Id="NHibernate.API.VSHelp" Guid="{49536A11-87CD-4035-A21D-D866CE3C8DB5}">
334+
<File Id="NHibernate.API.HxS" Name="NHibernate.API.HxS" KeyPath="yes">
335+
<HelpFile Id="NHibernate.API" Name="NHibernate.API" xmlns="http://schemas.microsoft.com/wix/VSExtension"
336+
Index="NHibernate.API.HxI" Language="1033" />
337+
</File>
338+
<File Id="NHibernate.API.HxI" Name="NHibernate.API.HxI" />
339+
<File Id="NHibernate.APICollection.HxC" Name="NHibernate.APICollection.HxC">
340+
<HelpCollection xmlns="http://schemas.microsoft.com/wix/VSExtension"
341+
Id="NHibernate12"
342+
Name="NHibernate.1.2"
343+
Description="NHibernate 1.2 documentation">
344+
<HelpFileRef Id="NHibernate.API" />
345+
<PlugCollectionInto TableOfContents="NHibernate.APICollection.HxT"
346+
TargetCollection="MS_VSIPCC_v80"
347+
TargetTableOfContents="FL_vsipcc_hxt_86880________.3643236F_FC70_11D3_A536_0090278A1BB8" />
348+
</HelpCollection>
349+
</File>
350+
<File Id="NHibernate.APICollection.HxT" Name="NHibernate.APICollection.HxT" />
351+
<File Id="NHibernate.APICollection_A.HxK" Name="NHibernate.APICollection_A.HxK" />
352+
<File Id="NHibernate.APICollection_F.HxK" Name="NHibernate.APICollection_F.HxK" />
353+
<File Id="NHibernate.APICollection_K.HxK" Name="NHibernate.APICollection_K.HxK" />
354+
</Component>
355+
</Directory>
327356
</Directory>
328357
<Directory Id="src" Name="src">
329358
<Component Id="SourceZip" Guid="CAD2DAF4-AD0E-4E0D-9726-94F2F7F95301">
@@ -511,6 +540,12 @@
511540
<Feature Id="Documentation" Title="Documentation" Level="1">
512541
<Feature Id="ApiDocumentation" Title="API Documentation" Level="1">
513542
<ComponentRef Id="NHibernate.API.chm" />
543+
<Feature Id="ApiDocumentationVS" Title="Integrated API Documentation" Level="1"
544+
Description="API documentation for NHibernate integrated into Visual Studio 2005">
545+
<MergeRef Id="Merge.HelpReg"/>
546+
<MergeRef Id="Merge.VSIPCC" />
547+
<ComponentRef Id="NHibernate.API.VSHelp" />
548+
</Feature>
514549
</Feature>
515550
<Feature Id="Reference" Title="Reference" Level="1">
516551
<ComponentRef Id="NHibernate.Documentation.chm" />
@@ -521,5 +556,9 @@
521556
<WixVariable Id="WixUILicenseRtf" Value="lgpl.rtf" />
522557
<UIRef Id="WixUI_Mondo" />
523558
<UIRef Id="WixUI_ErrorProgressText" />
559+
560+
<InstallExecuteSequence>
561+
<InstallFinalize Sequence="7800" />
562+
</InstallExecuteSequence>
524563
</Product>
525564
</Wix>

0 commit comments

Comments
 (0)