The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 4bde597fc1cb0c99b5cbc753963f9d67ab32b6de Author: Vincent van Ravesteijn <[email protected]> Date: Sun May 13 18:40:47 2012 +0200 Windows installer: Update code for QtPlugins Now, the precompiled binaries from Nokia can be used. diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index e530454..6f64616 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -24,7 +24,12 @@ Lists of files to include in the installer !macro FileListQtBin COMMAND DIRECTORY ${FILE}QtCore4.dll" - ${FILE}QtGui4.dll" + ${FILE}QtGui4.dll" + +!macroend + +!macro FileListQtPlugins COMMAND DIRECTORY + ${FILE}qgif4.dll" !macroend diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index ba74c11..bacfe1b 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -28,6 +28,7 @@ Section -ProgramFiles SecProgramFiles SetOutPath "$INSTDIR\bin" !insertmacro FileListLyXBin File "${FILES_LYX}\bin\" !insertmacro FileListQtBin File "${FILES_QT}\bin\" + !insertmacro FileListQtPlugins File "${FILES_QT}\plugins\imageformats\" !insertmacro FileListDll File "${FILES_DEPS}\bin\" !insertmacro FileListMSVC File "${FILES_MSVC}\" !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\" diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index f079514..be321ff 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -13,6 +13,7 @@ Section "un.Program Files" un.SecProgramFiles # Binaries !insertmacro FileListLyXBin Delete "$INSTDIR\bin\" !insertmacro FileListQtBin Delete "$INSTDIR\bin\" + !insertmacro FileListQtPlugins Delete "$INSTDIR\bin\" !insertmacro FileListDll Delete "$INSTDIR\bin\" !insertmacro FileListMSVC Delete "$INSTDIR\bin\" !insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\" commit b4850ff2484de7b4437154f927cb75ad01fac3e1 Author: Vincent van Ravesteijn <[email protected]> Date: Sat Mar 24 19:16:38 2012 +0100 Windows installer: Update for latest ImageMagick diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index 7967bae..e530454 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -113,10 +113,11 @@ Lists of files to include in the installer ${FILE}log.xml" ${FILE}magic.xml" ${FILE}policy.xml" - ${FILE}sRGB.icc" + ${FILE}sRGB.icm" ${FILE}thresholds.xml" ${FILE}type-ghostscript.xml" ${FILE}type.xml" + ${FILE}vcomp100.dll" ${FILE}X11.dll" ${FILE}Xext.dll" commit eaf059fd46b88a6358ce038f12a22ba5c05e90b7 Author: Vincent van Ravesteijn <[email protected]> Date: Sun May 13 20:27:08 2012 +0200 Windows installer: Update links in uninstaller diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index bd1c439..7bef7e1 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -63,10 +63,10 @@ Section -InstallData ${REG_UNINSTALL} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"' ${REG_UNINSTALL} "DisplayVersion" "${APP_VERSION}" ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\${APP_RUN},0" - ${REG_UNINSTALL} "URLUpdateInfo" "http://www.lyx.org/"; - ${REG_UNINSTALL} "URLInfoAbout" "http://www.lyx.org/about/"; + ${REG_UNINSTALL} "URLUpdateInfo" "http://www.lyx.org/Download"; + ${REG_UNINSTALL} "URLInfoAbout" "http://www.lyx.org/Home"; ${REG_UNINSTALL} "Publisher" "LyX Team" - ${REG_UNINSTALL} "HelpLink" "http://www.lyx.org/internet/mailing.php"; + ${REG_UNINSTALL} "HelpLink" "http://www.lyx.org/MailingLists"; SectionEnd diff --git a/status.20x b/status.20x index cdfee51..2f69927 100644 --- a/status.20x +++ b/status.20x @@ -247,3 +247,5 @@ What's new - Windows installer now detects Inkscape on installation. +- Fixed links in the Windows uninstaller. + commit 38a853819427ca6b6cd1b5772061c957b68b4331 Author: Vincent van Ravesteijn <[email protected]> Date: Sun May 13 20:26:44 2012 +0200 Windows installer: Detect Inkscape when installing diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index b520c46..0cb055f 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -10,6 +10,7 @@ Function SearchExternal Call SearchLaTeX Call SearchBibTeXEditor Call SearchGnumeric + Call SearchInkscape FunctionEnd #-------------------------------- @@ -135,3 +136,13 @@ Function SearchGnumeric FunctionEnd + +#-------------------------------- +# Inkscape + +Function SearchInkscape + + ReadRegStr $PathInkscape HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation" + +FunctionEnd + diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index 821473b..51402c7 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -10,6 +10,7 @@ Var PathLaTeX Var PathLaTeXLocal Var PathBibTeXEditor Var PathGnumeric +Var PathInkscape Var SetupLaTeX Var SizeLaTeX diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index a134b1a..bd1c439 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -97,6 +97,9 @@ Section -Configure ${If} $PathGnumeric != "" StrCpy $PathPrefix "$PathPrefix;$PathGnumeric" ${EndIf} + ${If} $PathInkscape != "" + StrCpy $PathPrefix "$PathPrefix;$PathInkscape" + ${EndIf} FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n' diff --git a/status.20x b/status.20x index e9f97c6..cdfee51 100644 --- a/status.20x +++ b/status.20x @@ -245,3 +245,5 @@ What's new - Windows installer now detects Gnumeric which is needed for the spreadsheet external inset template (bug 7870). +- Windows installer now detects Inkscape on installation. + commit 8c9da0c2d62eb0f4a95b13c316b159e97c47951c Author: Vincent van Ravesteijn <[email protected]> Date: Sun May 13 17:28:37 2012 +0200 Fix bug #7870: Win installer: check for Gnumeric Gnumeric is needed for the spreadsheet external inset template. diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index af58ef9..b520c46 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -9,6 +9,7 @@ Detection of external component locations Function SearchExternal Call SearchLaTeX Call SearchBibTeXEditor + Call SearchGnumeric FunctionEnd #-------------------------------- @@ -111,3 +112,26 @@ Function SearchBibTeXEditor ${EndIf} FunctionEnd + + +#-------------------------------- +# Gnumeric + +Function SearchGnumeric + + ReadRegStr $PathGnumeric HKCU "Software\GNOME\Gnumeric" "Path" + + ${IfNot} ${FileExists} "$PathGnumeric\gnumeric.exe" + ReadRegStr $PathGnumeric HKLM "Software\GNOME\Gnumeric" "Path" + ${EndIf} + + ${IfNot} ${FileExists} "$PathGnumeric\gnumeric.exe" + ReadRegStr $0 HKLM "Software\Classes\Applications\gnumeric.exe\shell\Open\command" "" + ${If} $0 != "" + StrCpy $0 $0 -18 # remove \"gnumeric.exe" "%1"\" + StrCpy $PathGnumeric $0 + ${EndIf} + ${EndIf} + +FunctionEnd + diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index e33b1da..821473b 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -9,6 +9,7 @@ Variables that are shared between multiple files Var PathLaTeX Var PathLaTeXLocal Var PathBibTeXEditor +Var PathGnumeric Var SetupLaTeX Var SizeLaTeX diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 8bc5088..a134b1a 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -93,7 +93,10 @@ Section -Configure ${EndIf} ${If} $PathBibTeXEditor != "" StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor" - ${EndIf} + ${EndIf} + ${If} $PathGnumeric != "" + StrCpy $PathPrefix "$PathPrefix;$PathGnumeric" + ${EndIf} FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n' diff --git a/status.20x b/status.20x index 05f8db7..e9f97c6 100644 --- a/status.20x +++ b/status.20x @@ -242,3 +242,6 @@ What's new - Remove a temporary log file from the user directory after reconfigure. +- Windows installer now detects Gnumeric which is needed for the + spreadsheet external inset template (bug 7870). + ----------------------------------------------------------------------- Summary of changes: .../packaging/installer/include/detection.nsh | 35 ++++++++++++++++++++ .../Win32/packaging/installer/include/filelist.nsh | 10 ++++- .../packaging/installer/include/variables.nsh | 2 + .../Win32/packaging/installer/setup/configure.nsh | 14 ++++++-- .../Win32/packaging/installer/setup/install.nsh | 1 + .../Win32/packaging/installer/setup/uninstall.nsh | 1 + status.20x | 7 ++++ 7 files changed, 64 insertions(+), 6 deletions(-) hooks/post-receive -- The LyX Source Repository
