Merge lp:~charlie.poole/nunit-3.0/build-script into lp:~nunit-core/nunit-3.0/trunk-before-upgrade

[Charlie Poole]

[Charlie Poole (charlie.poole)]

Changes to allow building windows install project from the NAnt script.

[lp:~charlie.poole/nunit-3.0/build-script]

17. By Charlie Poole on 2009-08-23

Add missing files to VS solutions source

18. By Charlie Poole on 2009-08-23

Remove one level from default install location

19. By Charlie Poole on 2009-08-23

Use WixUI_FeatureTree rather than WixUI_Mondo dialog set

20. By Charlie Poole on 2009-08-23

Add custom bitmpaps to the installer UI

=== modified file 'install/License.rtf'
--- install/License.rtf	2009-08-11 23:27:25 +0000
+++ install/License.rtf	2009-08-22 19:25:48 +0000
@@ -1,23 +1,12 @@
 {\rtf1\ansi\ansicpg1252\deff0\deflang3079{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}}
-{\*\generator Msftedit 5.41.21.2508;}\viewkind4\uc1\pard\f0\fs20 Copyright (c) 2004-2009 Charlie Poole\par
-\par
-\pard\ri70 Permission is hereby granted, free of charge, to any person obtaining a copy\par
-\pard of this software and associated documentation files (the "Software"), to deal\par
-in the Software without restriction, including without limitation the rights\par
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\par
-copies of the Software, and to permit persons to whom the Software is\par
-furnished to do so, subject to the following conditions:\par
-\par
-The above copyright notice and this permission notice shall be included in\par
-all copies or substantial portions of the Software.\par
-\par
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\par
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\par
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\par
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\par
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\par
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\par
-THE SOFTWARE.\par
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\f0\fs20 Copyright (c) 2009 Charlie Poole\par
+\par
+\pard\ri70 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\par
+\pard copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
+\par
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\par
+\par
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\par
 \par
 }
 
\ No newline at end of file

=== removed file 'install/NUnit.Framework.Installer/Definitions.wxi'
--- install/NUnit.Framework.Installer/Definitions.wxi	2009-08-11 23:27:25 +0000
+++ install/NUnit.Framework.Installer/Definitions.wxi	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include>
-    <!-- Most of the definitions will be passed by the build script. -->
-    <?define NominalVersion="3.0"?>
-    <?define ProductVersion="3.0.0"?>
-    <?define SourceFolder="..\..\build\"?>
-</Include>

=== modified file 'install/NUnit.Framework.Installer/Framework-NET1.1.wxs'
--- install/NUnit.Framework.Installer/Framework-NET1.1.wxs	2009-08-18 00:12:11 +0000
+++ install/NUnit.Framework.Installer/Framework-NET1.1.wxs	2009-08-22 19:30:31 +0000
@@ -1,61 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?include Definitions.wxi ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     
     <Fragment>
 
-        <DirectoryRef Id="FrameworkFolder">
+        <DirectoryRef Id="FrameworkBinFolder" FileSource="$(var.InstallImage)/bin">
             <Directory Id="FrameworkNet11Folder" Name="net-1.1">
