X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fbuild.bat;h=c08865e1cd4f2621d77b3eb5175a9731f6e59daf;hb=aafd52f44167d5510be1ddcb974daa9dae486933;hp=6906c1bdf5dc4443bfa07c15d78f3cf4d5368b51;hpb=668ef9c36581c747515a237b5cf9297c16f1e96c;p=lyx.git

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index 6906c1bdf5..c08865e1cd 100755
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -6,8 +6,8 @@ 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 -
@@ -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%
+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 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\..\..
@@ -46,17 +50,11 @@ if [%LYX_BUILD%]==[] (
 )
 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 (
-	echo LyX deps  : "%GNUWIN32_DIR%"
-	set PATH="%GNUWIN32_DIR%\bin";"%PATH%"
-)
-
+) else set PATH="%GNUWIN32_DIR%\bin";%PATH%
 
 if not exist %LYX_BUILD% (
 	echo creating "%LYX_BUILD%"
@@ -66,8 +64,8 @@ if not exist %LYX_BUILD% (
 		goto :eof
 	)
 )
-cd "%LYX_BUILD%"
 
+cd "%LYX_BUILD%"
 
 REM start with a new cmake run
 ::del CMakeCache.txt
@@ -81,17 +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 %DEPENDENCIES_DOWNLOAD%
-	msbuild lyx.sln /p:Configuration=Debug /t:LyX /t:text2lyx
+	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 go back to the dir where the script was called from
+cd /D %CALLED_FROM%
 
 :eof