From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 19 Aug 2011 14:21:43 +0000 (+0000)
Subject: Win Installer: LyXLauncher does no longer exist.
X-Git-Tag: 2.1.0beta1~2813
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=06751c95ce131e64eb67657bf96b0bf4d870c589;p=features.git

Win Installer: LyXLauncher does no longer exist.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39493 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 8abc8ab2e8..f3629f28de 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -48,7 +48,7 @@ Configuration of LyX installer
 !define APP_INFO "${APP_NAME} - The Document Processor"
 !define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 by the LyX Team"
 
-!define APP_RUN "bin\LyXLauncher.exe"
+!define APP_RUN "bin\lyx.exe"
 
 !define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200"
 !define APP_REGKEY_SETUP "Software\${APP_REGKEY}\Setup"
diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 0f2d45ae59..dad6add375 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -15,12 +15,6 @@ Lists of files to include in the installer
 
 !macroend
 
-!macro FileListLyXLauncher COMMAND DIRECTORY
-
-  ${FILE}LyXLauncher.exe"
-
-!macroend
-
 !macro FileListQtBin COMMAND DIRECTORY
 
   ${FILE}QtCore4.dll"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index bccf881a2d..b9c7b2a094 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -40,7 +40,7 @@ Section -InstallData
   
   WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\LyXLauncher,0"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx,0"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "http://www.lyx.org/"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "http://www.lyx.org/about/"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "LyX Team"
diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index dc287ea3a1..26463f1a6a 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -27,7 +27,6 @@ Section -ProgramFiles SecProgramFiles
   # Binaries
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
-  !insertmacro FileListLyXLauncher File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"