From 0a9ab140bb01b96888e313466a73e26e5156f22d Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 30 Aug 2014 13:34:18 +0200 Subject: Also show version information in the list of installed programs --- xorg-server/hw/xwin/XWin.rc | 39 ++++++++++++++++++++++++++++++- xorg-server/installer/vcxsrv-64-debug.nsi | 10 +++++++- xorg-server/installer/vcxsrv-64.nsi | 17 +++++++++++++- xorg-server/installer/vcxsrv-debug.nsi | 10 +++++++- xorg-server/installer/vcxsrv.nsi | 17 +++++++++++++- 5 files changed, 88 insertions(+), 5 deletions(-) diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 8d5db742b..8f8322be4 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -33,6 +33,43 @@ #include "winresource.h" #include "xwin-config.h" +#define VER_FILEVERSION 1,15,2,0 +#define VER_FILEVERSION_STR "1.15.2.0" + +#define VER_PRODUCTVERSION 1,15,2,0 +#define VER_PRODUCTVERSION_STR "1.15.2.0" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "FileDescription", "VcXsrv windows xserver\0" + VALUE "FileVersion", VER_FILEVERSION_STR"\0" + VALUE "InternalName", "VcXsrv\0" + VALUE "LegalCopyright", "marha@users.sourceforge.net\0" + VALUE "OriginalFilename", "vcxsrv.exe\0" + VALUE "ProductName", "VcXsrv\0" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR"\0" + END + END + BLOCK "VarFileInfo" + BEGIN + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a language,codepage combination supported by the file. */ + /* */ + /* For example, a file might have values "0x409,1252" indicating that it */ + /* supports English language (0x409) in the Windows ANSI codepage (1252). */ + + VALUE "Translation", 0x409, 1252 + END +END + /* * Dialogs */ @@ -47,7 +84,7 @@ BEGIN LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 LTEXT "http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8 LTEXT "marha@users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8 - LTEXT "Version 1.15.2.0 (5 July 2014)", IDC_STATIC, 36, 38, 220, 8 + LTEXT "Version "VER_PRODUCTVERSION_STR" (5 July 2014)", IDC_STATIC, 36, 38, 220, 8 DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END 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 . */ ;-------------------------------- + !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 . */ ;-------------------------------- + !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" -- cgit v1.2.3