The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 6182ca208b4dfe4befa4a489acebb2265bf55321 Author: Uwe Stöhr <[email protected]> Date: Mon Jan 14 01:45:42 2013 +0100 installer: fix bug that MiKTeX is not found on some 64bit Windows - LaTeX.nsh: fixe http://nsis.sourceforge.net/Download - settings.nsh: adapt path so that one needs to adapt less when using the installer source zip file - add a readme how to build the installer diff --git a/development/Win32/packaging/installer/Readme.txt b/development/Win32/packaging/installer/Readme.txt new file mode 100644 index 0000000..3996dc4 --- /dev/null +++ b/development/Win32/packaging/installer/Readme.txt @@ -0,0 +1,19 @@ +To build the installer do the following: + +1. extract the source zip-file to e.g. the path "C:\LyX" +2. open the file settings.nsh with a text editor + and adapt there the following paths to the one on your PC: + !define FILES_LYX "C:\LyX\LyXPackage\LyX" + !define FILES_DEPS "C:\LyX\LyX2.0x\lyx-windows-deps-msvc2008" + !define FILES_QT "C:\LyX\LyXPackage\LyX" +3. install NSIS (http://nsis.sourceforge.net/Download) +4. open the file FindProc.zip (that is part of this bundle), + extract from it the file FindProc.dll to the Plugins folder of + NSIS's installation folder +5. open the file InetLoad.zip (that is part of this bundle), + extract from it the file InetLoad.dll to the Plugins folder of + NSIS's installation folder +6. right-click on the file lyx-standard.nsi and choose "Compile NSIS script" + to compile the standard installer +7. right-click on the file lyx-bundle.nsi and choose "Compile NSIS script" + to compile the bundle installer \ No newline at end of file diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index 1acdd66..9f5f82f 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -27,6 +27,9 @@ Handling of LaTeX distributions Function LaTeXActions # checks if MiKTeX or TeXLive is installed + ${if} ${RunningX64} + SetRegView 64 + ${endif} # test if MiKTeX is installed # reads the PATH variable via the registry because NSIS' "$%Path%" variable is not updated when the PATH changes ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index e95bfbf..c04673b 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,7 +14,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 5 !define APP_VERSION_EMERGENCY "1" # use "1" for an emergency release of LyX otherwise "" !define APP_EMERGENCY_DOT "." # use "." for an emergency release of LyX otherwise "" -!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 2 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display @@ -37,10 +37,9 @@ These typically need to be modified for each LyX release # File locations # !!! you need to adjust them to the folders in your Windows system !!! -!define FILES_LYX "C:\LyX\lyx-20-install" -!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20" -!define FILES_BUNDLE "C:\LyX\depsbundle" -!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3" +!define FILES_LYX "C:\LyX\LyXPackage\LyX" +!define FILES_DEPS "C:\LyX\LyX2.0x\lyx-windows-deps-msvc2008" +!define FILES_QT "C:\LyX\LyXPackage\LyX" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" ----------------------------------------------------------------------- Summary of changes: development/Win32/packaging/installer/Readme.txt | 19 +++++++++++++++++++ .../Win32/packaging/installer/include/LaTeX.nsh | 3 +++ development/Win32/packaging/installer/settings.nsh | 9 ++++----- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 development/Win32/packaging/installer/Readme.txt hooks/post-receive -- The LyX Source Repository
