Skip to content

Commit 76d7a53

Browse files
author
Sergey Koshcheyev
committed
Removed Wix project, will only be using NAnt from now on.
Created a separate installer for API documentation since it's about 3x as large as the rest. SVN: trunk@2630
1 parent e138806 commit 76d7a53

File tree

5 files changed

+291
-306
lines changed

5 files changed

+291
-306
lines changed

‎src/NHibernate.Everything-2.0.sln

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "C:\...\NHibernate.Example.W
189189
DefaultWebSiteLanguage = "Visual C#"
190190
EndProjectSection
191191
EndProject
192-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "NHibernate.Setup", "NHibernate.Setup\NHibernate.Setup.wixproj", "{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}"
193-
ProjectSection(WebsiteProperties) = preProject
194-
Debug.AspNetCompiler.Debug = "True"
195-
Release.AspNetCompiler.Debug = "False"
196-
EndProjectSection
197-
EndProject
198192
Global
199193
GlobalSection(SolutionConfigurationPlatforms) = preSolution
200194
Debug|.NET = Debug|.NET
@@ -476,16 +470,6 @@ Global
476470
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Any CPU.ActiveCfg = Debug|.NET
477471
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
478472
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Mixed Platforms.Build.0 = Debug|.NET
479-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|.NET.ActiveCfg = Debug|Any CPU
480-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
481-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Any CPU.Build.0 = Debug|Any CPU
482-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
483-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
484-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|.NET.ActiveCfg = Release|Any CPU
485-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Any CPU.ActiveCfg = Release|Any CPU
486-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Any CPU.Build.0 = Release|Any CPU
487-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
488-
{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
489473
EndGlobalSection
490474
GlobalSection(SolutionProperties) = preSolution
491475
HideSolutionNode = FALSE

‎src/NHibernate.Setup/APIDocumentation.wxs

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Product Id="771D1A4D-322B-4683-A95C-B505EF09619C"
4+
Name="NHibernate $(var.ShortVersion) API Documentation"
5+
Language="1033"
6+
Version="$(var.NumericVersion)"
7+
Manufacturer="JBoss, a division of Red Hat"
8+
UpgradeCode="34BC7653-111A-4C7D-B4EB-2B92DFE205B4">
9+
10+
<Package InstallerVersion="200" Compressed="yes" />
11+
12+
<Media Id="1" Cabinet="VSDocumentation.cab" EmbedCab="yes" />
13+
14+
<Upgrade Id="34BC7653-111A-4C7D-B4EB-2B92DFE205B4" />
15+
16+
<Directory Id="TARGETDIR" Name="SourceDir">
17+
<Directory Id="ProgramFilesFolder">
18+
<Directory Id="NHibernate" Name="NHibernate" FileSource="$(var.BuildDir)">
19+
<Directory Id="INSTALLLOCATION" Name="doc">
20+
<Directory Id="help2" Name="help2">
21+
<Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\VSIPCC_Collection_Files_RTL_---_---.msm"
22+
DiskId="1" Language="1033" Id="Merge.VSIPCC" />
23+
<Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\HTML_Help_Registration__RTL_X86_---.msm"
24+
DiskId="1" Language="1033" Id="Merge.HelpReg" />
25+
26+
<Component Id="NHibernate.API.VSHelp" Guid="{49536A11-87CD-4035-A21D-D866CE3C8DB5}">
27+
<File Id="NHibernate.API.HxS" Name="NHibernate.API.HxS" KeyPath="yes">
28+
<HelpFile Id="NHibernate.API" Name="NHibernate.API" xmlns="http://schemas.microsoft.com/wix/VSExtension"
29+
Index="NHibernate.API.HxI" Language="1033" />
30+
</File>
31+
<File Id="NHibernate.API.HxI" Name="NHibernate.API.HxI" />
32+
<File Id="NHibernate.APICollection.HxC" Name="NHibernate.APICollection.HxC">
33+
<HelpCollection xmlns="http://schemas.microsoft.com/wix/VSExtension"
34+
Id="NHibernate12"
35+
Name="NHibernate.1.2"
36+
Description="NHibernate 1.2 documentation">
37+
<HelpFileRef Id="NHibernate.API" />
38+
<PlugCollectionInto TableOfContents="NHibernate.APICollection.HxT"
39+
TargetCollection="MS_VSIPCC_v80"
40+
TargetTableOfContents="FL_vsipcc_hxt_86880________.3643236F_FC70_11D3_A536_0090278A1BB8" />
41+
</HelpCollection>
42+
</File>
43+
<File Id="NHibernate.APICollection.HxT" Name="NHibernate.APICollection.HxT" />
44+
<File Id="NHibernate.APICollection_A.HxK" Name="NHibernate.APICollection_A.HxK" />
45+
<File Id="NHibernate.APICollection_F.HxK" Name="NHibernate.APICollection_F.HxK" />
46+
<File Id="NHibernate.APICollection_K.HxK" Name="NHibernate.APICollection_K.HxK" />
47+
</Component>
48+
</Directory>
49+
<Component Id="NHibernate.API.chm" Guid="{5E218CF6-F36A-4F54-98C2-27728A79DB56}">
50+
<File Id="NHibernate.API.chm" Name="NHibernate.API.chm" KeyPath="yes" />
51+
</Component>
52+
</Directory>
53+
</Directory>
54+
</Directory>
55+
</Directory>
56+
57+
<Feature
58+
Id="Complete"
59+
Title="NHibernate API Documentation"
60+
Description="NHibernate API documentation for version $(var.Version)"
61+
Display="expand"
62+
ConfigurableDirectory="INSTALLLOCATION"
63+
Absent="disallow"
64+
AllowAdvertise="no"
65+
Level="1">
66+
<Feature Id="Standalone" Title="Standalone (.chm)" Level="1"
67+
Description="NHibernate API documentation in HTML Help (.chm) format">
68+
<ComponentRef Id="NHibernate.API.chm" />
69+
</Feature>
70+
71+
<Feature Id="Integrated2005" Title="Integrated (.HxS)" Level="1"
72+
Description="NHibernate API documentation in HTML Help2 (.HxS) format, integrated into Visual Studio 2005">
73+
<MergeRef Id="Merge.HelpReg"/>
74+
<MergeRef Id="Merge.VSIPCC" />
75+
<ComponentRef Id="NHibernate.API.VSHelp" />
76+
</Feature>
77+
</Feature>
78+
79+
<WixVariable Id="WixUILicenseRtf" Value="lgpl.rtf" />
80+
<UIRef Id="WixUI_FeatureTree" />
81+
<UIRef Id="WixUI_ErrorProgressText" />
82+
83+
<InstallExecuteSequence>
84+
<InstallFinalize Sequence="7800" />
85+
</InstallExecuteSequence>
86+
</Product>
87+
</Wix>

‎src/NHibernate.Setup/NHibernate.Setup.build

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@
1313

1414
<target name="init" depends="common.init" />
1515

16-
<target name="msi" depends="init">
16+
<target name="msi" depends="msi.nhibernate msi.apidocs" />
17+
18+
<target name="msi.nhibernate" depends="init">
1719
<property name="msi.tmp.dir" value="${build.dir}/msi-tmp" />
1820
<mkdir dir="${msi.tmp.dir}" />
1921
<candle
2022
out="${msi.tmp.dir}/"
2123
exedir="${wix.bin.dir}"
2224
extensions="${wix.bin.dir}/WixUIExtension.dll">
2325
<sources>
24-
<include name="*.wxs" />
26+
<include name="NHibernate.Setup.wxs" />
2527
</sources>
2628
<arg line="-dVersion=${project.version}" />
2729
<arg line="-dNumericVersion=${project.version.numeric}" />
30+
<arg line="-dShortVersion=${project.version.short}" />
2831
<arg line="-dBuildDir=${build.dir}" />
2932
</candle>
3033

@@ -34,7 +37,36 @@
3437
extensions="${wix.bin.dir}/WixUIExtension.dll"
3538
cultures="en-us">
3639
<sources>
37-
<include name="${msi.tmp.dir}/*.wixobj" />
40+
<include name="${msi.tmp.dir}/NHibernate.Setup.wixobj" />
41+
</sources>
42+
</light>
43+
44+
<delete dir="${msi.tmp.dir}" />
45+
</target>
46+
47+
<target name="msi.apidocs" depends="init">
48+
<property name="msi.tmp.dir" value="${build.dir}/msi-tmp" />
49+
<mkdir dir="${msi.tmp.dir}" />
50+
<candle
51+
out="${msi.tmp.dir}/"
52+
exedir="${wix.bin.dir}"
53+
extensions="${wix.bin.dir}/WixUIExtension.dll;${wix.bin.dir}/WixVSExtension.dll">
54+
<sources>
55+
<include name="APIDocumentation.wxs" />
56+
</sources>
57+
<arg line="-dVersion=${project.version}" />
58+
<arg line="-dNumericVersion=${project.version.numeric}" />
59+
<arg line="-dShortVersion=${project.version.short}" />
60+
<arg line="-dBuildDir=${build.dir}" />
61+
</candle>
62+
63+
<light
64+
out="${build.dir}/NHibernate-${project.version}-APIDocumentation.msi"
65+
exedir="${wix.bin.dir}"
66+
extensions="${wix.bin.dir}/WixUIExtension.dll;${wix.bin.dir}/WixVSExtension.dll"
67+
cultures="en-us">
68+
<sources>
69+
<include name="${msi.tmp.dir}/APIDocumentation.wixobj" />
3870
</sources>
3971
</light>
4072

‎src/NHibernate.Setup/NHibernate.Setup.wixproj

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)