From f2fac5b7b512264886f573dfbbd016067ec4a670 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 31 Mar 2011 09:18:23 +0000 Subject: [PATCH] WindowsInstaller: Build MSI by default on native Windows build. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5281 c6295689-39f2-0310-b995-f0e70906c6a9 --- win32/Make.rules.mak | 6 +- win32/Makefile.mak | 12 +- win32/{opensc-msi => }/OpenSC.ico | Bin win32/OpenSC.wxs | 157 +++++++++++++++++++++++++ win32/opensc-msi/OpenSC.wxs | 188 ------------------------------ 5 files changed, 169 insertions(+), 194 deletions(-) rename win32/{opensc-msi => }/OpenSC.ico (100%) create mode 100644 win32/OpenSC.wxs delete mode 100755 win32/opensc-msi/OpenSC.wxs diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index d7a1ae04..6a44bb77 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -1,4 +1,3 @@ - OPENSC_FEATURES = pcsc #Uncomment to use 'static' linking mode @@ -7,16 +6,15 @@ LINK_MODE = STATIC #Include support of minidriver 'cardmod' MINIDRIVER_DEF = /DENABLE_CARDMOD - #Build MSI with the Windows Installer XML (WIX), minimal WIX version 3.6 +WIX_INSTALLED_PATH = "C:\Program Files\Windows Installer XML v3.6" + #Static link mode should be used. #WIX_MSI_DEF = /DBUILD_MSI !IF "$(WIX_MSI_DEF)" == "/DBUILD_MSI" -WIX_INSTALLED_PATH = c:\download\wix36-binaries LINK_MODE = STATIC !ENDIF - # If you want support for OpenSSL (needed for pkcs15-init tool, software hashing in PKCS#11 library and verification): # - download and build OpenSSL # - uncomment the line starting with OPENSSL_DEF diff --git a/win32/Makefile.mak b/win32/Makefile.mak index fbfe876a..f26c570d 100644 --- a/win32/Makefile.mak +++ b/win32/Makefile.mak @@ -1,9 +1,17 @@ +TOPDIR = .. + +!INCLUDE $(TOPDIR)\win32\Make.rules.mak all: config.h config.h: winconfig.h @copy /y winconfig.h config.h -clean:: - del /Q config.h +OpenSC.msi: OpenSC.wixobj + $(WIX_INSTALLED_PATH)\bin\light.exe -sh -ext WixUIExtension $? +OpenSC.wixobj: OpenSC.wxs + $(WIX_INSTALLED_PATH)\bin\candle.exe -dSOURCE_DIR=$(TOPDIR) $? + +clean:: + del /Q config.h *.msi *.wixobj *.wixpdb diff --git a/win32/opensc-msi/OpenSC.ico b/win32/OpenSC.ico similarity index 100% rename from win32/opensc-msi/OpenSC.ico rename to win32/OpenSC.ico diff --git a/win32/OpenSC.wxs b/win32/OpenSC.wxs new file mode 100644 index 00000000..6826be4a --- /dev/null +++ b/win32/OpenSC.wxs @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/opensc-msi/OpenSC.wxs b/win32/opensc-msi/OpenSC.wxs deleted file mode 100755 index d6c86e1e..00000000 --- a/win32/opensc-msi/OpenSC.wxs +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -