[shibboleth-sp2] 16/23: SSPCPP-765 Convert Installers to VC15
Ferenc Wágner
wferi at moszumanska.debian.org
Wed Feb 21 10:57:07 UTC 2018
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch master
in repository shibboleth-sp2.
commit de3ec080f9739429928b50e1f13558cbd06029d3
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Wed Dec 6 10:19:50 2017 +0000
SSPCPP-765 Convert Installers to VC15
https://issues.shibboleth.net/jira/browse/SSPCPP-765
At the same time replace use of the $(OpenSSLDirVersion)
property with $(openssl) and use $(OPENSSL_MM_VERSION) for
the merge module version.
---
Projects/vc15/Shibboleth.sln | 6 +++---
Projects/vc15/wix/Installer.vcxproj | 6 ++++--
Projects/vc15/wix/MergeModules.vcxproj | 18 ++++++++++++------
msi/WiX/MergeModules/MergeModules.make | 4 ++--
msi/WiX/MergeModules/OpenSSL-x64.wxs | 6 +++---
msi/WiX/MergeModules/OpenSSL-x86.wxs | 6 +++---
6 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/Projects/vc15/Shibboleth.sln b/Projects/vc15/Shibboleth.sln
index a2bec8f..8f29762 100644
--- a/Projects/vc15/Shibboleth.sln
+++ b/Projects/vc15/Shibboleth.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+VisualStudioVersion = 15.0.27004.2002
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server Modules", "Server Modules", "{26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}"
EndProject
@@ -142,12 +142,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins-lite", "plugins\plu
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeModules", "wix\MergeModules.vcxproj", "{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeModules", "Wix\MergeModules.vcxproj", "{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}"
ProjectSection(ProjectDependencies) = postProject
{81F0F7A6-DC36-46EF-957F-F9E81D4403F6} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F6}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "wix\Installer.vcxproj", "{C2B1BB79-C88B-42B4-9AEC-170F91910F70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Wix\Installer.vcxproj", "{C2B1BB79-C88B-42B4-9AEC-170F91910F70}"
ProjectSection(ProjectDependencies) = postProject
{87C25D4E-8D19-4513-B0BA-BC668BC2DEE3} = {87C25D4E-8D19-4513-B0BA-BC668BC2DEE3}
{B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {B44C0852-83B8-4FB2-A86E-097C9C8256D1}
diff --git a/Projects/vc15/wix/Installer.vcxproj b/Projects/vc15/wix/Installer.vcxproj
index bf1b2da..1cc17b0 100644
--- a/Projects/vc15/wix/Installer.vcxproj
+++ b/Projects/vc15/wix/Installer.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,13 +19,15 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{C2B1BB79-C88B-42B4-9AEC-170F91910F70}</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
+ <Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index b0a8604..e8a611b 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,13 +19,15 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
+ <Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -56,7 +58,7 @@ nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *86.wixobj
del *86.msm
@@ -65,14 +67,14 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>
cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *64.wixobj
del *64.msm
@@ -81,8 +83,12 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+ <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 1e50ab4..414a57a 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -150,13 +150,13 @@ OpenSSL-x64.msm: OpenSSL-x64.wixobj
OpenSSL-x86.wixobj: OpenSSL-x86.wxs
wixcop -indent:2 OpenSSL-x86.wxs
- candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion)\
+ candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
-dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component)\
-dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd)
OpenSSL-x64.wixobj: OpenSSL-x64.wxs
wixcop -indent:2 OpenSSL-x64.wxs
- candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion)\
+ candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
-dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component)\
-dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd)
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index fc362eb..586c8a1 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -32,7 +32,7 @@
<Directory Id='ProgramFiles64Folder' >
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_sp' Name='SP'>
- <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.ReleaseDir)\' >
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\$(openssl)\$(var.ReleaseDir)\' >
<Component Id='libeay32.dll' Guid='$(var.LibEay64Component)' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='$(var.LibEay)' />
</Component>
@@ -42,7 +42,7 @@
<Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
</Component>
- <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.DebugDir)\'>
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\'>
<Component Id='libeay32D.dll' Guid='$(var.LibEay64Componentd)' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Name='$(var.LibEayD)' />
</Component>
@@ -56,7 +56,7 @@
</Directory><!-- lib -->
<Directory Id='doc' Name='doc'>
<Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
- <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
+ <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\$(var.openssldir)\LICENSE' />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index b204fd9..b0f2d87 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -34,7 +34,7 @@
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
<Directory Id='shibboleth' Name='Shibboleth'>
<Directory Id='shibboleth_sp' Name='SP'>
- <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.ReleaseDir)\'>
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\$(var.openssl)\$(var.ReleaseDir)\'>
<Component Id='libeay32.dll' Guid='$(var.LibEay32Component)'>
<File KeyPath='yes' Checksum='yes' Name='$(var.LibEay)' />
</Component>
@@ -44,7 +44,7 @@
<Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
<File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
</Component>
- <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\$(var.DebugDir)\' >
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\$(var.openssl)\$(var.DebugDir)\' >
<Component Id='libeay32D.dll' Guid='$(var.LibEay32Componentd)'>
<File KeyPath='yes' Checksum='yes' Name='$(var.LibEayD)' />
</Component>
@@ -58,7 +58,7 @@
</Directory><!-- lib -->
<Directory Id='doc' Name='doc'>
<Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
- <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
+ <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\$(var.openssl)\LICENSE' />
</Component>
</Directory><!-- doc -->
</Directory><!-- shibboleth_sp -->
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list