From: Peter Kümmel Date: Sun, 17 Jan 2016 17:34:15 +0000 (+0100) Subject: clean build with MSVC2010 X-Git-Tag: 2.2.0beta1~158 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2f290a46d2b3d0abcddd867c6a92b7478412f2f1;p=features.git clean build with MSVC2010 --- diff --git a/development/cmake/build5-2010.bat b/development/cmake/build5-2010.bat index 3f18b87b10..5ec5250388 100644 --- a/development/cmake/build5-2010.bat +++ b/development/cmake/build5-2010.bat @@ -1,100 +1,37 @@ -echo off +REM Run this script via double click. -echo ------------------------------------------------------------------------------------- -echo - -echo Usage build.bat devel/install/deploy STUDIO(optional) -echo devel - Builds Visual Studio project files for development on LyX -echo install - Builds Visual Studio project files with all enabled for installation -echo STUDIO - Used Visual Studio version, default is "Visual Studio 10" -echo use "Visual Studio 9 2008" for Visual Studio 9 -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 - +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. -if [%1]==[] ( - echo ERROR: no options. - echo Exiting now. - goto :eof -) +::echo off -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 Install Qt from qt.io +set PATH=C:\Qt\Qt5.5.1\5.5\msvc2010\bin;%PATH% -REM Save path -set CALLED_FROM=%CD% +set LYX_SOURCE=%~DP0..\.. +set LYX_BUILD=%LYX_SOURCE%\..\compile-msvc2010 -REM Add path to qmake here or set PATH correctly on your system. -set PATH=C:\Qt\Qt5-5-1-2010\5.5\msvc2010\bin;%PATH% +echo LyX source: %LYX_SOURCE% +echo LyX build : %LYX_BUILD% -REM Edit pathes here or set the environment variables on you system. -set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2010 -set LYX_SOURCE=D:\LyXGit\Master\ -set LYX_BUILD=D:\LyXGit\Master\compile-2010 +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=%LYX_SOURCE%\..\lyx20-deps-msvc2010-x86\deps20 -if [%LYX_SOURCE%]==[] ( - set LYX_SOURCE=%~DP0\..\.. -) -echo LyX source: "%LYX_SOURCE%" +REM MSVC 2010 tools +call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 -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% +mkdir %LYX_BUILD% +rmdir /s/q %LYX_BUILD% +mkdir %LYX_BUILD% -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% +cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF -cd "%LYX_BUILD%" - -REM start with a new cmake run -::del CMakeCache.txt - -if [%2]==[] ( - set USED_STUDIO="Visual Studio 10" -) else ( - set USED_STUDIO=%2% -) - - -if "%1%" == "devel" ( - REM Build solution to develop LyX - REM you can add the option "-GNinja" for a faster compilation - cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=ON -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -LYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD% - msbuild lyx.sln /p:Configuration=Debug /t:LyX /t:tex2lyx -) - -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%USED_STUDIO% -DLYX_ENABLE_CXX11=ON -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 lyx.sln /p:Configuration=Release /t:ALL_BUILD - msbuild INSTALL.vcxproj /p:Configuration=Release -) - -REM go back to the dir where the script was called from -cd /D %CALLED_FROM% +nmake doc +nmake translations +nmake +nmake install +goto :eof :eof