Add a ShibbolethPatchVersion variable to the MSI builds.

[shibboleth/cpp-sp.git] / msi / WiX / Installer.vcxproj

diff --git a/msi/WiX/Installer.vcxproj b/msi/WiX/Installer.vcxproj
index ed01d3b..9e79e69 100644 (file)
--- a/msi/WiX/Installer.vcxproj
+++ b/msi/WiX/Installer.vcxproj
@@ -37,7 +37,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <Import Project="..\..\..\BuildPath.props" />\r
-  <Import Project="..\..\MsBuild\Versions.props" />\r
+  <Import Project="$(ParentRoot)\Versions.props" />\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
     <NMakeBuildCommandLine>nmake /f Installer.make clean</NMakeBuildCommandLine>\r
@@ -46,27 +46,43 @@
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>\r
+    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>\r
     <NMakeCleanCommandLine>del *86.wixobj\r
 del *86.msi\r
 del *.wixlib\r
 del *x86.wixpdb</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>\r
+    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>\r
     <NMakePreprocessorDefinitions>\r
     </NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>\r
+    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>\r
     <NMakeCleanCommandLine>del *64.wixobj\r
 del *64.msmi\r
 del *.wixlib\r
 del *64.wixpdb</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>\r
+    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>\r
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <None Include="Dialog.bmp" />\r
+    <None Include="Installer.make" />\r
+    <None Include="license.rtf" />\r
+    <None Include="ShibbolethSP-defs-x86.wxi" />\r
+    <None Include="ShibbolethSP-exe-x64.wxs" />\r
+    <None Include="ShibbolethSP-exe-x86.wxs" />\r
+    <None Include="ShibbolethSP-gui.wxs" />\r
+    <None Include="ShibbolethSP-install-dlg.wxs" />\r
+    <None Include="ShibbolethSP-main-x64.wxs" />\r
+    <None Include="ShibbolethSP-main-x86.wxs" />\r
+    <None Include="ShibbolethSP-noarch.wxs" />\r
+    <None Include="ShibbolethSP-properties.wxi" />\r
+    <None Include="ShibbolethSP-registry-x64.wxs" />\r
+    <None Include="ShibbolethSP-registry-x86.wxs" />\r
+    <None Include="ShibbolethSP-update-dlg.wxs" />\r
+    <None Include="TopBanner.bmp" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r