remove old code

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34942 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/installer/gui/external.nsh

@@ -27,24 +27,6 @@ Var LaTeXSetup.State
 Var LaTeXExisting.State
 Var LaTeXNoInstall.State
 
-!ifndef BUNDLE_IMAGEMAGICK
-
-Var ImageMagickState
-Var ImageMagickSetup.State
-Var ImageMagickExisting.State
-Var ImageMagickNoInstall.State
-
-!endif
-
-!ifndef BUNDLE_GHOSTSCRIPT
-
-Var GhostscriptState
-Var GhostscriptSetup.State
-Var GhostscriptExisting.State
-Var GhostscriptNoInstall.State
-
-!endif
-
 Var ControlState
 Var ComponentSize
 
@@ -93,15 +75,6 @@ Var ComponentSize
   Pop $ExternalPage.NoInstall
   nsDialogs::OnClick /NOUNLOAD $ExternalPage.NoInstall $ExternalPage.RadioButton.Click
    
-  !if ${COMPONENT} != LaTeX
-  # ImageMagick and Ghostscript require Administrator or
-  # power user privileges for installation
-  ${If} $MultiUser.Privileges != "Admin"
-  ${AndIf} $MultiUser.Privileges != "Power"
-    EnableWindow $ExternalPage.Setup 0
-  ${EndIf}
-  !endif
-  
   # Set the state of the controls to the previous user selection (or the default)
 
   ${If} $${COMPONENT}State == ""
@@ -237,27 +210,3 @@ FunctionEnd
 Function PageExternalLaTeXValidate
   !insertmacro EXTERNAL_VALIDATEDIALOG LaTeX
 FunctionEnd
-
-!ifndef BUNDLE_IMAGEMAGICK
-
-Function PageExternalImageMagick
-  !insertmacro EXTERNAL_SHOWDIALOG ImageMagick
-FunctionEnd
-
-Function PageExternalImageMagickValidate
-  !insertmacro EXTERNAL_VALIDATEDIALOG ImageMagick
-FunctionEnd
-
-!endif
-
-!ifndef BUNDLE_GHOSTSCRIPT
-
-Function PageExternalGhostscript
-  !insertmacro EXTERNAL_SHOWDIALOG Ghostscript
-FunctionEnd
-
-Function PageExternalGhostscriptValidate
-  !insertmacro EXTERNAL_VALIDATEDIALOG Ghostscript
-FunctionEnd
-
-!endif

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

@@ -14,7 +14,7 @@ SetCompressor /SOLID lzma
 !ifdef FilesLyX
   !define FILES_LYX "${FilesLyX}"
 !else
-  !define FILES_LYX "..\..\..\..\..\lyx-1.6.8-install"
+  !define FILES_LYX "..\..\..\..\..\lyx-1.6.7-install"
 !endif
 
 !ifdef FilesDeps

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

@@ -94,8 +94,6 @@ Function SearchLaTeX
 
 FunctionEnd
 
-!endif
-
 #--------------------------------
 # JabRef
 

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

@@ -38,12 +38,6 @@ BrandingText " "
 
 Page custom PageReinstall PageReinstallValidate
 Page custom PageExternalLaTeX PageExternalLaTeXValidate
-!ifndef BUNDLE_IMAGEMAGICK
-Page custom PageExternalImageMagick PageExternalImageMagickValidate
-!endif
-!ifndef BUNDLE_GHOSTSCRIPT
-Page custom PageExternalGhostscript PageExternalGhostscriptValidate
-!endif
 
 !define MUI_PAGE_HEADER_TEXT $(TEXT_DICT_TITLE)
 !define MUI_PAGE_HEADER_SUBTEXT $(TEXT_DICT_SUBTITLE)

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

@@ -87,8 +87,6 @@ Function InitUser
   # Get directories of components from registry
   
   !insertmacro EXTERNAL_INIT LaTeX
-  !insertmacro EXTERNAL_INIT ImageMagick
-  !insertmacro EXTERNAL_INIT Ghostscript
   
   # Get LyX language
   

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

@@ -45,9 +45,6 @@ Section -InstallData
   WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "Version" "${APP_VERSION_NUMBER}"
 
   WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "ImageMagick Path" $PathImageMagick
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "Ghostscript Path" $PathGhostscript
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LyX Language" $LangName
 
   # Start Menu shortcut
   # There is only one shortcut to the application, so it should be in the main group
@@ -85,24 +82,11 @@ Section -Configure
 
   # Path prefix
 
-  StrCpy $PathPrefix "$INSTDIR\bin;$INSTDIR\python"
+  StrCpy $PathPrefix "$INSTDIR\bin;$INSTDIR\python;$INSTDIR\imagemagick;$INSTDIR\ghostscript"
-  
-  !ifdef BUNDLE_IMAGEMAGICK
-    StrCpy $PathImageMagick "$INSTDIR\imagemagick"
-  !endif
-  !ifdef BUNDLE_GHOSTSCRIPT
-    StrCpy $PathGhostscript "$INSTDIR\ghostscript"
-  !endif  
   
   ${If} $PathLaTeX != ""
     StrCpy $PathPrefix "$PathPrefix;$PathLaTeX"
   ${EndIf}
-  ${If} $PathGhostscript != ""
-    StrCpy $PathPrefix "$PathPrefix;$PathGhostscript"
-  ${EndIf}
-  ${If} $PathImageMagick != ""
-    StrCpy $PathPrefix "$PathPrefix;$PathImageMagick"
-  ${EndIf}
   ${If} $PathBibTeXEditor != ""
     StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor"
   ${EndIf}  

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

@@ -301,23 +301,11 @@ Function InitExternal
   # Get sizes of external component installers
   
   SectionGetSize ${ExternalLaTeX} $SizeLaTeX
-  !ifndef BUNDLE_IMAGEMAGICK
-    SectionGetSize ${ExternalImageMagick} $SizeImageMagick
-  !endif
-  !ifndef BUNDLE_GHOSTSCRIPT
-    SectionGetSize ${ExternalGhostscript} $SizeGhostscript
-  !endif
   
   # Add download size
   
   !ifndef BUNDLESETUP_MIKTEX
     IntOp $SizeLaTeX $SizeLaTeX + ${SIZE_DOWNLOAD_LATEX}
   !endif
-  !ifndef BUNDLE_IMAGEMAGICK & BUNDLESETUP_IMAGEMAGICK
-    IntOp $SizeImagemagick $SizeImagemagick + ${SIZE_DOWNLOAD_IMAGEMAGICK}
-  !endif
-  !ifndef BUNDLE_GHOSTSCRIPT & BUNDLESETUP_GHOSTSCRIPT
-    IntOp $SizeGhostscript $SizeGhostscript + ${SIZE_DOWNLOAD_GHOSTSCRIPT}
-  !endif
 
 FunctionEnd