Skip to content

Commit 269b543

Browse files
committed
installer: set product version to 2020
1 parent 4282214 commit 269b543

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
MyProductName = "SSHFS-Win"
22
MyCompanyName = "Navimatics LLC"
33
MyDescription = "SSHFS for Windows"
4+
MyProductVersion = "2020"
45
MyVersion = 3.5.$(shell date '+%y%j')
56
ifeq ($(shell uname -m),x86_64)
67
MyArch = x64
@@ -39,6 +40,7 @@ $(Status)/wix: $(Status)/sshfs-win
3940
-dMyProductName=$(MyProductName)\
4041
-dMyCompanyName=$(MyCompanyName)\
4142
-dMyDescription=$(MyDescription)\
43+
-dMyProductVersion=$(MyProductVersion)\
4244
-dMyVersion=$(MyVersion)\
4345
-dMyArch=$(MyArch)\
4446
-o "$(shell cygpath -aw $(WixDir)/sshfs-win.wixobj)"\
@@ -50,6 +52,7 @@ $(Status)/wix: $(Status)/sshfs-win
5052
-dMyProductName=$(MyProductName)\
5153
-dMyCompanyName=$(MyCompanyName)\
5254
-dMyDescription=$(MyDescription)\
55+
-dMyProductVersion=$(MyProductVersion)\
5356
-dMyVersion=$(MyVersion)\
5457
-dMyArch=$(MyArch)\
5558
-o "$(shell cygpath -aw $(WixDir)/root.wixobj)"\

sshfs-win.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
1818
<Product
1919
Id="*"
20-
Name="$(var.MyProductName) ($(var.MyArch))"
20+
Name="$(var.MyProductName) $(var.MyProductVersion) ($(var.MyArch))"
2121
Manufacturer="$(var.MyCompanyName)"
2222
Version="$(var.MyVersion)"
2323
Language="1033"
2424
UpgradeCode="$(var.UpgradeCode)">
2525

2626
<Package
27-
Description="$(var.MyProductName) ($(var.MyArch)) - $(var.MyDescription)"
27+
Description="$(var.MyProductName) $(var.MyProductVersion) ($(var.MyArch)) - $(var.MyDescription)"
2828
InstallerVersion="200"
2929
Compressed="yes"
3030
InstallScope="perMachine" />
@@ -165,7 +165,7 @@
165165
<Feature
166166
Id="F.Main"
167167
Level="1"
168-
Title="$(var.MyProductName) ($(var.MyArch)) $(var.MyVersion)"
168+
Title="$(var.MyProductName) $(var.MyProductVersion) ($(var.MyArch))"
169169
Description="$(var.MyDescription)"
170170
Display="expand"
171171
ConfigurableDirectory="INSTALLDIR"

0 commit comments

Comments
 (0)