Commmit first draft of projects to build the MSIs. Note that the merge modules are...
authorRod Widdowson <rdw@steadingsoftware.com>
Wed, 17 Oct 2012 15:18:00 +0000 (15:18 +0000)
committerRod Widdowson <rdw@steadingsoftware.com>
Wed, 17 Oct 2012 15:18:00 +0000 (15:18 +0000)
msi/WiX/Library/Library.wixproj [new file with mode: 0644]
msi/WiX/Shibboleth32/Shibboleth32.wixproj [new file with mode: 0644]
msi/WiX/Shibboleth64/Shibboleth64.wixproj [new file with mode: 0644]

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