From c245229f2b0384f2c767caadd8aaed6513e3fb93 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Wed, 17 Oct 2012 15:18:00 +0000
Subject: [PATCH] Commmit first draft of projects to build the MSIs.  Note that
 the merge modules are to come as is integration into the sln and moving of
 Versions.wxi into Versions.props

---
 msi/WiX/Library/Library.wixproj           | 39 +++++++++++++++++++
 msi/WiX/Shibboleth32/Shibboleth32.wixproj | 63 ++++++++++++++++++++++++++++++
 msi/WiX/Shibboleth64/Shibboleth64.wixproj | 64 +++++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+)
 create mode 100644 msi/WiX/Library/Library.wixproj
 create mode 100644 msi/WiX/Shibboleth32/Shibboleth32.wixproj
 create mode 100644 msi/WiX/Shibboleth64/Shibboleth64.wixproj

diff --git a/msi/WiX/Library/Library.wixproj b/msi/WiX/Library/Library.wixproj
new file mode 100644
index 0000000..fa222fb
--- /dev/null
+++ b/msi/WiX/Library/Library.wixproj
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <InstallerPlatform>x86</InstallerPlatform>
+    <ProductVersion>3.5</ProductVersion>
+    <ProjectGuid>{2d6dd290-8f35-434a-baf0-a3271dd36280}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Shibboleth</OutputName>
+    <OutputType>Library</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
+    <OutputPath>..\</OutputPath>
+    <IntermediateOutputPath>.\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
+    <OutputPath>..\</OutputPath>
+    <IntermediateOutputPath>.\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup >
+    <Compile Include="../ShibbolethSP-gui.wxs" />
+    <Compile Include="../ShibbolethSP-install-dlg.wxs" />
+    <Compile Include="../ShibbolethSP-exe-x86.wxs" />
+    <Compile Include="../ShibbolethSP-noarch.wxs" />
+    <Compile Include="../ShibbolethSP-registry-x86.wxs" />
+    <Compile Include="../ShibbolethSP-update-dlg.wxs" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+<!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
diff --git a/msi/WiX/Shibboleth32/Shibboleth32.wixproj b/msi/WiX/Shibboleth32/Shibboleth32.wixproj
new file mode 100644
index 0000000..bf5c80f
--- /dev/null
+++ b/msi/WiX/Shibboleth32/Shibboleth32.wixproj
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\props.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <InstallerPlatform>x86</InstallerPlatform>
+    <ProductVersion>3.5</ProductVersion>
+    <ProjectGuid>{cb336986-b518-4b6f-96a7-6ca17ada82df}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Shibboleth32</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
+    <OutputPath>..\</OutputPath>
+    <IntermediateOutputPath>.\</IntermediateOutputPath>
+    <DefineConstants>Debug;BuildRoot=$(CxxTestRoot)</DefineConstants>
+    <LinkerAdditionalOptions>-sw1055 -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension</LinkerAdditionalOptions>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+    <SuppressIces>ICE82</SuppressIces>
+    <WixVariables>
+    </WixVariables>
+    <CompilerAdditionalOptions>
+    </CompilerAdditionalOptions>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
+    <OutputPath>..\</OutputPath>
+    <IntermediateOutputPath>.\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\ShibbolethSP-exe-x86.wxs">
+      <Link>ShibbolethSP-exe-x86.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-gui.wxs">
+      <Link>ShibbolethSP-gui.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-install-dlg.wxs">
+      <Link>ShibbolethSP-install-dlg.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-main-x86.wxs">
+      <Link>ShibbolethSP-main-x86.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-noarch.wxs">
+      <Link>ShibbolethSP-noarch.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-registry-x86.wxs">
+      <Link>ShibbolethSP-registry-x86.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-update-dlg.wxs">
+      <Link>ShibbolethSP-update-dlg.wxs</Link>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/msi/WiX/Shibboleth64/Shibboleth64.wixproj b/msi/WiX/Shibboleth64/Shibboleth64.wixproj
new file mode 100644
index 0000000..257c71d
--- /dev/null
+++ b/msi/WiX/Shibboleth64/Shibboleth64.wixproj
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <ProductVersion>3.5</ProductVersion>
+    <ProjectGuid>{d0ca844c-998e-4ab6-8274-059cee8c2fe8}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Shibboleth64</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>..\</OutputPath>
+    <IntermediateOutputPath>.\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+    <LinkerAdditionalOptions>-sw1055 -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension</LinkerAdditionalOptions>
+    <SuppressIces>ICE82</SuppressIces>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>..\</OutputPath>
+    <IntermediateOutputPath>.\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\ShibbolethSP-exe-x64.wxs">
+      <Link>ShibbolethSP-exe-x64.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-exe-x86.wxs">
+      <Link>ShibbolethSP-exe-x86.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-gui.wxs">
+      <Link>ShibbolethSP-gui.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-install-dlg.wxs">
+      <Link>ShibbolethSP-install-dlg.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-main-x64.wxs">
+      <Link>ShibbolethSP-main-x64.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-noarch.wxs">
+      <Link>ShibbolethSP-noarch.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-registry-x64.wxs">
+      <Link>ShibbolethSP-registry-x64.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-registry-x86.wxs">
+      <Link>ShibbolethSP-registry-x86.wxs</Link>
+    </Compile>
+    <Compile Include="..\ShibbolethSP-update-dlg.wxs">
+      <Link>ShibbolethSP-update-dlg.wxs</Link>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
-- 
2.1.4