Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index d530ea5c999245c9f965249ad8c203c81ea50660..c08865e1cd4f2621d77b3eb5175a9731f6e59daf 100755 (executable)
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -28,13 +28,17 @@ 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%
 
 REM Edit pathes here or set the environment variables on you system.
-set GNUWIN32_DIR=D:\LyXSVN\lyx-devel\lyx-windows-deps-msvc2010
-set LYX_SOURCE=D:\LyXSVN\lyx-devel
-set LYX_BUILD=D:\LyXSVN\lyx-devel\compile-result
+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%]==[] (
        set LYX_SOURCE=%~DP0\..\..
@@ -75,18 +79,19 @@ if [%2]==[] (
 
 if "%1%" == "devel" (
        REM Build solution to develop LyX
-       cmake %LYX_SOURCE% -G%USED_STUDIO% -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE %DEPENDENCIES_DOWNLOAD%
+       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% -G%USED_STUDIO% -DLYX_MERGE_FILES=1 -DLYX_INSTALL=1 %DEPENDENCIES_DOWNLOAD% 
+       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_INSTALL=1 %DEPENDENCIES_DOWNLOAD% 
        msbuild lyx.sln         /p:Configuration=Release /t:ALL_BUILD
        msbuild INSTALL.vcxproj /p:Configuration=Release 
 )
 
-REM Edit the path according to your system.
-cd "%LYX_SOURCE%\development\cmake"
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
 
 :eof