-                <Component Id="nunit.framework.dll_net1.1_dir" Guid="9b19e04a-32f7-42de-812a-93988c581e5b">
-                    <Condition>NOT INSTALLINGAC</Condition>
-
-                    <File Id="nunit.framework.dll_net1.1_dir"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Assembly="no"
-                          Source="$(var.SourceFolder)net\1.1\release\nunit.framework.dll"/>
-
-                </Component>
-
-                <Component Id="nunit.framework.dll_net1.1_gac" Guid="4fac4e20-d135-4ff2-b595-4116f7be192c">
-                    <Condition>INSTALLINGAC</Condition>
-
-                    <File Id="nunit.framework.dll_net1.1_gac"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Assembly=".net"
-                          Source="$(var.SourceFolder)net\1.1\release\nunit.framework.dll"/>
-
-                </Component>
-
-                <Component Id="nunit.framework.tests.dll_net1.1" Guid="4c3d2d31-f468-4bd2-832f-19f3e500f24a">
-                    <File Id="nunit.framework.tests.dll_net1.1"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Assembly="no"
-                          Source="$(var.SourceFolder)net\1.1\release\nunit.framework.tests.dll"/>
-
-                </Component>
-
-                <Component Id="nunit.framework.xml_net1.1" Guid="a657bbb7-48fd-49de-b0c9-79d143645d16">
-
-                    <File Id="nunit.framework.xml_net1.1"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Source="$(var.SourceFolder)net\1.1\release\nunit.framework.xml"/>
-
-                </Component>
-
-                <Component Id="AssemblyReferenceFolder_1.1" Guid="8fa8f040-2de4-4192-82e2-a5c6f3f0f082">
-                    <RegistryKey Id="R__Assemblies_1.1" Root="HKLM"
-                                 Key="Software\Microsoft\.NETFramework\AssemblyFolders\NUnit [ProductVersion]"
-                                 Action="createAndRemoveOnUninstall">
-
-                        <RegistryValue Id="R__Assemblies_1.1_Default" Action="write" Type="string" Value="[FrameworkNet11Folder]"/>
-                    </RegistryKey>
-                </Component>
+              <Component Id="nunit.framework.dll_net1.1_dir" Guid="9b19e04a-32f7-42de-812a-93988c581e5b">
+                <Condition>NOT INSTALLINGAC</Condition>
+
+                <File Id="nunit.framework.dll_net1.1_dir"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Assembly="no"
+                      Name="nunit.framework.dll"/>
+
+              </Component>
+
+              <Component Id="nunit.framework.dll_net1.1_gac" Guid="4fac4e20-d135-4ff2-b595-4116f7be192c">
+                <Condition>INSTALLINGAC</Condition>
+
+                <File Id="nunit.framework.dll_net1.1_gac"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Assembly=".net"
+                      Name="nunit.framework.dll"/>
+
+              </Component>
+
+              <Component Id="nunit.framework.tests.dll_net1.1" Guid="4c3d2d31-f468-4bd2-832f-19f3e500f24a">
+                <File Id="nunit.framework.tests.dll_net1.1"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Assembly="no"
+                      Name="nunit.framework.tests.dll"/>
+
+              </Component>
+
+              <Component Id="nunit.framework.xml_net1.1" Guid="a657bbb7-48fd-49de-b0c9-79d143645d16">
+
+                <File Id="nunit.framework.xml_net1.1"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Name="nunit.framework.xml"/>
+
+              </Component>
+
+              <Component Id="AssemblyReferenceFolder_1.1" Guid="8fa8f040-2de4-4192-82e2-a5c6f3f0f082">
+                <RegistryKey Id="R__Assemblies_1.1" Root="HKLM"
+                             Key="Software\Microsoft\.NETFramework\AssemblyFolders\NUnit [ProductVersion]"
+                             Action="createAndRemoveOnUninstall">
+
+                  <RegistryValue Id="R__Assemblies_1.1_Default" Action="write" Type="string" Value="[FrameworkNet11Folder]"/>
+                </RegistryKey>
+              </Component>
             </Directory>
         </DirectoryRef>
 

=== modified file 'install/NUnit.Framework.Installer/Framework-NET2.0.wxs'
--- install/NUnit.Framework.Installer/Framework-NET2.0.wxs	2009-08-18 00:12:11 +0000
+++ install/NUnit.Framework.Installer/Framework-NET2.0.wxs	2009-08-22 19:30:31 +0000
@@ -1,62 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?include Definitions.wxi ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
     <Fragment>
 
-        <DirectoryRef Id="FrameworkFolder">
+        <DirectoryRef Id="FrameworkBinFolder" FileSource="$(var.InstallImage)\bin">
             <Directory Id="FrameworkNet20Folder" Name="net-2.0">
