diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-30 13:34:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-30 13:35:10 +0200 |
| commit | 0a9ab140bb01b96888e313466a73e26e5156f22d (patch) | |
| tree | be730e50ef36bbbf06cbfc7a6086e13e18a9d8ce /xorg-server/installer | |
| parent | 4469aefef31cd682683944aa91e0b3edc0042fa4 (diff) | |
| download | vcxsrv-0a9ab140bb01b96888e313466a73e26e5156f22d.tar.gz vcxsrv-0a9ab140bb01b96888e313466a73e26e5156f22d.tar.bz2 vcxsrv-0a9ab140bb01b96888e313466a73e26e5156f22d.zip | |
Also show version information in the list of installed programs
Diffstat (limited to 'xorg-server/installer')
| -rw-r--r-- | xorg-server/installer/vcxsrv-64-debug.nsi | 10 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv-64.nsi | 17 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv-debug.nsi | 10 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 17 |
4 files changed, 50 insertions, 4 deletions
diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index ce24a7e18..25a68a3a2 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -1,6 +1,6 @@ /* This file is part of vcxsrv.
*
- * Copyright (C) 2009 Marc Haesen
+ * Copyright (C) 2014 marha@users.sourceforge.net
*
* vcxsrv is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,6 +30,14 @@ InstallDir $PROGRAMFILES64\VcXsrv ; overwrite the old one automatically)
InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+
+VIProductVersion "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.15.2.0"
+
; Request application privileges for Windows Vista
RequestExecutionLevel admin
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index 1b11e1677..c5c59ce30 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -1,6 +1,6 @@ /* This file is part of vcxsrv.
*
- * Copyright (C) 2009 Marc Haesen
+ * Copyright (C) 2014 marha@users.sourceforge.net
*
* vcxsrv is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@ * along with vcxsrv. If not, see <http://www.gnu.org/licenses/>.
*/
;--------------------------------
+ !include "FileFunc.nsh"
; The name of the installer
Name "VcXsrv"
@@ -30,6 +31,14 @@ InstallDir $programfiles64\VcXsrv ; overwrite the old one automatically)
InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+
+VIProductVersion "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.15.2.0"
+
; Request application privileges for Windows Vista
RequestExecutionLevel admin
@@ -124,11 +133,17 @@ Section "VcXsrv (required)" ; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "VcXsrv"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayVersion" "1.15.2.0"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "Publisher" "marha@users.sourceforge.net"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1
WriteUninstaller "uninstall.exe"
+ ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+ IntFmt $0 "0x%08X" $0
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "EstimatedSize" "$0"
+
; Register the xlaunch file extension
WriteRegStr HKCR ".xlaunch" "" "XLaunchFile"
WriteRegStr HKCR "XLaunchFile" "" "XLaunch Configuration"
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 00319b949..46e2564a4 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -1,6 +1,6 @@ /* This file is part of vcxsrv.
*
- * Copyright (C) 2009 Marc Haesen
+ * Copyright (C) 2014 marha@users.sourceforge.net
*
* vcxsrv is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,6 +30,14 @@ InstallDir $PROGRAMFILES32\VcXsrv ; overwrite the old one automatically)
InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+
+VIProductVersion "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.15.2.0"
+
; Request application privileges for Windows Vista
RequestExecutionLevel admin
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 174916694..4d60fc112 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -1,6 +1,6 @@ /* This file is part of vcxsrv.
*
- * Copyright (C) 2009 Marc Haesen
+ * Copyright (C) 2014 marha@users.sourceforge.net
*
* vcxsrv is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@ * along with vcxsrv. If not, see <http://www.gnu.org/licenses/>.
*/
;--------------------------------
+ !include "FileFunc.nsh"
; The name of the installer
Name "VcXsrv"
@@ -30,6 +31,14 @@ InstallDir $PROGRAMFILES32\VcXsrv ; overwrite the old one automatically)
InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+
+VIProductVersion "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.15.2.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.15.2.0"
+
; Request application privileges for Windows Vista
RequestExecutionLevel admin
@@ -124,11 +133,17 @@ Section "VcXsrv (required)" ; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "VcXsrv"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayVersion" "1.15.2.0"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "Publisher" "marha@users.sourceforge.net"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1
WriteUninstaller "uninstall.exe"
+ ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+ IntFmt $0 "0x%08X" $0
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "EstimatedSize" "$0"
+
; Register the xlaunch file extension
WriteRegStr HKCR ".xlaunch" "" "XLaunchFile"
WriteRegStr HKCR "XLaunchFile" "" "XLaunch Configuration"
|