commit d995ea684f1080b7e448ba73883a33417460f134
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Oct 20 23:11:17 2019 +0200
build5-2017.bat: add new script to compile using MSVC 2017
---
development/cmake/build5-2017-installer.bat | 41 +++++++++++
development/cmake/build5-2017.bat | 101 +++++++++++++++++++++++++++
2 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/development/cmake/build5-2017-installer.bat
b/development/cmake/build5-2017-installer.bat
new file mode 100644
index 0000000..fa2d4a0
--- /dev/null
+++ b/development/cmake/build5-2017-installer.bat
@@ -0,0 +1,41 @@
+REM Run this script via double click.
+
+REM Create a link and add cmd.exe /k in the preferences in front of the
mingw.bat call to prevent closing the cmd window.
+
+::echo off
+
+REM Install Qt from qt.io
+set PATH=C:\Qt\Qt5.12.5\5.12.5\msvc2017\bin;%PATH%
+
+set LYX_SOURCE=%~DP0..\..
+set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2017
+
+echo LyX source: %LYX_SOURCE%
+echo LyX build : %LYX_BUILD%
+
+
+REM first remove an existing compilation to assure a clean version
+mkdir %LYX_BUILD%
+del /s/q %LYX_BUILD%\*
+rmdir /s/q %LYX_BUILD%\LYX_INSTALLED
+
+REM Download
http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
+REM Extract on the same level as LyX sources
+set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2017
+
+REM MSVC 2017 tools
+call "C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+
+cd %LYX_BUILD%
+cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_USE_QT=QT5 -DLYX_MERGE_FILES=1
-DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF
+
+nmake doc
+nmake translations
+nmake
+nmake install
+
+goto :eof
+:eof
+
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
diff --git a/development/cmake/build5-2017.bat
b/development/cmake/build5-2017.bat
new file mode 100644
index 0000000..6fe84aa
--- /dev/null
+++ b/development/cmake/build5-2017.bat
@@ -0,0 +1,101 @@
+echo off
+
+echo
-------------------------------------------------------------------------------------
+echo -
+echo Usage build.bat devel/install
+echo devel - Builds Visual Studio project files for development on LyX
+echo install - Builds Visual Studio project files with all enabled for
installation
+echo
+echo
-------------------------------------------------------------------------------------
+echo -
+echo Call this script from a build directory or set variables (or edit this
file)
+echo LYX_SOURCE
+echo LXY_BUILD
+echo
+echo Be sure you've set qmake in PATH.
+echo -
+echo GNUWin32 will be downloaded if you don't set the variable GNUWIN32_DIR
+echo
-------------------------------------------------------------------------------------
+echo -
+echo -
+
+if [%1]==[] (
+ echo ERROR: no options.
+ echo Exiting now.
+ goto :eof
+)
+
+REM Uncomment the following line if you want to compile in parallel.
+REM This uses N cl.exe processes, where N is the number of cores.
+set CL=/MP
+
+REM Save path
+set CALLED_FROM=%CD%
+
+REM Edit pathes here or set the environment variables on your system.
+set CMAKE_PATH="C:\Program Files\CMake\bin"
+set QT_PATH="C:\Qt\Qt5.12.5\5.12.5\msvc2017"
+set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2017"
+set LYX_SOURCE="D:\LyXGit\Master"
+set LYX_BUILD="D:\LyXGit\Master\compile-2017"
+
+if [%LYX_SOURCE%]==[] (
+ set LYX_SOURCE=%~DP0\..\..
+)
+echo LyX source: %LYX_SOURCE%
+
+if [%LYX_BUILD%]==[] (
+ set LYX_BUILD=%CD%
+)
+echo LyX build : %LYX_BUILD%
+
+if [%GNUWIN32_DIR%]==[] (
+ echo GNUWIN32_DIR not set.
+ echo Downloading win32 deps.
+ set DEPENDENCIES_DOWNLOAD="-DLYX_DEPENDENCIES_DOWNLOAD=1"
+) else set PATH=%GNUWIN32_DIR%\bin;%PATH%
+echo GNUWIN32_DIR : %GNUWIN32_DIR%
+
+if [%QT_PATH%]==[] (
+ echo QT_PATH not set.
+) else set PATH=%QT_PATH%;%PATH%
+echo QT_PATH : %QT_PATH%
+
+if [%CMAKE_PATH%]==[] (
+ echo CMAKE_PATH not set.
+) else set PATH=%CMAKE_PATH%;%PATH%
+echo CMAKE_PATH : %CMAKE_PATH%
+
+if not exist %LYX_BUILD% (
+ echo creating "%LYX_BUILD%"
+ mkdir "%LYX_BUILD%"
+ if not exist %LYX_BUILD% (
+ echo Exiting script.
+ goto :eof
+ )
+)
+
+cd "%LYX_BUILD%"
+
+REM start with a new cmake run
+::del %LYX_BUILD%\CMakeCache.txt
+
+if "%1%" == "devel" (
+ REM Build solution to develop LyX
+ REM you can add the option "-GNinja" for a faster compilation
+ cmake %LYX_SOURCE% -G"Visual Studio 15 2017"
-DCMAKE_PREFIX_PATH=%QT_PATH% -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0
-DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0
-DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
+ msbuild src\LyX.vcxproj /p:Configuration=Debug
+ msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug
+)
+
+if "%1%" == "install" (
+ REM Build solution to develop LyX
+ REM set -DLYX_MERGE_REBUILD and -DLYX_MERGE_FILES to 1 for a version
released with an installer
+ cmake %LYX_SOURCE% -GNinja -G"Visual Studio 15 2017"
-DCMAKE_PREFIX_PATH=%QT_PATH% -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=0
-DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1
-DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD%
+ msbuild INSTALL.vcxproj /p:Configuration=Release
+)
+
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
+
+:eof
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
