[cpp-msbuild] 01/03: SSPCPP-689 Trust OpenSSL not to break their ABI

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=2c19793e017752e1ec46284df2f570dc9debf7bf

commit 2c19793e017752e1ec46284df2f570dc9debf7bf
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Sep 5 15:30:00 2017 +0100

    SSPCPP-689 Trust OpenSSL not to break their ABI
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    Historically this has not been the case, but in 1.1 they are numbering
    the DLLs which is a start.
    
    If they break the ABI without chnaging the name we can always fully
    qualify the DLLs as we did previously.
---
 Versions.props           | 2 +-
 dependencies/openssl.bat | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Versions.props b/Versions.props
index d03af34..e79f792 100644
--- a/Versions.props
+++ b/Versions.props
@@ -67,7 +67,7 @@
     <OpenSSLVersion>1.1.0.5</OpenSSLVersion>
     <OpenSSLDirVersion>1.1.0f</OpenSSLDirVersion>
     <openssl>openssl-$(OpenSSLDirVersion)</openssl>
-    <OpenSSLFileVersion>1_1_0_5</OpenSSLFileVersion>
+    <OpenSSLFileVersion>1_1</OpenSSLFileVersion>
     <!-- Change the 8 components below if OpenSSLFileVersion changes -->
     <LibEay32Component>{1E2D9B00-84CD-4fc4-9CE4-BEBE390AE692}</LibEay32Component>
     <SSlEay32Component>{94DE34A7-B404-494a-AAF1-EF5D4A8A448F}</SSlEay32Component>
diff --git a/dependencies/openssl.bat b/dependencies/openssl.bat
index 618910c..ff42f7e 100644
--- a/dependencies/openssl.bat
+++ b/dependencies/openssl.bat
@@ -1,12 +1,16 @@
-
 @if NOT EXIST Configure (
               Echo Could not find Configure.  Check this is an OpenSSL Build >> %ROOT_DIR%build.log
               exit /b 1
 )
 
 @if NOT EXIST ConfigureD (
-              Echo Could not find ConfigureD.  Apply custimzations as per https://wiki.shibboleth.net/confluence/display/OpenSAML/OpenSSL >> %ROOT_DIR%build.log
+              Echo Could not find ConfigureD.  Apply customizations as per https://wiki.shibboleth.net/confluence/display/OpenSAML/OpenSSL >> %ROOT_DIR%build.log
               exit /b 1
 )
 
+ at if EXIST x64 rd/s/q x64
+ at if EXIST x64Debug rd/s/q x64Debug
+ at if EXIST x86 rd/s/q x86
+ at if EXIST x86Debug rd/s/q x86Debug
+
 exit /b 0
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.