Author: joost
Date: Sat Jun 11 22:20:22 2011
New Revision: 39012
URL: http://www.lyx.org/trac/changeset/39012
Log:
avoid some code duplication
Added:
lyx-devel/trunk/development/Win32/packaging/installer/lyx.nsi
Modified:
lyx-devel/trunk/development/Win32/packaging/installer/lyx-bundle.nsi
lyx-devel/trunk/development/Win32/packaging/installer/lyx-standard.nsi
Modified: lyx-devel/trunk/development/Win32/packaging/installer/lyx-bundle.nsi
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/lyx-bundle.nsi
Sat Jun 11 20:10:58 2011 (r39011)
+++ lyx-devel/trunk/development/Win32/packaging/installer/lyx-bundle.nsi
Sat Jun 11 22:20:22 2011 (r39012)
@@ -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
Modified: lyx-devel/trunk/development/Win32/packaging/installer/lyx-standard.nsi
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/lyx-standard.nsi
Sat Jun 11 20:10:58 2011 (r39011)
+++ lyx-devel/trunk/development/Win32/packaging/installer/lyx-standard.nsi
Sat Jun 11 22:20:22 2011 (r39012)
@@ -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
Added: lyx-devel/trunk/development/Win32/packaging/installer/lyx.nsi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ lyx-devel/trunk/development/Win32/packaging/installer/lyx.nsi Sat Jun
11 22:20:22 2011 (r39012)
@@ -0,0 +1,51 @@
+/*
+
+NSIS Script - LyX 2.0 Installer for Win32
+Authors: Joost Verburg, Angus Leeming, Uwe St�hr
+Compatible with NSIS 2.46
+
+*/
+
+CRCCheck force
+SetCompressor /SOLID lzma
+
+# 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
+
+#--------------------------------
+# Output file
+
+Outfile "${SETUP_EXE}"
