[cpp-sp] 01/02: Merge Module name and location changed in VC15.3.5
Rod Widdowson
rdw at steadingsoftware.com
Sun Oct 8 08:30:34 EDT 2017
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=07de2242d386acef76d4150a11abcf007e2d9deb
commit 07de2242d386acef76d4150a11abcf007e2d9deb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 7 17:04:02 2017 +0100
Merge Module name and location changed in VC15.3.5
In VC15.3.5 the merge module name does not track the Compiler version,
it tracks the build environment (which is VC141), so use and define that.
---
Projects/vc15/wix/Installer.vcxproj | 12 ++++++------
msi/WiX/Installer.make | 4 ++--
msi/WiX/ShibbolethSP-main-x64.wxs | 8 ++++----
msi/WiX/ShibbolethSP-main-x86.wxs | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Projects/vc15/wix/Installer.vcxproj b/Projects/vc15/wix/Installer.vcxproj
index 6155ec7..b7aff70 100644
--- a/Projects/vc15/wix/Installer.vcxproj
+++ b/Projects/vc15/wix/Installer.vcxproj
@@ -48,26 +48,26 @@ nmake /f Installer.make clean</NMakeBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all32</NMakeBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all32</NMakeBuildCommandLine>
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
del *86.wixobj
del *86.msi
del *.wixlib
del *x86.wixpdb</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild32</NMakeReBuildCommandLine>
+ <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild32</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all64</NMakeBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) CppVCVersion=$(CppVCVersion) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all64</NMakeBuildCommandLine>
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
del *64.wixobj
del *64.msmi
del *.wixlib
del *64.wixpdb</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild64</NMakeReBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) CppVCVersion=$(CppVCVersion) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild64</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
@@ -77,7 +77,7 @@ nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ Sh
<None Include="..\..\..\msi\wix\Installer.make" />
<None Include="..\..\..\msi\wix\license.rtf" />
<None Include="..\..\..\msi\wix\ShibbolethSP-defs-x86.wxi" />
- <None Include="..\..\..\msi\wix\ShibbolethSP-exe-x64.wxs"/>
+ <None Include="..\..\..\msi\wix\ShibbolethSP-exe-x64.wxs" />
<None Include="..\..\..\msi\wix\ShibbolethSP-exe-x86.wxs" />
<None Include="..\..\..\msi\wix\ShibbolethSP-gui.wxs" />
<None Include="..\..\..\msi\wix\ShibbolethSP-install-dlg.wxs" />
@@ -93,4 +93,4 @@ nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ Sh
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 0f9cd70..9b17f85 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -96,8 +96,8 @@ ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm $(FCGI64) MergeModules\Log4Shib-x64.msm MergeMo [...]
wixcop -indent:2 ShibbolethSP-main-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)"
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion)
ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
wixcop -indent:2 ShibbolethSP-main-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)"
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion)
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index f63d9c9..32ac718 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -64,8 +64,8 @@
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
- <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm' DiskId='1' />
</Directory><!--ProgramFilesFolder-->
<Directory Id='ProgramFiles64Folder' Name='PFiles'>
@@ -81,8 +81,8 @@
<Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />
- <Merge Id='Microsoft_DebugCRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_DebugCRT_x64.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_CRT_x64.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x64.msm' DiskId='1' />
</Directory><!--ProgramFiles64Folder-->
<!-- PATH -->
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 3ce6671..afbde6b 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -65,8 +65,8 @@
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
- <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm' DiskId='1' />
</Directory><!--ProgramFilesFolder-->
<Component Id='SetPath' Guid='{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}'>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list