installer:

- get rid if GSview (this will not be bundled)
- get rid of now unnecessary setting of PDF file format settings via lyxrc.dist
- fix deletion of LyX's preferences folder when the user selected this option in the uninstaller
- some fixes for the standard installer (that doesn't have the JabRef installation section)

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

development/Win32/packaging/installer/include/declarations.nsh

@@ -43,8 +43,8 @@ Configuration of LyX installer
 !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}"
 !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}"
 !define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe"
-!define APP_DIR "${APP_NAME}${APP_SERIES_KEY}"
+!define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}"
-!define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}"
+!define APP_DIR_USERDATA "lyx${APP_VERSION_MAJOR}${APP_VERSION_MINOR}"
 !define APP_INFO "${APP_NAME} - The Document Processor"
 !define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 by the LyX Team"
 

development/Win32/packaging/installer/include/detection.nsh

@@ -98,14 +98,6 @@ Function MissingPrograms
    StrCpy $DelPythonFiles "True"
   ${endif}
 
-  # test if Acrobat or Adobe Reader is used as PDF-viewer
-  ReadRegStr $String HKCR ".pdf" ""
-  ${if} $String != "AcroExch.Document" # this name is only used by Acrobat and Adobe Reader
-   StrCpy $Acrobat "None"
-  ${else}
-   StrCpy $Acrobat "Yes"
-  ${endif}
-
   # test if a PostScript-viewer is installed, only check for GSview32
   StrCpy $PSVPath ""
   ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path"

development/Win32/packaging/installer/include/init.nsh

@@ -73,13 +73,12 @@ Function .onInit
   Call SearchExternal
   #Call InitExternal
   
-  # don't let the installer sections appear when the programs are already installed
+  !if ${SETUPTYPE} == BUNDLE
-  ${if} $PSVPath != ""
+   # don't let the installer sections appear when the programs are already installed
-   SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstGSview}
+   ${if} $PathBibTeXEditor != ""
-  ${endif}
+    SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
-  ${if} $PathBibTeXEditor != ""
+   ${endif}
-   SectionSetText 4 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
+  !endif
-  ${endif}
   
   ${IfNot} ${Silent}
     Banner::destroy
@@ -205,10 +204,6 @@ Section /o "$(SecDesktopTitle)" SecDesktop
 SectionEnd
 
 !if ${SETUPTYPE} == BUNDLE
- Section /o "$(SecInstGSviewTitle)" SecInstGSview
-  AddSize 4000
-  StrCpy $InstallGSview "true"
- SectionEnd
  Section /o "$(SecInstJabRefTitle)" SecInstJabRef
   AddSize 5000
   StrCpy $InstallJabRef "true"
@@ -220,7 +215,8 @@ SectionEnd
 !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)"
-!insertmacro MUI_DESCRIPTION_TEXT ${SecInstGSview} "$(SecInstGSviewDescription)"
+!if ${SETUPTYPE} == BUNDLE
-!insertmacro MUI_DESCRIPTION_TEXT ${SecInstJabRef} "$(SecInstJabRefDescription)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecInstJabRef} "$(SecInstJabRefDescription)"
+!endif
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 

development/Win32/packaging/installer/include/variables.nsh

@@ -13,7 +13,6 @@ Var PathBibTeXEditor
 Var SetupLaTeX
 Var SizeLaTeX
 
-Var Acrobat
 Var APPDATemp
 Var AppPre
 var AppSubfolder
@@ -24,7 +23,6 @@ Var DelPythonFiles
 Var EditorPath
 Var GhostscriptPath
 Var ImageEditorPath
-Var InstallGSview
 Var InstallJabRef
 Var JabRefInstalled
 Var LaTeXName

development/Win32/packaging/installer/settings.nsh

@@ -35,7 +35,7 @@ These typically need to be modified for each LyX release
 # File locations
 
 !define FILES_LYX "D:\LyXPackage2.0\LyX"
-!define FILES_DEPS "D:\LyXSVN\LyX2.0.x\lyx-windows-deps-msvc2010"
+!define FILES_DEPS "D:\LyXSVN\LyX2.0.x\lyx-windows-deps-msvc2008"
 !define FILES_BUNDLE "D:\LyX\depsbundle"
 !define FILES_QT "D:\Qt"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
@@ -49,7 +49,6 @@ These typically need to be modified for each LyX release
 
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define GSviewInstall "external\gsv49w32.exe"
  !define JabRefInstall "external\JabRef-2.6-setup.exe"
  !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4106.exe"
  !define JabRefVersion "2.6"

development/Win32/packaging/installer/setup/configure.nsh

@@ -78,12 +78,10 @@ Section -Configure
    # .lyx14
    WriteRegStr SHCTX "Software\Classes\${APP_EXT}14" "" "${APP_REGNAME_DOC}"
    WriteRegStr SHCTX "Software\Classes\${APP_EXT}14" "Content Type" "${APP_MIME_TYPE}"
-   # .lyx15 don't set this, because this is designed to be opened with LyX 1.5.x
+   # .lyx15
-   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "" "${PRODUCT_REGNAME}"
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "" "${APP_REGNAME_DOC}"
-   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "Content Type" "${PRODUCT_MIME_TYPE}"
+   WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "Content Type" "${APP_MIME_TYPE}"
    # .lyx16 don't set this, because this is designed to be opened with LyX 1.6.x
-   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "" "${PRODUCT_REGNAME}"
-   #WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "Content Type" "${PRODUCT_MIME_TYPE}"
   
    # Refresh shell
    ${RefreshShellIcons}
@@ -131,12 +129,6 @@ Section -Configure
   ${if} "$PathPrefix" != ""
    FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
   ${endif}
-  # if Acrobat or Adobe Reader is used
-  ${if} $Acrobat == "Yes" # used for Acrobat / Adobe Reader
-   FileWrite $R1 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n\
-   		  \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n\
-		  \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n'
-  ${endif}
   # if a SVG to PDF converter ws found (e.g. Inkscape)
   ${if} $SVGPath != ""
    FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\

development/Win32/packaging/installer/setup/install.nsh

@@ -76,7 +76,7 @@ Section -ProgramFiles SecProgramFiles
   
   !if ${SETUPTYPE} == BUNDLE
    
-   # extract the GSview, Jabref and MiKTeX installer
+   # extract the Jabref and MiKTeX installer
    File /r "${FILES_LYX}\external"
 
    # install MiKTeX if not already installed