Merge pull request #22 from nunit/issue-1

Refactor: remove legacy common content
2017-07-25 10:21:17 -04:00 · 2017-07-25 10:21:17 -04:00 · 67ad98e652
--- a/BUILDING.md
+++ b/BUILDING.md
@ -31,4 +31,6 @@ important top-level tasks to use are listed here:
 FetchPackages           Retrieves the latest versions of the required assemblies, from the latest NuGet packages.
 CreateImage             Extracts the assemblies from the NuGet packages, and adds other required files to an image directory.
 PackageMsi              Builds the MSI.
+ PackageZip              Builds the Zip.
+ PackageAll              Builds all distributables.
 ```
--- a/common/common-directories.wxi
+++ b/common/common-directories.wxi
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Include>
-    <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLDIR" Name="NUnit.org">
-                </Directory>
-            </Directory>
-        </Directory>
-    </Fragment>
-</Include>
--- a/common/common-features.wxi
+++ b/common/common-features.wxi
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Include>
-    <Feature Id="NUNIT.COMMON"
-             ConfigurableDirectory="INSTALLDIR"
-             Level="1"
-             Absent="disallow"
-             Title="NUnit Common"
-             Description="Installs common NUnit files." >
-        <ComponentGroupRef Id="NUNIT.COMMON"/>
-    </Feature>
-</Include>
--- a/common/banner.bmp
+++ b/common/banner.bmp
--- a/common/dialog.bmp
+++ b/common/dialog.bmp
--- a/nunit/nunit.wixproj
+++ b/nunit/nunit.wixproj
@ -35,23 +35,13 @@
    </WixExtension>
  </ItemGroup>
  <ItemGroup>
-    <Content Include="..\common\common-directories.wxi">
-      <Link>common-directories.wxi</Link>
-    </Content>
-    <Content Include="..\common\common-features.wxi">
-      <Link>common-features.wxi</Link>
-    </Content>
-    <Content Include="..\common\common-files.wxi">
-      <Link>common-files.wxi</Link>
-    </Content>
-    <Content Include="..\common\variables.wxi">
-      <Link>variables.wxi</Link>
-    </Content>
    <Content Include="addin-files.wxi" />
    <Content Include="console-files.wxi" />
    <Content Include="engine-files.wxi" />
    <Content Include="runner-directories.wxi" />
    <Content Include="runner-features.wxi" />
+    <Content Include="utility-files.wxi" />
+    <Content Include="variables.wxi" />
  </ItemGroup>
  <Import Project="$(WixTargetsPath)" />
 </Project>
--- a/nunit/nunit.wxs
+++ b/nunit/nunit.wxs
@ -10,23 +10,18 @@
        <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

        <MajorUpgrade DowngradeErrorMessage="A newer version is already installed; please uninstall it and re-run setup." AllowSameVersionUpgrades="yes" />
-
-        <!-- Include the information that is common to all installs -->
-        <?include ..\common\variables.wxi ?>
-
-        <!-- Features -->
-        <?include ..\common\common-features.wxi ?>
+        
+        <?include variables.wxi ?>
        <?include runner-features.wxi ?>

    </Product>

    <!-- Directories -->
-    <?include ..\common\common-directories.wxi ?>
    <?include runner-directories.wxi ?>

    <!-- Components and files -->
-    <?include ..\common\common-files.wxi ?>
    <?include addin-files.wxi ?>
    <?include console-files.wxi ?>
    <?include engine-files.wxi ?>
+    <?include utility-files.wxi ?>
 </Wix>
--- a/nunit/runner-directories.wxi
+++ b/nunit/runner-directories.wxi
@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLDIR" Name="NUnit.org">
+        </Directory>
+      </Directory>
+    </Directory>
    <DirectoryRef Id="INSTALLDIR">
      <Directory Id="CONSOLE_BIN" Name="nunit-console">
        <Directory Id="ADDINS" Name="addins" />
--- a/nunit/runner-features.wxi
+++ b/nunit/runner-features.wxi
@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-    <Feature Id="NUNIT.RUNNERS"
+     <Feature Id="NUNIT.RUNNERS"
             ConfigurableDirectory="INSTALLDIR"
             Level="1"
             Title="NUnit Runners"
             Display="expand"
             Description="Installs the NUnit engine and the console runner that allows you to run tests.">
-
-        <Feature Id="NUNIT.ENGINE"
-                 Level="1"
-                 Absent="disallow"
-                 Title="NUnit Engine"
-                 Description="Installs the NUnit engine">
-            <ComponentGroupRef Id="NUNIT.ENGINE" />
-            <Feature Id="ADDINS.NUNIT.PROJECT.LOADER"
-                        Level="1"
-                        Title="NUnit Project Loader"
-                        Description="Allows you to load NUnit Project files">
-                <ComponentGroupRef Id="ADDINS.NUNIT.PROJECT.LOADER" />
-            </Feature>
-            <Feature Id="ADDINS.VS.PROJECT.LOADER"
-                        Level="1"
-                        Title="Visual Studio Project Loader"
-                        Description="Allows you to load Visual Studio Solution and Project files">
-                <ComponentGroupRef Id="ADDINS.VS.PROJECT.LOADER" />
-            </Feature>
-            <Feature Id="NUNIT.V2.DRIVER"
-                     Level="1"
-                     Title="NUnit 2.x Driver"
-                     Description="Allows you to run NUnit 2.x test suites">
-                <ComponentGroupRef Id="NUNIT.V2.DRIVER" />
-            </Feature>
-            <Feature Id="ADDINS.NUNIT.V2.WRITER"
-                        Level="1"
-                        Title="NUnit 2.x Result Writer"
-                        Description="Allows you to write test results out in the NUnit 2.x format">
-                <ComponentGroupRef Id="ADDINS.NUNIT.V2.WRITER" />
-            </Feature>
-            <Feature Id="TEAMCITY.EVENT.LISTENER"
-                     Level="1"
-                     Title="TeamCity Event Listener"
-                     Description="Provides progress messages when running under TeamCity">
-                <ComponentGroupRef Id="TEAMCITY.EVENT.LISTENER" />
-             </Feature>
+      <ComponentGroupRef Id="NUNIT.RUNNERS" />
+      <Feature Id="NUNIT.ENGINE"
+               Level="1"
+               Absent="disallow"
+               Title="NUnit Engine"
+               Description="Installs the NUnit engine">
+        <ComponentGroupRef Id="NUNIT.ENGINE" />
+        <Feature Id="ADDINS.NUNIT.PROJECT.LOADER"
+                    Level="1"
+                    Title="NUnit Project Loader"
+                    Description="Allows you to load NUnit Project files">
+          <ComponentGroupRef Id="ADDINS.NUNIT.PROJECT.LOADER" />
        </Feature>
-
-        <Feature Id="NUNIT.CONSOLE"
-                 Level="1"
-                 Title="NUnit Console"
-                 Description="Installs the NUnit console runner">
-            <ComponentGroupRef Id="NUNIT.CONSOLE" />
+        <Feature Id="ADDINS.VS.PROJECT.LOADER"
+                    Level="1"
+                    Title="Visual Studio Project Loader"
+                    Description="Allows you to load Visual Studio Solution and Project files">
+          <ComponentGroupRef Id="ADDINS.VS.PROJECT.LOADER" />
        </Feature>
+        <Feature Id="NUNIT.V2.DRIVER"
+                 Level="1"
+                 Title="NUnit 2.x Driver"
+                 Description="Allows you to run NUnit 2.x test suites">
+          <ComponentGroupRef Id="NUNIT.V2.DRIVER" />
+        </Feature>
+        <Feature Id="ADDINS.NUNIT.V2.WRITER"
+                    Level="1"
+                    Title="NUnit 2.x Result Writer"
+                    Description="Allows you to write test results out in the NUnit 2.x format">
+          <ComponentGroupRef Id="ADDINS.NUNIT.V2.WRITER" />
+        </Feature>
+        <Feature Id="TEAMCITY.EVENT.LISTENER"
+                 Level="1"
+                 Title="TeamCity Event Listener"
+                 Description="Provides progress messages when running under TeamCity">
+          <ComponentGroupRef Id="TEAMCITY.EVENT.LISTENER" />
+        </Feature>
+      </Feature>
+
+      <Feature Id="NUNIT.CONSOLE"
+               Level="1"
+               Title="NUnit Console"
+               Description="Installs the NUnit console runner">
+        <ComponentGroupRef Id="NUNIT.CONSOLE" />
+      </Feature>
    </Feature>
 </Include>
--- a/nunit/utility-files.wxi
+++ b/nunit/utility-files.wxi
@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Include>
    <Fragment>
-        <ComponentGroup Id="NUNIT.COMMON" Directory="INSTALLDIR">
+        <ComponentGroup Id="NUNIT.RUNNERS" Directory="INSTALLDIR">
            <Component Id="COMPONENTS.txt" Location="local" Guid="DD64E89E-8ADC-42F7-8F53-6594A97C291C">
                <File Id="COMPONENTS.txt" Source="$(var.InstallImage)\COMPONENTS.txt" />
            </Component>
@ -16,4 +16,4 @@
            </Component>
        </ComponentGroup>
    </Fragment>
-</Include>
+</Include>
--- a/common/variables.wxi
+++ b/common/variables.wxi
@ -48,6 +48,6 @@
    <UIRef Id="WixUI_Mondo" />
    <UIRef Id="WixUI_ErrorProgressText" />

-    <WixVariable Id="WixUIBannerBmp" Value="..\common\banner.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="..\common\dialog.bmp" />
+    <WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="dialog.bmp" />
 </Include>