From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Fri, 16 Mar 2012 01:19:49 +0000 (+0100)
Subject: cmake/build.bat: update the script to Git and use Peter's suggestions
X-Git-Tag: 2.0.4~173
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b1bb04d2447059e0771a2b03d707f2f1541d7122;p=features.git

cmake/build.bat: update the script to Git and use Peter's suggestions
---

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index 8da0f206a3..7d8cb61255 100755
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -26,9 +26,9 @@ 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-msvc2008
-set LYX_SOURCE=D:\LyXSVN\lyx-devel
-set LYX_BUILD=D:\LyXSVN\lyx-devel\compile-result
+set GNUWIN32_DIR=D:\LyXGit\2.0.x\lyx-windows-deps-msvc2010
+set LYX_SOURCE=D:\LyXGit\2.0.x
+set LYX_BUILD=D:\LyXGit\2.0.x\compile-result
 
 if [%LYX_BUILD%]==[] (
 	echo ERROR:  LYX_BUILD not set.
@@ -67,11 +67,11 @@ cd "%LYX_BUILD%"
 
 
 REM Delete all files indirectory
-del /s/q *
+::del /s/q *
 del CMakeCache.txt
 
 if [%2]==[] (
-	set USED_STUDIO="Visual Studio 9 2008"
+	set USED_STUDIO="Visual Studio 10"
 ) else (
 	set USED_STUDIO=%2%
 )
@@ -79,18 +79,21 @@ 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_RELEAE=0
+	cmake %LYX_SOURCE%\development\cmake -G%USED_STUDIO% -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_RELEASE=0
 	REM needed when running lyx from the debugger
 	set LYX_DIR_20x=%LYX_SOURCE%\lib
-	start lyx.sln /build Debug
+	::start lyx.sln /build Debug
+	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
+	cmake %LYX_SOURCE%\development\cmake -G%USED_STUDIO% -DLYX_MERGE_FILES=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF
 	REM needed when running lyx from the debugger
 	set LYX_DIR_20x=
-	start lyx.sln /build Debug
+	::start lyx.sln /build Debug
+	msbuild lyx.sln         /p:Configuration=Release /t:ALL_BUILD
+	msbuild INSTALL.vcxproj /p:Configuration=Release 
 )
 
 if "%1%" == "deploy" (