From: Scott Cantor Date: Tue, 4 Aug 2015 19:15:21 +0000 (+0000) Subject: Update MSI names to carry patch version X-Git-Tag: 2.5.6~10 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=09c890ebc6ca494fc683e201e6f1aa62b2264246 Update MSI names to carry patch version --- diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make index 925ca63..00d433c 100644 --- a/msi/WiX/Installer.make +++ b/msi/WiX/Installer.make @@ -1,8 +1,8 @@ all: all32 all64 -all32: shibboleth-sp-$(ShibbolethVersion)-win32.msi +all32: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi -all64: shibboleth-sp-$(ShibbolethVersion)-win64.msi +all64: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi clean32: del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib @@ -19,12 +19,12 @@ rebuild64: clean64 all64 # # MSI # -shibboleth-sp-$(ShibbolethVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib - light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension +shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib + light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension del shibboleth-sp-$(ShibbolethVersion)-win64.msi -shibboleth-sp-$(ShibbolethVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib - light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension +shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib + light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension # # Library