From: Uwe Stöhr Date: Mon, 20 Nov 2017 20:14:18 +0000 (+0100) Subject: Win installer: backport also the CMake build removal X-Git-Tag: 2.3.0rc2~237 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4e83fcf9e6ec7794a83bb2ad30c21a6bd7af62f2;p=features.git Win installer: backport also the CMake build removal This might be controversial but as it is it doesn't work (new NSIS backend changed NSIS plugins etc.) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f9a5b66a26..b445ab7b92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -527,13 +527,15 @@ else() endif() mark_as_advanced(LYX_MAN_DIR) -if(LYX_INSTALL AND WIN32) - message(STATUS "Configuring NSIS files") - configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY) - configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY) - configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY) - message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer") -endif() +# The Win installer cannot be built by Cmake because one needs to install plugins for NSIS +# see the Readme.txt of the installer +#if(LYX_INSTALL AND WIN32) +# message(STATUS "Configuring NSIS files") +# configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY) +# configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY) +# configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY) +# message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer") +#endif() if(NOT GROUP_CODE) #set(GROUP_CODE "The Golden Code") diff --git a/development/Makefile.am b/development/Makefile.am index 608b70195f..3c6bbb0b16 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -43,7 +43,6 @@ Win32/packaging/installer/gui/external.nsh \ Win32/packaging/installer/gui/io_latex.ini \ Win32/packaging/installer/gui/LaTeXFolder.nsh \ Win32/packaging/installer/include/declarations.nsh \ -Win32/packaging/installer/include/declarations.nsh.cmake \ Win32/packaging/installer/include/detection.nsh \ Win32/packaging/installer/include/dictionaries.nsh \ Win32/packaging/installer/include/EnvVarUpdate.nsh \ @@ -92,13 +91,11 @@ Win32/packaging/installer/DictionaryMirrors.txt \ Win32/packaging/installer/HunspellDictionaryNames.txt \ Win32/packaging/installer/license.rtf \ Win32/packaging/installer/lyx.nsi \ -Win32/packaging/installer/lyx.nsi.cmake \ Win32/packaging/installer/lyx-bundle.nsi \ Win32/packaging/installer/lyx-standard.nsi \ Win32/packaging/installer/Packages.txt \ Win32/packaging/installer/Readme.txt \ Win32/packaging/installer/settings.nsh \ -Win32/packaging/installer/settings.nsh.cmake \ Win32/packaging/installer/ThesaurusDictionaryNames.txt \ Win32/pdfview/pdfview.nsi \ Win32/vld/cmake/CMakeLists.txt \ diff --git a/development/Win32/packaging/installer/include/declarations.nsh.cmake b/development/Win32/packaging/installer/include/declarations.nsh.cmake deleted file mode 100644 index fc7eaf440c..0000000000 --- a/development/Win32/packaging/installer/include/declarations.nsh.cmake +++ /dev/null @@ -1,99 +0,0 @@ -/* - -declaration.nsh - -Configuration of LyX installer - -*/ - -SetCompressor /SOLID lzma - -#-------------------------------- -# File locations - -!define FILES_LICENSE "${FILES_INSTALLER}\license.rtf" -!define FILES_ICONS "${FILES_INSTALLER}\..\icons" -!define FILES_PDFVIEW "${FILES_DEPS}\bin" -!define FILES_MSVC "${FILES_DEPS}\bin" -!define FILES_PYTHON "${FILES_DEPS}\python" -!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick" -!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript" -!define FILES_NETPBM "${FILES_DEPS}\bin" -!define FILES_DTL "${FILES_DEPS}\bin" -!define FILES_DVIPOST "${FILES_DEPS}\bin" -!define FILES_DVIPOST_PKG "${FILES_DEPS}\tex" -!define FILES_PDFTOOLS "${FILES_DEPS}\bin" -!define FILES_METAFILE2EPS "${FILES_DEPS}\bin" - -#-------------------------------- -# Locations of components to download - -# CTAN and SourceForge select a mirror automatically - -!define DOWNLOAD_LATEX "http://mirrors.ctan.org/systems/win32/miktex/setup/${SETUPFILE_LATEX}" - -#-------------------------------- -# Locations of setup files for components (for bundled setup) - -!define INSTALL_LATEX "${SETUPFILE_LATEX}" - -#-------------------------------- -# Names and version - -!define APP_NAME "LyX" -!define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}.${APP_VERSION_REVISION}" -!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" -!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}" -!define APP_DIR "${APP_NAME}${APP_SERIES_KEY}" -!define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}" -!define APP_INFO "${APP_NAME} - The Document Processor" -!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 LyX Team" - -!define APP_RUN "bin\LyX.exe" - -!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" -!define APP_REGKEY_SETUP "Software\${APP_NAME}${APP_SERIES_KEY}\Setup" -!define APP_REGKEY_SETTINGS "Software\${APP_NAME}${APP_SERIES_KEY}\Settings" - -!define APP_REGNAME_DOC "LyX.Document" - -!define APP_EXT ".lyx" -!define APP_MIME_TYPE "application/lyx" - -#-------------------------------- -# Setup settings - -# Output file name can be configured using command line paramaters like -# /DExeFile=/path/to/installer - -!ifndef SETUPTYPE - !define SETUPTYPE STANDARD -!endif - -!if ${SETUPTYPE} == STANDARD - - !define SETUP_EXE ${ExeFile} - -!else if ${SETUPTYPE} == BUNDLE - - !define SETUP_EXE ${BundleExeFile} - !define BUNDLESETUP_LATEX - -!endif - -!define SETUP_ICON "${FILES_ICONS}\lyx.ico" -!define SETUP_HEADERIMAGE "${FILES_INSTALLER}\graphics\header.bmp" -!define SETUP_WIZARDIMAGE "${FILES_INSTALLER}\graphics\wizard.bmp" -!define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe" -!define SETUP_UNINSTALLER_KEY "${APP_NAME}${APP_SERIES_KEY}" - -#-------------------------------- -# Names of binaries to identify compontents - -!define BIN_LATEX "tex.exe" -!define BIN_BIBTEXEDITOR "JabRef.exe" - -#-------------------------------- -# Custom NSIS plug-ins - -!addplugindir "${FILES_NSISPLUGINS}" diff --git a/development/Win32/packaging/installer/lyx.nsi.cmake b/development/Win32/packaging/installer/lyx.nsi.cmake deleted file mode 100644 index 3b0c24a9c6..0000000000 --- a/development/Win32/packaging/installer/lyx.nsi.cmake +++ /dev/null @@ -1,29 +0,0 @@ -/* - -NSIS Script - LyX 2.0 Installer for Win32 -Authors: Joost Verburg, Angus Leeming, Uwe Stöhr -Compatible with NSIS 2.46 - -*/ - -!addincludedir @CMAKE_SOURCE_DIR@/development/Win32/packaging/installer - -!include settings-cmake.nsh -!include declarations-cmake.nsh - -!include include\variables.nsh -!include include\nsis.nsh -!include include\filelist.nsh -!include include\detection.nsh -!include include\gui.nsh -!include include\init.nsh -!include setup\install.nsh -!include setup\uninstall.nsh -!include setup\configure.nsh -!include gui\external.nsh -!include gui\reinstall.nsh - -#-------------------------------- -# Output file - -Outfile "${SETUP_EXE}" diff --git a/development/Win32/packaging/installer/settings.nsh.cmake b/development/Win32/packaging/installer/settings.nsh.cmake deleted file mode 100644 index e79fcef4ae..0000000000 --- a/development/Win32/packaging/installer/settings.nsh.cmake +++ /dev/null @@ -1,50 +0,0 @@ -/* - -Settings for LyX installer - -These typically need to be modified for each LyX release - -*/ - -#-------------------------------- -# Version number - -!define APP_VERSION_MAJOR @LYX_MAJOR_VERSION@ -!define APP_VERSION_MINOR @LYX_MINOR_VERSION@ -!define APP_VERSION_PATCH @LYX_PATCH_VERSION@ -!define APP_VERSION_REVISION @LYX_REVISION_VERSION@ -#!define APP_VERSION_BUILD 0 # isn't revision number enough? - -!define /date APP_VERSION "@LYX_MAJOR_VERSION@.@LYX_MINOR_VERSION@.@LYX_PATCH_VERSION@-@LYX_REVISION_VERSION@" # Version to display - -#-------------------------------- -# Installer file name - -# Typical names for the release are "LyX-2.0.0-1-Installer.exe" etc. - -!ifndef ExeFile - !define /date ExeFile "LyX-${APP_VERSION}-Installer.exe" -!endif -!ifndef BundleExeFile - !define /date BundleExeFile "LyX-${APP_VERSION}-Installer-Bundle.exe" -!endif -!ifndef MinimalExeFile - !define /date MinimalExeFile "LyX-${APP_VERSION}-Installer-Minimal.exe" -!endif - -#-------------------------------- -# File locations - -!define FILES_LYX "@CMAKE_INSTALL_PREFIX_ABSOLUTE@" -!define FILES_DEPS "@LYX_DEPENDENCIES_DIR@/deps20" -!define FILES_BUNDLE "@CMAKE_BINARY_DIR@/depsbundle" #TODO Where is it? Where does it comes from? -!define FILES_QT "@QT_INCLUDE_DIR@/.." -!define FILES_INSTALLER "@CMAKE_SOURCE_DIR@/development/Win32/packaging/installer" - -#-------------------------------- -# MiKTeX -# Sizes in KB - -!define SETUPFILE_LATEX "basic-miktex-2.9.4146.exe" -!define SIZE_DOWNLOAD_LATEX 160106 -!define SIZE_LATEX 380000