From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 19 Apr 2010 03:58:48 +0000 (+0000)
Subject: installer: some special settings for the alpha/beta releases
X-Git-Tag: 2.0.0~3405
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=830788118b1acfffdf05e87f26be7791fc7aea91;p=lyx.git

installer: some special settings for the alpha/beta releases

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

diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
index 02b1957a5e..2c7faf9883 100644
--- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
@@ -109,9 +109,9 @@ Function ConfigureLyX
    # .lyx15 don't set this, because this is designed to be opened with LyX 1.5.x
    #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}15" "" "${PRODUCT_REGNAME}"
    #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}15" "Content Type" "${PRODUCT_MIME_TYPE}"
-   # .lyx16
-   WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}16" "" "${PRODUCT_REGNAME}"
-   WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}16" "Content Type" "${PRODUCT_MIME_TYPE}"
+   # .lyx16 don't set this, because this is designed to be opened with LyX 1.6.x
+   #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}16" "" "${PRODUCT_REGNAME}"
+   #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}16" "Content Type" "${PRODUCT_MIME_TYPE}"
    # refresh shell
    System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
   ${endif}
diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
index 54bb1cbd9f..900e61e3bd 100644
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@@ -19,7 +19,7 @@
 CRCCheck force
 
 # Make the installer as small as possible.
-#SetCompressor lzma
+SetCompressor lzma
 
 #--------------------------------
 # You should need to change only these macros...
@@ -177,10 +177,11 @@ Section "$(SecAllUsersTitle)" SecAllUsers
   SetShellVarContext all
   StrCpy $ProductRootKey "HKLM"
 SectionEnd
-Section "$(SecFileAssocTitle)" SecFileAssoc
+# remove the /o for LyX 2.0 final!
+Section /o "$(SecFileAssocTitle)" SecFileAssoc
   StrCpy $CreateFileAssociations "true"
 SectionEnd
-Section "$(SecDesktopTitle)" SecDesktop
+Section /o "$(SecDesktopTitle)" SecDesktop
   StrCpy $CreateDesktopIcon "true"
 SectionEnd