[cpp-msbuild] branch master updated: SSPCPP-785 Force the subrevision for our build

[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=e7f6c600c0ed6b73fbb359787296e28f57458400

The following commit(s) were added to refs/heads/master by this push:
       new  e7f6c60   SSPCPP-785 Force the subrevision for our build
e7f6c60 is described below

commit e7f6c600c0ed6b73fbb359787296e28f57458400
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Mar 14 16:11:27 2018 +0000

    SSPCPP-785 Force the subrevision for our build
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-785
    
    We make it 15 (for VC15) so as to avoid a clash with the VC10
    version (which has a subrevision of 0).
    
    Add a test against the version moving.  The build will fail and we
    can re-evaluate if we need this fix.
---
 dependencies/dependency.make |  6 ++++++
 dependencies/zlib1.rc        | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 6403aeb..2b25b07 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -53,6 +53,10 @@ test-env:
 #
 # Zlib
 #
+!if "$(ZLIB_FILE_VERSION)" != "1_2_11"
+!error review zlib1.rc for changes with respect to https://issues.shibboleth.net/jira/browse/SSPCPP-785
+!endif
+
 zlib: zlib-debug zlib-release
 
 zlib-release: zlib-test zlib-release-configure zlib-release-build
@@ -124,6 +128,7 @@ $(ROOT_DIR)\$(ZLIB_DIR)\$(ZlibTargetDir)\Debug\$(ZLIB_IMPLIB)D.lib: $$(@D)\$(ZLI
 $(ROOT_DIR)\$(ZLIB_DIR)\$(ZlibTargetDir)\release\$(ZLIB_SHAREDLIB).dll: $(ROOT_DIR)\$(ZLIB_DIR)\win32\makefile.shib
 	title Build zlib $(VSCMD_ARG_TGT_ARCH) Release
 	cd $(ROOT_DIR)\$(ZLIB_DIR)
+    copy /y $(ROOT_DIR)\cpp-msbuild\dependencies\zlib1.rc $(ROOT_DIR)\$(ZLIB_DIR)\win32
 	nmake/f win32\makefile.shib clean
 	nmake/f win32\makefile.shib
 	copy $(@F) $@
@@ -133,6 +138,7 @@ $(ROOT_DIR)\$(ZLIB_DIR)\$(ZlibTargetDir)\release\$(ZLIB_SHAREDLIB).dll: $(ROOT_D
 $(ROOT_DIR)\$(ZLIB_DIR)\$(ZlibTargetDir)\debug\$(ZLIB_SHAREDLIB)D.dll: $(ROOT_DIR)\$(ZLIB_DIR)\win32\makefile.shib.debug
 	title Build zlib $(VSCMD_ARG_TGT_ARCH) Debug
 	cd $(ROOT_DIR)\$(ZLIB_DIR)
+    copy /y $(ROOT_DIR)\cpp-msbuild\dependencies\zlib1.rc $(ROOT_DIR)\$(ZLIB_DIR)\win32
 	nmake/f win32\makefile.shib.debug clean
 	nmake/f win32\makefile.shib.debug
 	copy $(@F) $@
diff --git a/dependencies/zlib1.rc b/dependencies/zlib1.rc
new file mode 100644
index 0000000..af1bb38
--- /dev/null
+++ b/dependencies/zlib1.rc
@@ -0,0 +1,40 @@
+#include <winver.h>
+#include "../zlib.h"
+
+#ifdef GCC_WINDRES
+VS_VERSION_INFO		VERSIONINFO
+#else
+VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+#endif
+  FILEVERSION		ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,15
+  PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,15
+  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+  FILEFLAGS		1
+#else
+  FILEFLAGS		0
+#endif
+  FILEOS		VOS__WINDOWS32
+  FILETYPE		VFT_DLL
+  FILESUBTYPE		0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+    BEGIN
+      VALUE "FileDescription",	"zlib data compression library\0"
+      VALUE "FileVersion",	ZLIB_VERSION "\0"
+      VALUE "InternalName",	"zlib1.dll\0"
+      VALUE "LegalCopyright",	"(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "OriginalFilename",	"zlib1.dll\0"
+      VALUE "ProductName",	"zlib\0"
+      VALUE "ProductVersion",	ZLIB_VERSION "\0"
+      VALUE "Comments",		"For more information visit http://www.zlib.net/\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END

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