From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 18 Nov 2017 15:55:05 +0000 (+0100)
Subject: Win installer: add file info to the installer executable file
X-Git-Tag: 2.3.0rc2~256
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3b04e114e003d53ad9a0a3283d772a9c56e34830;p=features.git

Win installer: add file info to the installer executable file
---

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 8cf8d98f45..1720eb0fe6 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -58,6 +58,11 @@ Configuration of LyX installer
 !define APP_WIKI "http://wiki.lyx.org"
 !define APP_WIKI_INFO "${APP_NAME} Wiki"
 !define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-${COPYRIGHT_YEAR} by the LyX Team"
+!if ${SETUPTYPE} == STANDARD
+  !define APP_SETUPTYPE "Standard"
+!else if ${SETUPTYPE} == BUNDLE
+  !define APP_SETUPTYPE "Bundle"
+!endif
 
 !define APP_RUN "bin\lyx.exe"
 !define BIN_LYX "lyx.exe"
@@ -80,14 +85,10 @@ Configuration of LyX installer
 # /DExeFile=/path/to/installer
 
 !if ${SETUPTYPE} == STANDARD
-
   !define SETUP_EXE ${ExeFile}
-
 !else if ${SETUPTYPE} == BUNDLE
-
   !define SETUP_EXE ${BundleExeFile}
   !define BUNDLESETUP_LATEX
-
 !endif
 
 !define SETUP_ICON "${FILES_ICONS}\lyx.ico"
diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index 078e6b342b..b5fdb441e4 100644
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -93,7 +93,10 @@ BrandingText " "
 
 VIProductVersion "${APP_VERSION_NUMBER}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${APP_NAME} ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION} ${APP_SETUPTYPE} installer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"
-
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "LyX Team"
+# Fixme: LyX should register the name LyX as trademark
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""