[cpp-sp COMMIT] /branches/REL_2/msi/WiX/Installer.make

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug  4 15:15:21 2015
New Revision: 3937

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3937&view=rev
Log:
Update MSI names to carry patch version

Modified:
    branches/REL_2/msi/WiX/Installer.make

Modified: branches/REL_2/msi/WiX/Installer.make
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Installer.make?rev=3937&r1=3936&r2=3937&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Installer.make	(original)
+++ branches/REL_2/msi/WiX/Installer.make	Tue Aug  4 15:15:21 2015
@@ -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 @@
 #
 # 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