Skip to content

Commit

Permalink
installer: set product version to 2020
Browse files Browse the repository at this point in the history
  • Loading branch information
billziss-gh committed Jan 24, 2020
1 parent 4282214 commit 269b543
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MyProductName = "SSHFS-Win"
MyCompanyName = "Navimatics LLC"
MyDescription = "SSHFS for Windows"
MyProductVersion = "2020"
MyVersion = 3.5.$(shell date '+%y%j')
ifeq ($(shell uname -m),x86_64)
MyArch = x64
Expand Down Expand Up @@ -39,6 +40,7 @@ $(Status)/wix: $(Status)/sshfs-win
-dMyProductName=$(MyProductName)\
-dMyCompanyName=$(MyCompanyName)\
-dMyDescription=$(MyDescription)\
-dMyProductVersion=$(MyProductVersion)\
-dMyVersion=$(MyVersion)\
-dMyArch=$(MyArch)\
-o "$(shell cygpath -aw $(WixDir)/sshfs-win.wixobj)"\
Expand All @@ -50,6 +52,7 @@ $(Status)/wix: $(Status)/sshfs-win
-dMyProductName=$(MyProductName)\
-dMyCompanyName=$(MyCompanyName)\
-dMyDescription=$(MyDescription)\
-dMyProductVersion=$(MyProductVersion)\
-dMyVersion=$(MyVersion)\
-dMyArch=$(MyArch)\
-o "$(shell cygpath -aw $(WixDir)/root.wixobj)"\
Expand Down
6 changes: 3 additions & 3 deletions sshfs-win.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product
Id="*"
Name="$(var.MyProductName) ($(var.MyArch))"
Name="$(var.MyProductName) $(var.MyProductVersion) ($(var.MyArch))"
Manufacturer="$(var.MyCompanyName)"
Version="$(var.MyVersion)"
Language="1033"
UpgradeCode="$(var.UpgradeCode)">

<Package
Description="$(var.MyProductName) ($(var.MyArch)) - $(var.MyDescription)"
Description="$(var.MyProductName) $(var.MyProductVersion) ($(var.MyArch)) - $(var.MyDescription)"
InstallerVersion="200"
Compressed="yes"
InstallScope="perMachine" />
Expand Down Expand Up @@ -165,7 +165,7 @@
<Feature
Id="F.Main"
Level="1"
Title="$(var.MyProductName) ($(var.MyArch)) $(var.MyVersion)"
Title="$(var.MyProductName) $(var.MyProductVersion) ($(var.MyArch))"
Description="$(var.MyDescription)"
Display="expand"
ConfigurableDirectory="INSTALLDIR"
Expand Down

0 comments on commit 269b543

Please sign in to comment.