<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
<Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >\r
- <Component Id='libeay32.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>\r
+ <Component Id='libeay32.dll' Guid='{DCB83813-11B4-469D-BD26-5DBF9815AC36}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
- <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>\r
+ <Component Id='ssleay32.dll' Guid='{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
<Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
</Component>\r
<Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>\r
- <Component Id='libeay32D.dll' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>\r
+ <Component Id='libeay32D.dll' Guid='{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
- <Component Id='ssleay32D.dll' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>\r
+ <Component Id='ssleay32D.dll' Guid='{8FBB6D41-0044-4969-AA27-813EF2606C7A}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
<Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
<Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
- <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>\r
+ <Component Id='libeay32.dll' Guid='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}'>\r
<File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
- <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>\r
+ <Component Id='ssleay32.dll' Guid='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}'>\r
<File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
<Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
<File KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
</Component>\r
<Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >\r
- <Component Id='libeay32D.dll' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
+ <Component Id='libeay32D.dll' Guid='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}'>\r
<File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
- <Component Id='ssleay32D.dll' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
+ <Component Id='ssleay32D.dll' Guid='{A9583DF6-F075-4F43-991C-3611B31036DF}'>\r
<File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
<Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
<Directory Id='lib' Name='lib'>\r
<Component Id='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes'\r
- Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>\r
</Component>\r
<Directory Id='lib_debug' Name='debug'>\r
<Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes'\r
- Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
<Directory Id='lib' Name='lib'>\r
<Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>\r
<File KeyPath='yes' Checksum='yes'\r
- Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'/>\r
</Component>\r
<Directory Id='lib_debug' Name='debug'>\r
<Component Id='zlib1d.dll' Guid='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}'>\r
<File KeyPath='yes' Checksum='yes'\r
- Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
PATH=%PATH%;"C:\Program Files (x86)\Windows Installer XML v3.5\bin"
-goto current
+rem goto current
wixcop -indent:2 Curl-x86.wxs
candle Curl-x86.wxs
candle OpenSAML-x64.wxs
light OpenSAML-x64.wixobj
smoke OpenSAML-x64.msm
-goto done
+rem goto done
wixcop -indent:2 OpenSSL-x86.wxs
candle OpenSSL-x86.wxs
<!-- DO NOT CHANGE UpgradeCode -->\r
<?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>\r
\r
- <?define CurlVersion='7.21.7' ?>\r
+ <?define CurlVersion='7.26.0' ?>\r
\r
<?define FastCGIVersion='2.4.0' ?>\r
\r
<?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
<?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
\r
- <?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->\r
- <?define OpenSSLDirVersion='1.0.0i' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
- <?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+ <?define OpenSSLVersion='1.0.1.3' ?><!-- 1.0.1c -->\r
+ <?define OpenSSLDirVersion='1.0.1c' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
+ <?define OpenSSLFileVersion='1_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
<?define ShibbolethDllFileVersion='1_5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
<?define XmlToolingVersion='1.5.0' ?>\r
<?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
\r
- <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->\r
+ <?define ZlibVersion='1.2.7' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'-->\r
<?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
</Include>\r