From 8b47bbc5efe76ee6526853b0db4137afe4492fc2 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sun, 3 May 2015 20:10:38 -0400 Subject: Add extra info to installer and change name Conflicts: packages.txt xorg-server/installer/vcxsrv-64-debug.nsi xorg-server/installer/vcxsrv-64.nsi xorg-server/installer/vcxsrv-debug.nsi xorg-server/installer/vcxsrv.nsi --- xorg-server/installer/vcxsrv-64-debug.nsi | 17 ++++++++++------- xorg-server/installer/vcxsrv-64.nsi | 31 ++++++++++++++++++++----------- xorg-server/installer/vcxsrv-debug.nsi | 17 ++++++++++------- xorg-server/installer/vcxsrv.nsi | 31 ++++++++++++++++++++----------- 4 files changed, 60 insertions(+), 36 deletions(-) diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index 8f24bdca8..38bd0ec12 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -17,11 +17,14 @@ */ ;-------------------------------- +!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" +!define VERSION "1.17.0.0" + ; The name of the installer -Name "VcXsrv (X2Go/Arctica Builds)" +Name "${NAME_STRING}" ; The file to write -OutFile "vcxsrv-64-debug.1.17.0.0.installer.exe" +OutFile "vcxsrv-64-debug.${VERSION}.x2go+arctica.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES64\VcXsrv @@ -32,11 +35,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" +VIProductVersion "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME_STRING}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver (X2Go/Arctica Builds)" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" ; 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 e7df70449..ca500bbc8 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -18,11 +18,16 @@ ;-------------------------------- !include "FileFunc.nsh" +!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" +!define VERSION "1.17.0.0" +!define UNINSTALL_PUBLISHER "X2Go & Arctica Projects" +!define UNINSTALL_URL "https://github.com/ArcticaProject/vcxsrv" + ; The name of the installer -Name "VcXsrv (X2Go/Arctica Builds)" +Name "${NAME_STRING}" ; The file to write -OutFile "vcxsrv-64.1.17.0.0.installer.exe" +OutFile "vcxsrv-64.${VERSION}.x2go+arctica.installer.exe" ; The default installation directory InstallDir $programfiles64\VcXsrv @@ -33,11 +38,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" +VIProductVersion "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME_STRING}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver (X2Go/Arctica Builds)" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -132,10 +137,14 @@ Section "VcXsrv (required)" WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR ; 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"' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayIcon" "$INSTDIR\vcxsrv.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "${NAME_STRING}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayVersion" "${VERSION}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "Publisher" "${UNINSTALL_PUBLISHER}}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" "$INSTDIR\uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "HelpLink" "${UNINSTALL_URL}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLInfoAbout" "${UNINSTALL_URL}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLUpdateInfo" "${UNINSTALL_URL}" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1 WriteUninstaller "uninstall.exe" diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 3e9bdfa87..42e278499 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -17,11 +17,14 @@ */ ;-------------------------------- +!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" +!define VERSION "1.17.0.0" + ; The name of the installer -Name "VcXsrv (X2Go/Arctica Builds)" +Name "${NAME_STRING}" ; The file to write -OutFile "vcxsrv-debug.1.17.0.0.installer.exe" +OutFile "vcxsrv-debug.${VERSION}.x2go+arctica.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv @@ -32,11 +35,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" +VIProductVersion "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME_STRING}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver (X2Go/Arctica Builds)" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 09d461337..7d45ee150 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -18,11 +18,16 @@ ;-------------------------------- !include "FileFunc.nsh" +!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" +!define VERSION "1.17.0.0" +!define UNINSTALL_PUBLISHER "X2Go & Arctica Projects" +!define UNINSTALL_URL "https://github.com/ArcticaProject/vcxsrv" + ; The name of the installer -Name "VcXsrv (X2Go/Arctica Builds)" +Name "${NAME_STRING}" ; The file to write -OutFile "vcxsrv.1.17.0.0.installer.exe" +OutFile "vcxsrv.${VERSION}.x2go+arctica.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv @@ -33,11 +38,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" +VIProductVersion "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME_STRING}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver (X2Go/Arctica Builds)" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -132,10 +137,14 @@ Section "VcXsrv (required)" WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR" ; 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"' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayIcon" "$INSTDIR\vcxsrv.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "${NAME_STRING}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayVersion" "${VERSION}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "Publisher" "${UNINSTALL_PUBLISHER}}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" "$INSTDIR\uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "HelpLink" "${UNINSTALL_URL}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLInfoAbout" "${UNINSTALL_URL}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLUpdateInfo" "${UNINSTALL_URL}" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1 WriteUninstaller "uninstall.exe" -- cgit v1.2.3