[pkg-opensc-commit] [opensc] 261/295: added compatibility with WiX 3.11

[Eric Dorland]

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

eric pushed a commit to branch master
in repository opensc.

commit eb19691efef55788a30938291a46f796b615fcce
Author: Frank Morgner <frankmorgner at gmail.com>
Date:   Wed May 31 16:31:43 2017 +0200

    added compatibility with WiX 3.11
---
 win32/Make.rules.mak | 21 +++++++++++++++++----
 win32/Makefile.mak   |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 5a10278..993bfee 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -10,12 +10,24 @@ PROGRAMFILES_PATH = C:\Program Files (x86)
 MINIDRIVER_DEF = /DENABLE_MINIDRIVER
 
 #Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.9
-WIX_PATH = $(PROGRAMFILES_PATH)\WiX Toolset v3.10
-WIX_INCL_DIR = "/I$(WIX_PATH)\SDK\VS2010\inc"
+!IF "$(WIX)" == ""
+# at least WiX 3.11 sets the WIX environment variable to its path
+WIX = $(PROGRAMFILES_PATH)\WiX Toolset v3.10
+!ENDIF
+!IF "$(VISUALSTUDIOVERSION)" == "10.0"
+WIXVSVER = VS2010
+!ENDIF
+!IF "$(VISUALSTUDIOVERSION)" == "12.0"
+WIXVSVER = VS2013
+!ENDIF
+!IF "$(VISUALSTUDIOVERSION)" == "14.0"
+WIXVSVER = VS2015
+!ENDIF
+WIX_INCL_DIR = "/I$(WIX)\SDK\$(WIXVSVER)\inc"
 !IF "$(BUILD_FOR)" == "WIN64"
-WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x64\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x64\wcautil.lib"
+WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\x64\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\x64\wcautil.lib"
 !ELSE
-WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x86\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x86\wcautil.lib"
+WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\x86\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\x86\wcautil.lib"
 !ENDIF
 
 #Include support for Secure Messaging
@@ -123,6 +135,7 @@ CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
 	cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
 
 .cpp.obj::
+	echo bla $(VISUALSTUDIOVERSION)
 	cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
 
 .rc.res::
diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 1631ecf..71e4347 100644
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -14,10 +14,10 @@ customactions.dll: versioninfo-customactions.res customactions.obj
 	link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
 
 OpenSC.msi: OpenSC.wixobj
-        "$(WIX_PATH)\bin\light.exe" -sh -ext WixUIExtension -ext WiXUtilExtension $?
+        "$(WIX)\bin\light.exe" -sh -ext WixUIExtension -ext WiXUtilExtension $?
 
 OpenSC.wixobj: OpenSC.wxs customactions.dll
-        "$(WIX_PATH)\bin\candle.exe" -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) OpenSC.wxs
+        "$(WIX)\bin\candle.exe" -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) OpenSC.wxs
 
 clean::
 	del /Q config.h *.msi *.wixobj *.wixpdb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git