From 59698f55172be64c32821133d112bc067f32980d Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 28 Apr 2016 16:39:49 -0700
Subject: [PATCH] installer: reorg

---
 build/VStudio/{install => installer}/Product.wxs           | 0
 .../winfsp.wixproj => installer/winfsp_msi.wixproj}        | 7 +++++--
 build/VStudio/winfsp.sln                                   | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename build/VStudio/{install => installer}/Product.wxs (100%)
 rename build/VStudio/{install/winfsp.wixproj => installer/winfsp_msi.wixproj} (86%)

diff --git a/build/VStudio/install/Product.wxs b/build/VStudio/installer/Product.wxs
similarity index 100%
rename from build/VStudio/install/Product.wxs
rename to build/VStudio/installer/Product.wxs
diff --git a/build/VStudio/install/winfsp.wixproj b/build/VStudio/installer/winfsp_msi.wixproj
similarity index 86%
rename from build/VStudio/install/winfsp.wixproj
rename to build/VStudio/installer/winfsp_msi.wixproj
index 6aa74712..2185a006 100644
--- a/build/VStudio/install/winfsp.wixproj
+++ b/build/VStudio/installer/winfsp_msi.wixproj
@@ -10,19 +10,22 @@
     <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>
+    <Name>winfsp.msi</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\build\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\build\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
diff --git a/build/VStudio/winfsp.sln b/build/VStudio/winfsp.sln
index 2e2df3f5..fffe7991 100644
--- a/build/VStudio/winfsp.sln
+++ b/build/VStudio/winfsp.sln
@@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memfs", "testing\memfs.vcxp
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332} = {C85C26BA-8C22-4D30-83DA-46C3548E6332}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "install", "install", "{B464EF06-42AE-4674-81BB-FDDE80204822}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "installer", "installer", "{B464EF06-42AE-4674-81BB-FDDE80204822}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "winfsp", "install\winfsp.wixproj", "{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "winfsp_msi", "installer\winfsp_msi.wixproj", "{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} = {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}
 		{C85C26BA-8C22-4D30-83DA-46C3548E6332} = {C85C26BA-8C22-4D30-83DA-46C3548E6332}
@@ -74,8 +74,10 @@ Global
 		{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.Build.0 = Release|Win32
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x64.ActiveCfg = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x86.ActiveCfg = Debug|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Debug|x86.Build.0 = Debug|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x64.ActiveCfg = Release|x86
 		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x86.ActiveCfg = Release|x86
+		{D53AAC39-4C57-4CA5-A4F3-C2B24888C594}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE