Commit 4650180022fa6219d5db53276da773c82569d2fb
1 parent
d65de460
Exists in
master
and in
5 other branches
Improving windows version number.
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
win/pw3270.nsi.in
| @@ -26,10 +26,10 @@ InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation" | @@ -26,10 +26,10 @@ InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation" | ||
| 26 | RequestExecutionLevel admin | 26 | RequestExecutionLevel admin |
| 27 | 27 | ||
| 28 | # Properties | 28 | # Properties |
| 29 | -VIProductVersion "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0" | 29 | +VIProductVersion "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@" |
| 30 | VIFileVersion "@WIN32_VERSION@" | 30 | VIFileVersion "@WIN32_VERSION@" |
| 31 | 31 | ||
| 32 | -VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0" | 32 | +VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@" |
| 33 | VIAddVersionKey "FileVersion" "@WIN32_VERSION@" | 33 | VIAddVersionKey "FileVersion" "@WIN32_VERSION@" |
| 34 | 34 | ||
| 35 | VIAddVersionKey "ProductName" "@PRODUCT_NAME@" | 35 | VIAddVersionKey "ProductName" "@PRODUCT_NAME@" |
| @@ -118,7 +118,7 @@ SubSection "@PACKAGE@" SecMain | @@ -118,7 +118,7 @@ SubSection "@PACKAGE@" SecMain | ||
| 118 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ | 118 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ |
| 119 | "DisplayIcon" "$INSTDIR\@PRODUCT_NAME@.ico" | 119 | "DisplayIcon" "$INSTDIR\@PRODUCT_NAME@.ico" |
| 120 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ | 120 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ |
| 121 | - "DisplayVersion" "@PACKAGE_VERSION@" | 121 | + "DisplayVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@" |
| 122 | 122 | ||
| 123 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ | 123 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ |
| 124 | "UninstallString" "$INSTDIR\uninstall.exe" | 124 | "UninstallString" "$INSTDIR\uninstall.exe" |
| @@ -135,9 +135,9 @@ SubSection "@PACKAGE@" SecMain | @@ -135,9 +135,9 @@ SubSection "@PACKAGE@" SecMain | ||
| 135 | sectionEnd | 135 | sectionEnd |
| 136 | 136 | ||
| 137 | !ifdef WITHCERTS | 137 | !ifdef WITHCERTS |
| 138 | - Section "SSL Certs" SecCerts | 138 | + Section "SSL Certificates" SSLCerts |
| 139 | setOutPath $INSTDIR\certs | 139 | setOutPath $INSTDIR\certs |
| 140 | - file /r "certs\*.*" | 140 | + file /r "sslcerts\*.*" |
| 141 | sectionEnd | 141 | sectionEnd |
| 142 | !endif | 142 | !endif |
| 143 | 143 |