installer: preparation and updates for upcoming LyX 2.1.4 release

[lyx.git] / development / cmake / build.bat

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index f748ef97079150c3a7f98a29dda70f090523806c..0a2b60933ec83ee2502c26c765b5ac762bc0d93b 100755 (executable)
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -1,20 +1,25 @@
 echo off
 
 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     deploy  - Builds Makefiles and installs LyX
-echo     STUDIO  - Used Visual Studio version, default is "Visual Studio 9 2008"
-echo               use "Visual Studio 10" for Visual Studio 10
+echo     STUDIO  - Used Visual Studio version, default is "Visual Studio 10"
+echo               use "Visual Studio 9 2008" for Visual Studio 9
+echo
 echo -------------------------------------------------------------------------------------
-echo Be sure you've set qmake in PATH and set the variables:
-echo     GNUWIN32_DIR
+echo -
+echo Call this script from a build directory or set variables (or edit this file)
 echo     LYX_SOURCE
 echo     LXY_BUILD
-echo Or edit this file.
+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.
@@ -22,53 +27,50 @@ if [%1]==[] (
        goto :eof
 )
 
+REM Save path
+set CALLED_FROM=%CD%
+
+
 REM Add path to qmake here or set PATH correctly on your system.
-::set PATH=D:\Qt\bin;%PATH%
+set PATH="D:\Qt\bin";%PATH%
 
 REM Edit pathes here or set the environment variables on you system.
-::set GNUWIN32_DIR=D:\LyXSVN\lyx-devel\lyx-windows-deps-msvc2008
-::set LYX_SOURCE=D:\LyXSVN\lyx-devel.
-::set LXY_BUILD=D:\LyXSVN\compile-result
-
-if [%LYX_BUILD%]==[] (
-       echo ERROR:  LYX_BUILD not set.
-       echo Exiting now.
-       goto :eof
-)
+set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2010
+set LYX_SOURCE=D:\LyXGit\Master\
+set LYX_BUILD=D:\LyXGit\Master\compile-result
 
 if [%LYX_SOURCE%]==[] (
-       echo ERROR:  LYX_SOURCE not set.
-       echo Exiting now.
-       goto :eof
+       set LYX_SOURCE=%~DP0\..\..
 )
+echo LyX source: "%LYX_SOURCE%"
 
-if [%GNUWIN32_DIR%]==[] (
-       echo ERROR:  GNUWIN32_DIR not set.
-       echo Exiting now.
-       goto :eof
+if [%LYX_BUILD%]==[] (
+       set LYX_BUILD=%CD%
 )
-
-echo LyX source: "%LYX_SOURCE%"
 echo LyX build : "%LYX_BUILD%"
-echo LyX deps  : "%GNUWIN32_DIR%"
-
-set PATH=%GNUWIN32_DIR%\bin;%PATH%
 
+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%"
 if not exist %LYX_BUILD% (
-       echo Exiting script.
-       goto :eof
+       echo creating "%LYX_BUILD%"
+       mkdir "%LYX_BUILD%"
+       if not exist %LYX_BUILD% (
+               echo Exiting script.
+               goto :eof
+       )
 )
-cd "%LYX_BUILD%"
 
+cd "%LYX_BUILD%"
 
-REM Delete all files indirectory
-del /s/q *
-del CMakeCache.txt
+REM start with a new cmake run
+::del CMakeCache.txt
 
 if [%2]==[] (
-       set USED_STUDIO="Visual Studio 9 2008"
+       set USED_STUDIO="Visual Studio 10"
 ) else (
        set USED_STUDIO=%2%
 )
@@ -76,27 +78,19 @@ if [%2]==[] (
 
 if "%1%" == "devel" (
        REM Build solution to develop LyX
-       cmake %LYX_SOURCE%\development\cmake -G%USED_STUDIO% -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_DEBUG=1
-       REM needed when running lyx from the debugger
-       set LYX_DIR_20x=%LYX_SOURCE%\lib
-       start lyx.sln /build Debug
+       cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE %DEPENDENCIES_DOWNLOAD%
+       msbuild lyx.sln /p:Configuration=Debug /t:LyX /t:tex2lyx
 )
 
 if "%1%" == "install" (
        REM Build solution to develop LyX
-       cmake %LYX_SOURCE%\development\cmake -G%USED_STUDIO% -DLYX_MERGE_FILES=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1
-       REM needed when running lyx from the debugger
-       set LYX_DIR_20x=
-       start lyx.sln /build Debug
+       REM set -DLYX_MERGE_REBUILD and -DLYX_MERGE_FILES to 1 for a version released with an installer
+       cmake %LYX_SOURCE% -G%USED_STUDIO% -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
 )
 
-if "%1%" == "deploy" (
-       REM Build complete installed LyX
-       cmake "%LYX_SOURCE%"\development\cmake -G"NMake Makefiles" -DLYX_MERGE_FILES=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1
-       nmake
-       nmake install
-)
-
-
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
 
 :eof