From 43a58f8d85aa61d4994f0bc7352d7bf6e3356de0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 1 Mar 2017 20:29:46 -0500
Subject: [PATCH] Remove obsolete settings from Windows build scripts, plus
 misc. updates

- Added BUILD_DOCS=1 to release scripts
- Removed "breakfast" scripts, which used the same settings as "all", plus a
  release version override, which is rarely used (if at all) and can be done
  separately.
---
 build/win32/generate-MSVC-all-breakfast.bat | 9 ---------
 build/win32/generate-MSVC-all.bat           | 2 +-
 build/win32/generate-MSVC-minimal.bat       | 2 +-
 build/win32/generate-MSVC-release.bat       | 2 +-
 build/win64/generate-MSVC-all-breakfast.bat | 9 ---------
 build/win64/generate-MSVC-all.bat           | 2 +-
 build/win64/generate-MSVC-minimal.bat       | 2 +-
 build/win64/generate-MSVC-release.bat       | 2 +-
 8 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 build/win32/generate-MSVC-all-breakfast.bat
 delete mode 100644 build/win64/generate-MSVC-all-breakfast.bat

diff --git a/build/win32/generate-MSVC-all-breakfast.bat b/build/win32/generate-MSVC-all-breakfast.bat
deleted file mode 100644
index ac26c4f75..000000000
--- a/build/win32/generate-MSVC-all-breakfast.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
-IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2015_32
-cd VC2015_32
-echo generating a build folder
-rem for /f "delims=" %%a in ('DATE /T') do @set myvar=breakfast-%BUILD_NUMBER%
-set myvar=breakfast-%BUILD_NUMBER%
-cmake ..\..\.. -G"Visual Studio 14" -DDFHACK_RELEASE="%myvar%" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_DF2MC=1 -DBUILD_DFUSION=1 -DBUILD_STONESENSE=1 -DBUILD_SERVER=1
diff --git a/build/win32/generate-MSVC-all.bat b/build/win32/generate-MSVC-all.bat
index 254492f2e..5c113c7b6 100755
--- a/build/win32/generate-MSVC-all.bat
+++ b/build/win32/generate-MSVC-all.bat
@@ -3,4 +3,4 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
 mkdir VC2015_32
 cd VC2015_32
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_DF2MC=1 -DBUILD_DFUSION=1 -DBUILD_STONESENSE=1 -DBUILD_SERVER=1
+cmake ..\..\.. -G"Visual Studio 14" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
diff --git a/build/win32/generate-MSVC-minimal.bat b/build/win32/generate-MSVC-minimal.bat
index e42072d05..a03e5936c 100755
--- a/build/win32/generate-MSVC-minimal.bat
+++ b/build/win32/generate-MSVC-minimal.bat
@@ -3,4 +3,4 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
 mkdir VC2015_32
 cd VC2015_32
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DF2MC=0 -DBUILD_DFUSION=0 -DBUILD_STONESENSE=0 -DBUILD_SERVER=0
+cmake ..\..\.. -G"Visual Studio 14" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
diff --git a/build/win32/generate-MSVC-release.bat b/build/win32/generate-MSVC-release.bat
index 9735a1469..8f548427e 100755
--- a/build/win32/generate-MSVC-release.bat
+++ b/build/win32/generate-MSVC-release.bat
@@ -3,4 +3,4 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
 mkdir VC2015_32
 cd VC2015_32
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DF2MC=1 -DBUILD_DFUSION=1 -DBUILD_STONESENSE=1 -DBUILD_SERVER=1
+cmake ..\..\.. -G"Visual Studio 14" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/generate-MSVC-all-breakfast.bat b/build/win64/generate-MSVC-all-breakfast.bat
deleted file mode 100644
index 8fd64caaf..000000000
--- a/build/win64/generate-MSVC-all-breakfast.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
-IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2015
-cd VC2015
-echo generating a build folder
-rem for /f "delims=" %%a in ('DATE /T') do @set myvar=breakfast-%BUILD_NUMBER%
-set myvar=breakfast-%BUILD_NUMBER%
-cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DDFHACK_RELEASE="%myvar%" -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_DF2MC=1 -DBUILD_DFUSION=1 -DBUILD_STONESENSE=1 -DBUILD_SERVER=1
diff --git a/build/win64/generate-MSVC-all.bat b/build/win64/generate-MSVC-all.bat
index a27f12697..d3261fa77 100755
--- a/build/win64/generate-MSVC-all.bat
+++ b/build/win64/generate-MSVC-all.bat
@@ -3,4 +3,4 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
 mkdir VC2015
 cd VC2015
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_DF2MC=1 -DBUILD_DFUSION=1 -DBUILD_STONESENSE=1 -DBUILD_SERVER=1
+cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/generate-MSVC-minimal.bat b/build/win64/generate-MSVC-minimal.bat
index ea57b99f6..861d37eea 100755
--- a/build/win64/generate-MSVC-minimal.bat
+++ b/build/win64/generate-MSVC-minimal.bat
@@ -3,4 +3,4 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
 mkdir VC2015
 cd VC2015
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DF2MC=0 -DBUILD_DFUSION=0 -DBUILD_RUBY=0 -DBUILD_STONESENSE=0 -DBUILD_SERVER=0
+cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
diff --git a/build/win64/generate-MSVC-release.bat b/build/win64/generate-MSVC-release.bat
index 7a564a1d1..8782583a0 100755
--- a/build/win64/generate-MSVC-release.bat
+++ b/build/win64/generate-MSVC-release.bat
@@ -3,4 +3,4 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
 mkdir VC2015
 cd VC2015
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DF2MC=1 -DBUILD_DFUSION=1 -DBUILD_STONESENSE=1 -DBUILD_SERVER=1
+cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1