Win build scripts: add a one-click script for installer builds

- also restore a build script for daily development work
- remove 2 outdated/unnecessary scripts

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
deleted file mode 100755 (executable)
index eff9fbb..0000000
--- a/development/cmake/build.bat
+++ /dev/null
@@ -1,101 +0,0 @@
-echo off
-
-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 -
-
-if [%1]==[] (
-       echo ERROR: no options.
-    echo Exiting now.
-       goto :eof
-)
-
-REM Uncomment the following line if you want to compile in parallel.
-REM This uses N cl.exe processes, where N is the number of cores.
-REM set CL=/MP
-
-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:\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
-       REM you can add the option "-GNinja" for a faster compilation
-       cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_EXPORT_TESTS=ON -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

diff --git a/development/cmake/build5-2010-installer.bat b/development/cmake/build5-2010-installer.bat
new file mode 100644 (file)
index 0000000..e0d3c7d
--- /dev/null
+++ b/development/cmake/build5-2010-installer.bat
@@ -0,0 +1,44 @@
+REM Run this script via double click.
+
+REM Create a link and add  cmd.exe /k  in the preferences in front of the mingw.bat call to prevent closing the cmd window.
+
+::echo off
+
+REM Install Qt from qt.io
+set PATH=C:\Qt\Qt5-5-1-2010\5.5\msvc2010\bin;%PATH%
+
+set LYX_SOURCE=%~DP0..\..
+
+REM first remove an existing compilation to assure a clean version
+RMDIR /S /Q %LYX_SOURCE%\build-result-5-2010
+
+set LYX_BUILD=%LYX_SOURCE%\build-result-5-2010
+
+echo LyX source: %LYX_SOURCE%
+echo LyX build : %LYX_BUILD%
+
+REM Download http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
+REM Extract on the same level as LyX sources
+set GNUWIN32_DIR=%LYX_SOURCE%\lyx-windows-deps-msvc2010
+
+REM MSVC 2010 tools
+call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+
+
+mkdir %LYX_BUILD%
+rmdir /s/q %LYX_BUILD%
+mkdir %LYX_BUILD%
+
+cd %LYX_BUILD%
+cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF 
+
+nmake doc
+nmake translations
+nmake
+nmake install
+
+goto :eof
+:eof
+
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%

diff --git a/development/cmake/build5-2010.bat b/development/cmake/build5-2010.bat
index 6fc14b8d5d15340a859d3a549a60cc2ed088fd53..3f18b87b107295ad7cb1358b22a534c5cbe5ae0c 100644 (file)
--- a/development/cmake/build5-2010.bat
+++ b/development/cmake/build5-2010.bat
@@ -1,37 +1,100 @@
-REM Run this script via double click.
+echo off
 
-REM Create a link and add  cmd.exe /k  in the preferences in front of the mingw.bat call to prevent closing the cmd window.
+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 -
 
-::echo off
+if [%1]==[] (
+       echo ERROR: no options.
+    echo Exiting now.
+       goto :eof
+)
 
-REM Install Qt from qt.io
-set PATH=C:\Qt\Qt5.5.1\5.5\msvc2010\bin;%PATH%
+REM Uncomment the following line if you want to compile in parallel.
+REM This uses N cl.exe processes, where N is the number of cores.
+set CL=/MP
 
-set LYX_SOURCE=%~DP0..\..
-set LYX_BUILD=%LYX_SOURCE%\..\build5-msvc2010
+REM Save path
+set CALLED_FROM=%CD%
 
-echo LyX source: %LYX_SOURCE%
-echo LyX build : %LYX_BUILD%
+REM Add path to qmake here or set PATH correctly on your system.
+set PATH=C:\Qt\Qt5-5-1-2010\5.5\msvc2010\bin;%PATH%
 
-REM Download http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
-REM Extract on the same level as LyX sources
-set GNUWIN32_DIR=%LYX_SOURCE%\..\lyx20-deps-msvc2010-x86\deps20
+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-2010
 
-REM MSVC 2010 tools
-call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+if [%LYX_SOURCE%]==[] (
+       set LYX_SOURCE=%~DP0\..\..
+)
+echo LyX source: "%LYX_SOURCE%"
 
+if [%LYX_BUILD%]==[] (
+       set LYX_BUILD=%CD%
+)
+echo LyX build : "%LYX_BUILD%"
 
-mkdir %LYX_BUILD%
-rmdir /s/q %LYX_BUILD%
-mkdir %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%
 
-cd %LYX_BUILD%
-cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF 
+if not exist %LYX_BUILD% (
+       echo creating "%LYX_BUILD%"
+       mkdir "%LYX_BUILD%"
+       if not exist %LYX_BUILD% (
+               echo Exiting script.
+               goto :eof
+       )
+)
 
-nmake doc
-nmake translations
-nmake
-nmake install
+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
+       REM you can add the option "-GNinja" for a faster compilation
+       cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=ON -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -LYX_3RDPARTY_BUILD=1 %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% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -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%
 
-goto :eof
 :eof

diff --git a/development/cmake/build5.bat b/development/cmake/build5.bat
deleted file mode 100644 (file)
index 2acfe7c..0000000
--- a/development/cmake/build5.bat
+++ /dev/null
@@ -1,99 +0,0 @@
-echo off
-
-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 -
-
-if [%1]==[] (
-       echo ERROR: no options.
-    echo Exiting now.
-       goto :eof
-)
-
-REM Uncomment the following line if you want to compile in parallel.
-REM This uses N cl.exe processes, where N is the number of cores.
-set CL=/MP
-
-REM Save path
-set CALLED_FROM=%CD%
-
-REM Add path to qmake here or set PATH correctly on your system.
-set PATH=C:\Qt\Qt5-5-1-2013-32bit\5.5\msvc2013\bin;%PATH%
-
-REM Edit pathes here or set the environment variables on you system.
-set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2013
-set LYX_SOURCE=D:\LyXGit\Master\
-set LYX_BUILD=D:\LyXGit\Master\compile-2013
-
-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 12 2013"
-) else (
-       set USED_STUDIO=%2%
-)
-
-
-if "%1%" == "devel" (
-       REM Build solution to develop LyX
-       cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -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:ALL_BUILD
-)
-
-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_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -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