X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fbuild.bat;h=0a2b60933ec83ee2502c26c765b5ac762bc0d93b;hb=758e27c61168579c90b1c262240088f60954bf62;hp=54ae14def45a905ba15ba5b6ddaff0e1b598a5b2;hpb=0ad3abd5346b3075d5bbe3c2d2c684a9ca65096a;p=lyx.git

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index 54ae14def4..0a2b60933e 100755
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -1,22 +1,96 @@
-:: set here the path to Qt's bin folder and to the LyX-MSVC depend bin folder
-:: (these are example paths)
-PATH=D:\Qt\bin;D:\LyXSVN\lyx-devel\lyx-windows-deps-msvc2008\bin;%PATH%
+echo off
 
-:: change directory to the folder where the compile result should be stored
-:: (this is an example path)
-cd D:\LyXSVN\lyx-devel\compile-result
-cmake ..\development\cmake -G"Visual Studio 9 2008" -Dnls=1 -DGNUWIN32_DIR=D:\LyXSVN\lyx-devel\lyx-windows-deps-msvc2008 -Dmerge=0
+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     STUDIO  - Used Visual Studio version, default is "Visual Studio 10"
+echo               use "Visual Studio 9 2008" for Visual Studio 9
+echo
+echo -------------------------------------------------------------------------------------
+echo -
+echo Call this script from a build directory or set variables (or edit this file)
+echo     LYX_SOURCE
+echo     LXY_BUILD
+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 -
 
-:: clean
-start lyx.sln :: /clean Release
+if [%1]==[] (
+	echo ERROR: no options.
+    echo Exiting now.
+	goto :eof
+)
 
-:: rebuild all generated files
-::cmake ..\cmake -Dmerge_rebuild=1
+REM Save path
+set CALLED_FROM=%CD%
 
-:: build release version
-::start lyx.sln /build Release
 
-:: return to the cmake folder where this script was started from
-:: (this is an example path)
-cd D:\LyXSVN\lyx-devel\development\cmake
+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:\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\..\..
+)
+echo LyX source: "%LYX_SOURCE%"
+
+if [%LYX_BUILD%]==[] (
+	set LYX_BUILD=%CD%
+)
+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 set PATH="%GNUWIN32_DIR%\bin";%PATH%
+
+if not exist %LYX_BUILD% (
+	echo creating "%LYX_BUILD%"
+	mkdir "%LYX_BUILD%"
+	if not exist %LYX_BUILD% (
+		echo Exiting script.
+		goto :eof
+	)
+)
+
+cd "%LYX_BUILD%"
+
+REM start with a new cmake run
+::del CMakeCache.txt
+
+if [%2]==[] (
+	set USED_STUDIO="Visual Studio 10"
+) else (
+	set USED_STUDIO=%2%
+)
+
+
+if "%1%" == "devel" (
+	REM Build solution to develop LyX
+	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
+	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
+)
+
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
+
+:eof