avoid some code duplication

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

diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi
index 6d53b1aea0f56d24ebb0653f54a1d1d506ec6501..cdd71f8319930df2727161c958f1ef1c00c00eaa 100644 (file)
--- a/development/Win32/packaging/installer/lyx-bundle.nsi
+++ b/development/Win32/packaging/installer/lyx-bundle.nsi
@@ -1,62 +1,2 @@
-/*
-
-NSIS Script - LyX 2.0 Installer for Win32
-Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
-Compatible with NSIS 2.46
-
-*/
-
-# Do a Cyclic Redundancy Check to make sure the installer
-# was not corrupted by the download.
-CRCCheck force
-#
-# Make the installer as small as possible.
-SetCompressor /SOLID lzma
-
-!ifndef SETUPTYPE
- !define SETUPTYPE BUNDLE
-!endif
-
-# installer settings like version numbers
-!include settings.nsh
-
-# declarations of LyX's registry keys and installer variant
-!include include\declarations.nsh
-
-# definitions of global variables
-!include include\variables.nsh
-
-# configuration of standard NSIS header files
-!include include\nsis.nsh
-
-# list of files to be included in the installer
-!include include\filelist.nsh
-
-# detect third-party programs like Inkscape and LaTeX
-!include include\detection.nsh
-
-# set up the installer pages
-!include include\gui.nsh
-
-# 
-!include include\init.nsh
-
-# install LyX and needed third-party programs like Python etc.
-!include setup\install.nsh
-
-# uninstall LyX and all programs that were installed together with LyX
-!include setup\uninstall.nsh
-
-# configure LyX (set start menu and write registry entries)
-!include setup\configure.nsh
-
-# 
-!include gui\external.nsh
-
-# 
-!include gui\reinstall.nsh
-
-#--------------------------------
-# Output file
-
-Outfile "${SETUP_EXE}"
+!define SETUPTYPE BUNDLE
+!include lyx.nsi
\ No newline at end of file

diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi
index b910ff48c5cfbabd5bdb56309da16d7b723883c5..410cc6430085b8d0e711c5ff6f681c49a294fa86 100644 (file)
--- a/development/Win32/packaging/installer/lyx-standard.nsi
+++ b/development/Win32/packaging/installer/lyx-standard.nsi
@@ -1,62 +1,2 @@
-/*
-
-NSIS Script - LyX 2.0 Installer for Win32
-Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
-Compatible with NSIS 2.46
-
-*/
-
-# Do a Cyclic Redundancy Check to make sure the installer
-# was not corrupted by the download.
-CRCCheck force
-#
-# Make the installer as small as possible.
-SetCompressor /SOLID lzma
-
-!ifndef SETUPTYPE
- !define SETUPTYPE STANDARD
-!endif
-
-# installer settings like version numbers
-!include settings.nsh
-
-# declarations of LyX's registry keys and installer variant
-!include include\declarations.nsh
-
-# definitions of global variables
-!include include\variables.nsh
-
-# configuration of standard NSIS header files
-!include include\nsis.nsh
-
-# list of files to be included in the installer
-!include include\filelist.nsh
-
-# detect third-party programs like Inkscape and LaTeX
-!include include\detection.nsh
-
-# set up the installer pages
-!include include\gui.nsh
-
-# 
-!include include\init.nsh
-
-# install LyX and needed third-party programs like Python etc.
-!include setup\install.nsh
-
-# uninstall LyX and all programs that were installed together with LyX
-!include setup\uninstall.nsh
-
-# configure LyX (set start menu and write registry entries)
-!include setup\configure.nsh
-
-# 
-!include gui\external.nsh
-
-# 
-!include gui\reinstall.nsh
-
-#--------------------------------
-# Output file
-
-Outfile "${SETUP_EXE}"
+!define SETUPTYPE STANDARD
+!include lyx.nsi
\ No newline at end of file

diff --git a/development/Win32/packaging/installer/lyx.nsi b/development/Win32/packaging/installer/lyx.nsi
new file mode 100644 (file)
index 0000000..9d8aed1
--- /dev/null
+++ b/development/Win32/packaging/installer/lyx.nsi
@@ -0,0 +1,51 @@
+/*\r
+\r
+NSIS Script - LyX 2.0 Installer for Win32\r
+Authors: Joost Verburg, Angus Leeming, Uwe Stöhr\r
+Compatible with NSIS 2.46\r
+\r
+*/\r
+\r
+CRCCheck force\r
+SetCompressor /SOLID lzma\r
+\r
+# installer settings like version numbers\r
+!include settings.nsh \r
+\r
+# declarations of LyX's registry keys and installer variant\r
+!include include\declarations.nsh\r
+\r
+# definitions of global variables\r
+!include include\variables.nsh\r
+\r
+# configuration of standard NSIS header files\r
+!include include\nsis.nsh\r
+\r
+# list of files to be included in the installer\r
+!include include\filelist.nsh\r
+\r
+# detect third-party programs like Inkscape and LaTeX\r
+!include include\detection.nsh\r
+\r
+# set up the installer pages\r
+!include include\gui.nsh\r
+\r
+# \r
+!include include\init.nsh\r
+\r
+# install LyX and needed third-party programs like Python etc.\r
+!include setup\install.nsh\r
+\r
+# uninstall LyX and all programs that were installed together with LyX\r
+!include setup\uninstall.nsh\r
+\r
+# configure LyX (set start menu and write registry entries)\r
+!include setup\configure.nsh\r
+\r
+# \r
+!include gui\external.nsh\r
+\r
+#--------------------------------\r
+# Output file\r
+\r
+Outfile "${SETUP_EXE}"\r