X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fbuild.bat;h=8da0f206a3908ab4636ea537f21f511634d5682d;hb=de46406e8d55b88fae6ad163799ec57f814e5ee7;hp=e801361190924217b111eabb611d16995dfce6aa;hpb=9f55627b2eaeca61027a4dfae47411466d33a9de;p=lyx.git

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index e801361190..8da0f206a3 100755
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -3,25 +3,32 @@ echo off
 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 installaion
+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 -------------------------------------------------------------------------------------
-echo Be sure you've set qmake in PATH and set the variabales:
+echo Be sure you've set qmake in PATH and set the variables:
 echo     GNUWIN32_DIR
-echo     LYX_OURCE
+echo     LYX_SOURCE
 echo     LXY_BUILD
 echo Or edit this file.
 echo -------------------------------------------------------------------------------------
 
+
+if [%1]==[] (
+	echo ERROR: no options.
+    echo Exiting now.
+	goto :eof
+)
+
 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
+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
 
 if [%LYX_BUILD%]==[] (
 	echo ERROR:  LYX_BUILD not set.
@@ -48,20 +55,17 @@ echo LyX deps  : "%GNUWIN32_DIR%"
 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%"
 
 
-if [%1]==[] (
-	echo ERROR: no options.
-    echo Exiting now.
-	goto :eof
-)
-
 REM Delete all files indirectory
 del /s/q *
 del CMakeCache.txt
@@ -75,9 +79,9 @@ 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
+	cmake %LYX_SOURCE%\development\cmake -G%USED_STUDIO% -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_RELEAE=0
 	REM needed when running lyx from the debugger
-	set LYX_DIR_20x="%LYX_SOURCE&"\lib
+	set LYX_DIR_20x=%LYX_SOURCE%\lib
 	start lyx.sln /build Debug
 )
 
@@ -85,7 +89,7 @@ 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="%LYX_SOURCE&"\lib
+	set LYX_DIR_20x=
 	start lyx.sln /build Debug
 )
 
@@ -96,6 +100,8 @@ if "%1%" == "deploy" (
 	nmake install
 )
 
+:: return to the cmake folder where this script was started from
+cd %LYX_SOURCE%\development\cmake
 
 
 :eof