* All ImageMagick and Ghostscript resources are no longer installed as separate files but included in the applications. This improves performance and makes maintenance easier.

* Updated download location
* Fixed compatibility issue with recent NSIS versions

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

development/Win32/launcher/launcher.nsi

@@ -16,8 +16,6 @@ also included.
 !include LogicLib.nsh
 !include FileFunc.nsh
 !include StrFunc.nsh
-!insertmacro GetParameters
-!insertmacro GetParent
 ${StrStr}
 
 # Configuration from installer
@@ -151,23 +149,12 @@ Section -Prepare
   Push "$LyXFolder\aiksaurus"
   Call SetEnvironmentVariable
 
-  # Location of Ghostscript
+  # Location of Ghostscript (for ImageMagick)
   Push LYX_GHOSTSCRIPT_EXE
-  Push "$LyXFolder\ghostscript\bin\gswin32c.exe"
+  Push "$LyXFolder\ghostscript\gswin32c.exe"
   Call SetEnvironmentVariable
   Push LYX_GHOSTSCRIPT_DLL
-  Push "$LyXFolder\ghostscript\bin\gsdll32.dll"
-  Call SetEnvironmentVariable
-  Push LYX_GHOSTSCRIPT_FONTS
-  Push "$LyXFolder\ghostscript\fonts"
-  Call SetEnvironmentVariable
-  
-  # Ghostscript resources
-  Push GS_DLL
-  Push "$LyXFolder\ghostscript\bin\gsdll32.dll"
-  Call SetEnvironmentVariable  
-  Push GS_LIB
-  Push "$LyXFolder\ghostscript\lib;$LyXFolder\ghostscript\fonts;$LyXFolder\ghostscript\Resource"
+  Push "$LyXFolder\ghostscript\gsdll32.dll"
   Call SetEnvironmentVariable
  
 SectionEnd
@@ -247,8 +234,7 @@ SectionEnd
 Function InitInterface
   
   #Command line parameters
-  Call GetParameters
-  Pop $Parameters
+  ${GetParameters} $Parameters
   
   #Check for debug mode
   ${StrStr} $R0 $Parameters "-dbg"

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

@@ -65,16 +65,9 @@ SetCompressor /SOLID lzma
 # CTAN and SourceForge select a mirror automatically
 
 !define DOWNLOAD_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
-!define DOWNLOADALT_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
-
 !define DOWNLOAD_IMAGEMAGICK "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_IMAGEMAGICK}"
-!define DOWNLOADALT_IMAGEMAGICK "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_IMAGEMAGICK}"
-
 !define DOWNLOAD_GHOSTSCRIPT "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_GHOSTSCRIPT}"
-!define DOWNLOADALT_GHOSTSCRIPT "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_GHOSTSCRIPT}"
-
 !define DOWNLOAD_ASPELLDICTS "ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows"
-!define DOWNLOADALT_ASPELLDICTS "http://www.lyx.org/~bpeng/aspell6-windows"
 
 #--------------------------------
 # Locations of setup files for components (for bundled setup)

development/Win32/pdfview/pdfview.nsi

@@ -16,11 +16,6 @@ http://magic.aladdin.cs.cmu.edu/2005/07/15/pdfopen-and-pdfclose/
 !include LogicLib.nsh
 !include FileFunc.nsh
 
-# Functions from FileFunc.nsh
-!insertmacro GetParameters
-!insertmacro GetFileName
-!insertmacro GetParent
-
 #--------------------------------
 # Settings
 
@@ -54,6 +49,7 @@ Var OriginalFileName
 Var OriginalDir
 
 Var PDFFile
+Var ViewerFileName
 Var Viewer
 
 Var ChangeNotification
@@ -122,8 +118,8 @@ Section "View PDF file"
 
   # Check whether the file will be opened with Adobe Reader or Adobe Acrobat
   !insertmacro SystemCall "shell32::FindExecutable(t '$OriginalFile', t '', t .s)"
-  Call GetFileName
-  Pop $Viewer
+  Pop $ViewerFileName
+  ${GetFileName} $ViewerFileName $Viewer
 
   ${If} $Viewer == ""
     MessageBox MB_OK|MB_ICONEXCLAMATION "No PDF viewer is installed. \