-                <Component Id="nunit.framework.dll_net2.0_dir" Guid="eee247ab-5d00-45c5-bfa5-23e0aec1cf7d">
-                    <Condition>NOT INSTALLINGAC</Condition>
-
-                    <File Id="nunit.framework.dll_net2.0_dir"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Assembly="no"
-                          Source="$(var.SourceFolder)net\2.0\release\nunit.framework.dll"/>
-
-                </Component>
-
-                <Component Id="nunit.framework.dll_net2.0_gac" Guid="725537ca-3e8f-4bab-9166-da4d5e91fa5f">
-                    <Condition>INSTALLINGAC</Condition>
-
-                    <File Id="nunit.framework.dll_net2.0_gac"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Assembly=".net"
-                          Source="$(var.SourceFolder)net\2.0\release\nunit.framework.dll"/>
-
-                </Component>
-
-                <Component Id="nunit.framework.tests.dll_net2.0" Guid="4f40f59f-07de-47e6-a3ed-b4a1b71ef93a">
-                    <File Id="nunit.framework.tests.dll_net2.0"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Assembly="no"
-                          Source="$(var.SourceFolder)net\2.0\release\nunit.framework.tests.dll"/>
-
-                </Component>
-
-                <Component Id="nunit.framework.xml_net2.0" Guid="79cb5e96-68f4-4002-aa04-eebc494bba89">
-
-                    <File Id="nunit.framework.xml_net2.0"
-                          DiskId="1"
-                          KeyPath="yes"
-                          Source="$(var.SourceFolder)net\2.0\release\nunit.framework.xml"/>
-
-                </Component>
-
-                <Component Id="AssemblyReferenceFolder_2.0" Guid="87667d1d-8542-41f7-99f2-b3900324d05a">
-                    <RegistryKey Id="R__Assemblies_2.0"
-                                 Action="createAndRemoveOnUninstall"
-                                 Root="HKLM"
-                                 Key="Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\NUnit [ProductVersion]">
-
-                        <RegistryValue Id="R__Assemblies_2.0_Default" Action="write" Type="string" Value="[FrameworkNet20Folder]"/>
-                    </RegistryKey>
-                </Component>
+              <Component Id="nunit.framework.dll_net2.0_dir" Guid="eee247ab-5d00-45c5-bfa5-23e0aec1cf7d">
+                <Condition>NOT INSTALLINGAC</Condition>
+
+                <File Id="nunit.framework.dll_net2.0_dir"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Assembly="no"
+                      Name="nunit.framework.dll"/>
+
+              </Component>
+
+              <Component Id="nunit.framework.dll_net2.0_gac" Guid="725537ca-3e8f-4bab-9166-da4d5e91fa5f">
+                <Condition>INSTALLINGAC</Condition>
+
+                <File Id="nunit.framework.dll_net2.0_gac"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Assembly=".net"
+                      Name="nunit.framework.dll"/>
+
+              </Component>
+
+              <Component Id="nunit.framework.tests.dll_net2.0" Guid="4f40f59f-07de-47e6-a3ed-b4a1b71ef93a">
+                <File Id="nunit.framework.tests.dll_net2.0"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Assembly="no"
+                      Name="nunit.framework.tests.dll"/>
+
+              </Component>
+
+              <Component Id="nunit.framework.xml_net2.0" Guid="79cb5e96-68f4-4002-aa04-eebc494bba89">
+
+                <File Id="nunit.framework.xml_net2.0"
+                      DiskId="1"
+                      KeyPath="yes"
+                      Name="nunit.framework.xml"/>
+
+              </Component>
+
+              <Component Id="AssemblyReferenceFolder_2.0" Guid="87667d1d-8542-41f7-99f2-b3900324d05a">
+                <RegistryKey Id="R__Assemblies_2.0"
+                             Action="createAndRemoveOnUninstall"
+                             Root="HKLM"
+                             Key="Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\NUnit [ProductVersion]">
+
+                  <RegistryValue Id="R__Assemblies_2.0_Default" Action="write" Type="string" Value="[FrameworkNet20Folder]"/>
+                </RegistryKey>
+              </Component>
             </Directory>
         </DirectoryRef>
 

=== modified file 'install/NUnit.Framework.Installer/NUnit.Framework.Installer.wixproj'
--- install/NUnit.Framework.Installer/NUnit.Framework.Installer.wixproj	2009-08-18 00:12:11 +0000
+++ install/NUnit.Framework.Installer/NUnit.Framework.Installer.wixproj	2009-08-22 19:30:31 +0000
@@ -13,7 +13,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>ProductVersion=2.9.1;NominalVersion=2.9.1;InstallImage=..\..\package\NUnit-2.9.1</DefineConstants>
+    <WixVariables>
+    </WixVariables>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -34,9 +36,6 @@
       <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
     </WixExtension>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Definitions.wxi" />
-  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

