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 8abc8ab2e895a3e5586b38c0476fac8104e64c4e..f3629f28de44c981743315ff75bf71e22d305959 100644 (file)
--- 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 0f2d45ae59c6cb4fe5fdde3d0e69c2a3c09f7770..dad6add375cf55ce2d1534133542417a93e6a1ef 100644 (file)
--- 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 bccf881a2dd00e0e526ddb8cc319db607340cd3e..b9c7b2a0940e75022eba9e67871e0add0ed1f5d6 100644 (file)
--- 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 dc287ea3a13e55e4a228f8c91b89320b022d8c0b..26463f1a6a3cdc71aaed3faaacd31d1800d6856e 100644 (file)
--- 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}\"