projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
90d37dd
)
Update MSI names to carry patch version
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 4 Aug 2015 19:15:21 +0000
(19:15 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 4 Aug 2015 19:15:21 +0000
(19:15 +0000)
msi/WiX/Installer.make
patch
|
blob
|
history
diff --git
a/msi/WiX/Installer.make
b/msi/WiX/Installer.make
index
925ca63
..
00d433c
100644
(file)
--- a/
msi/WiX/Installer.make
+++ b/
msi/WiX/Installer.make
@@
-1,8
+1,8
@@
all: all32 all64
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
clean32:
del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib
@@
-19,12
+19,12
@@
rebuild64: clean64 all64
#
# MSI
#
#
# 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
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
#
# Library