=== modified file 'install/NUnit.Framework.Installer/Product.wxs'
--- install/NUnit.Framework.Installer/Product.wxs	2009-08-21 19:49:56 +0000
+++ install/NUnit.Framework.Installer/Product.wxs	2009-08-22 19:30:31 +0000
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?include Definitions.wxi ?>
-
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	
     <Product Id="80da6878-5da5-4862-a29f-ff4a96714e59"
@@ -24,7 +22,10 @@
 			<Directory Id="ProgramFilesFolder">
 				<Directory Id="INSTALLDIR" Name="NUnit">
                     <Directory Id="FrameworkRootFolder" Name="Framework">
-                        <Directory Id="FrameworkFolder" Name="$(var.NominalVersion)"/>
+                      <Directory Id="FrameworkFolder" Name="$(var.NominalVersion)">
+                        <Directory Id="FrameworkBinFolder" Name="bin"/>
+                        <Directory Id="FrameworkDocFolder" Name="doc"/>
+                      </Directory>
                     </Directory>
 				</Directory>
 			</Directory>
@@ -40,8 +41,7 @@
             <FeatureRef Id="FrameworkNet20"/>
         </Feature>
 
-        <!-- The following line causes an error in the NAnt build     -->
-        <!--<WixVariable Id="WixUILicenseRtf" Value="..\License.rtf"/>-->
+        <WixVariable Id="WixUILicenseRtf" Value="..\License.rtf"/>
         <UIRef Id="NUnitUI_Framework"/>
 
         <Media Id="1" Cabinet="nunit.cab" EmbedCab="yes" />

=== modified file 'nunit.build'
--- nunit.build	2009-08-21 19:49:56 +0000
+++ nunit.build	2009-08-22 19:30:31 +0000
@@ -23,23 +23,14 @@
   <!-- Project name - used as a prefix for packages -->
   <property name="project.name" value="NUnit"/>
 
-  <!-- NUnit Base Package Version - First three digits -->
-  <property name="base.package.version" value="2.9.1"/>
+  <!-- NUnit Package Version - Three digits -->
+  <property name="package.version" value="2.9.1"/>
 
   <!-- Nominal version used for install directory and program
        files menu. Normally the same as the package version, 
        but may differ when we are in alpha or beta. -->
   <property name="nominal.version" value="2.9.1" />
 
-  <!-- Determine todays build number -->
-  <property name="temp.now" value="${datetime::now()}"/>
-  <property name="temp.yr" value="${datetime::get-year(temp.now)-2000}"/>
-  <property name="temp.day" value="${string::pad-left(datetime::get-day-of-year(temp.now),3,'0')}"/>
-  <property name="package.build.number" value="${temp.yr}${temp.day}"/>
-
-  <!-- NUnit full package version -->
-  <property name="package.version" value="${base.package.version}.${package.build.number}"/>
-
   <!-- Package Configuration (Release, Alpha, Beta, etc.) -->
   <property name="package.configuration" value=""/>
   
@@ -256,8 +247,6 @@
     <property name="partcover.commandline" 
       value='--target="${nunit.console.dir}/nunit-console.exe" --target-args="${nunit.commandline}" --include=[nunit.framework]* --output=TestCoverage-${nant.settings.currentframework}.xml'/>
 
-    <echo message="PartCover ${partcover.commandline}"/>
-
     <exec basedir="${partcover.dir}"
           workingdir="${current.build.dir}" 
 	  program="PartCover.exe" 
@@ -486,11 +475,11 @@
       if="${package.config==default.package.config}"/>
 
     <candle out="${work.dir}/" exedir="${wix.dir}">
-      <!--<defines>
+      <defines>
         <define name="ProductVersion" value="${package.version}" />
         <define name="NominalVersion" value="${nominal.version}" />
         <define name="InstallImage" value="package\NUnit-${package.version}" />
-      </defines>-->
+      </defines>
       <sources basedir="${project.install.dir}">
         <include name="**/*.wxs" />
       </sources>
@@ -498,7 +487,8 @@
 
     <light exedir="${wix.dir}"
       out="${project.package.dir}/${msi.file.name}" 
-      extensions="WixUIExtension;WixNetFxExtension" >
+      extensions="WixUIExtension;WixNetFxExtension">
+      <arg line="-b ${project.install.dir}\NUnit.Framework.Installer"/>
       <sources>
         <include name="${work.dir}/*.wixobj" />
         <include name="${wix.dir}/wixui.wixlib" />