From 601dc0430694f430512245e0e495678557b5ec0e Mon Sep 17 00:00:00 2001
From: Nils Schimmelmann <nschimme@gmail.com>
Date: Fri, 1 May 2015 21:19:20 -0700
Subject: [PATCH] Updating build for 2.3.4 release

---
 CMakeLists.txt     |  2 +-
 NEWS.txt           |  9 ++++++
 src/CMakeLists.txt | 71 ++++++++++++++++++----------------------------
 winbuild.bat       |  5 ++++
 4 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed3756cea..274f27f5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ else()
 endif()
 
 # Version
-set(VERSION "2.3.3")
+set(VERSION "2.3.4")
 add_definitions(-DMMAPPER_VERSION="${VERSION}" -DWITH_SPLASH)
 message(STATUS "MMapper version ${VERSION} (${CMAKE_BUILD_TYPE} distribution)")
 
diff --git a/NEWS.txt b/NEWS.txt
index 2d73d030e..36a269231 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,12 @@
+=============================
+MMapper 2.3.4 (May 1, 2015)
+=============================
+
+Changes:
+  - All connections now utilize TCP KeepAlive to help with dropped connections (nschimme)
+  - Prompts are now correctly identified and remembered for internal commands (nschimme)
+  - Cleaned up vote and Windows build code (nschimme)
+
 =============================
 MMapper 2.3.3 (January 18, 2015)
 =============================
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6a1cfdeb..1ae6db157 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -248,47 +248,32 @@ if (WIN32)
     )
 
     # Install Library Files
-    # Note: this is not necessary if Qt is compiled statically
-    get_target_property(QT_CORE_LIBRARY_DIR Qt5::Core LOCATION)
-    string(REPLACE "Qt5Core.dll" "" QT_LIBRARY_DIR ${QT_CORE_LIBRARY_DIR})
-    message(STATUS "Qt libraries are at ${QT_LIBRARY_DIR}")
-    install(FILES
-        "${QT_LIBRARY_DIR}/Qt5Core.dll"
-        "${QT_LIBRARY_DIR}/Qt5Gui.dll"
-	"${QT_LIBRARY_DIR}/Qt5Widgets.dll"
-        "${QT_LIBRARY_DIR}/Qt5Network.dll"
-        "${QT_LIBRARY_DIR}/Qt5Xml.dll"
-        "${QT_LIBRARY_DIR}/Qt5OpenGL.dll"
-        DESTINATION .
-	COMPONENT libraries
+    if (CMAKE_BUILD_TYPE STREQUAL "Release")
+            set(BINARY_ARGUMENT "-release")
+    else (CMAKE_BUILD_TYPE STREQUAL "Release")
+            set(BINARY_ARGUMENT "-debug")
+    endif (CMAKE_BUILD_TYPE STREQUAL "Release")
+    add_custom_command(
+            TARGET mmapper
+    POST_BUILD
+            COMMAND windeployqt ${BINARY_ARGUMENT} ${CMAKE_CURRENT_BINARY_DIR} -libdir ${CMAKE_CURRENT_BINARY_DIR}/lib --compiler-runtime
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Finding the Qt framework dependencies"
+    )
+    file(GLOB DEPENDENCIES ${CMAKE_CURRENT_BINARY_DIR}/lib/*)
+    foreach (dependency ${DEPENDENCIES})
+        install(FILES
+                ${dependency}
+                        DESTINATION .
+                        COMPONENT libraries
+        )
+    endforeach()
+    install(DIRECTORY
+            ${CMAKE_CURRENT_BINARY_DIR}/platforms
+                    DESTINATION .
+                    COMPONENT libraries
     )
-    if (MINGW)
-		if (CMAKE_BUILD_TYPE STREQUAL "Release")
-			set(BINARY_ARGUMENT "-release")
-		else (CMAKE_BUILD_TYPE STREQUAL "Release")
-			set(BINARY_ARGUMENT "-debug")
-		endif (CMAKE_BUILD_TYPE STREQUAL "Release")
-		add_custom_command(
-			TARGET mmapper
-		POST_BUILD
-			COMMAND windeployqt ${BINARY_ARGUMENT} ${CMAKE_CURRENT_BINARY_DIR} -libdir ${CMAKE_CURRENT_BINARY_DIR}/lib --compiler-runtime
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		COMMENT "Finding the Qt framework dependencies"
-		)
-		file(GLOB DEPENDENCIES ${CMAKE_CURRENT_BINARY_DIR}/lib/*)
-		foreach (dependency ${DEPENDENCIES})
-		install(FILES
-			${dependency}
-				DESTINATION .
-				COMPONENT libraries
-		)
-		endforeach()
-		install(DIRECTORY
-			${CMAKE_CURRENT_BINARY_DIR}/platforms
-				DESTINATION .
-				COMPONENT libraries
-		)
-		else (MINGW)
+    if (NOT MINGW)
 	# VC++ Redistributable
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/resources/win32/vcredist_x86.exe
@@ -296,7 +281,7 @@ if (WIN32)
 	        COMPONENT libraries
 	)
 	set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q:a'")
-    endif (MINGW)
+    endif (NOT MINGW)
 
     # Install Help Documentation
     install(FILES
@@ -325,7 +310,7 @@ endif (WIN32)
 
 # Apple Install Settings
 if (APPLE)
-    # Bundle the libraries with the binary (requires Qt 4.5)
+    # Bundle the libraries with the binary (requires Qt 5)
     add_custom_command(
         TARGET mmapper
 	POST_BUILD
@@ -385,7 +370,7 @@ else (GIT_BUILD)
 endif (GIT_BUILD)
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION_PATCH "4")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "MMapper")
 
 # Components:
diff --git a/winbuild.bat b/winbuild.bat
index 8965efbb8..18a89f4a6 100644
--- a/winbuild.bat
+++ b/winbuild.bat
@@ -1,4 +1,9 @@
 @ECHO OFF
+REM set PATH=C:\Qt\5.4\mingw491_32\bin;C:\Qt\Tools\mingw491_32\bin;C:\Program Files\7-Zip;C:\Program Files (x86)\NSIS;C:\Program Files (x86)\CMake\bin;C:\MinGW\bin
+REM set ZLIB_LIBRARY=C:\Qt\Tools\mingw491_32\bin\libz.a
+REM set ZLIB_INCLUDE_DIR=C:\Qt\Tools\mingw491_32\include
+REM set QMAKESPEC=win32-g++
+
 REM ####
 REM #### START
 REM ####