The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 17ec737dd63c4175efa3433754b7f849757f2c28
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Tue Jul 3 01:42:30 2012 +0200
installer: 3 fixes
- uninstall.nsh: don't uninstall the user preferences by default
- configure.nsh:
- set also the .lyx file association when the user is not admin
- fix the path in which the LyX start menu shortcut is executed
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 2a8093b..6d90669 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -23,6 +23,7 @@ Section -InstallData
# Start Menu shortcut
# There is only one shortcut to the application, so it should be in the main
group
+ SetOutPath "$INSTDIR\bin" # this is the folder in which the shortcut is
executed
CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk"
"$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"
# create desktop icon
@@ -59,7 +60,7 @@ Section -Configure
# Associate .lyx files with LyX for current user of all users
${if} $CreateFileAssociations == "true"
- WriteRegStr HKLM "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}"
+ WriteRegStr SHCTX "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}"
${endif}
# Write information about file type
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index 4c5b920..5b3562b 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -176,7 +176,7 @@ SectionEnd
!macroend
#--------------------------------
-# Extenral components
+# External components
#Var PathAllUsers
#Var PathCurrentUser
diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh
b/development/Win32/packaging/installer/setup/uninstall.nsh
index 57cd999..2eeaa07 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -107,7 +107,7 @@ SectionEnd
#---------------------------------
# user preferences
-Section "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences
+Section /o "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences
# remove LyX's config files
StrCpy $AppSubfolder ${APP_DIR_USERDATA}
@@ -117,7 +117,7 @@ SectionEnd
#---------------------------------
# MiKTeX
-Section "un.MiKTeX" un.SecUnMiKTeX
+Section /o "un.MiKTeX" un.SecUnMiKTeX
${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was
installed together with LyX
ReadRegStr $1 HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX
${MiKTeXDeliveredVersion}" "UninstallString"
-----------------------------------------------------------------------
Summary of changes:
.../Win32/packaging/installer/setup/configure.nsh | 3 ++-
.../Win32/packaging/installer/setup/install.nsh | 2 +-
.../Win32/packaging/installer/setup/uninstall.nsh | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
The LyX Source Repository
