Updating libssh2 to v1.7.0 and allowing libssh2 packaging (dependencies)

Author: Michael Fero

vc_build.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM Copyright 2014-2015 DataStax
+REM Copyright 2014-2016 DataStax
 REM
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
@@ -114,7 +114,8 @@ SET LIBUV_PACKAGE_VERSION=1.8.0
 SET GYP_REPOSITORY_URL=https://chromium.googlesource.com/external/gyp.git
 SET LIBSSH2_REPOSITORY_URL=https://github.com/libssh2/libssh2.git
 SET LIBSSH2_DIRECTORY=libssh2
-SET LIBSSH2_BRANCH_TAG_VERSION=master
+SET LIBSSH2_BRANCH_TAG_VERSION=libssh2-1.7.0
+SET LIBSSH2_PACKAGE_VERSION=1.7.0
 SET OPENSSL_REPOSITORY_URL=https://github.com/openssl/openssl.git
 SET OPENSSL_DIRECTORY=openssl
 SET OPENSSL_BRANCH_TAG_VERSION=OpenSSL_1_0_2f
@@ -646,10 +647,13 @@ IF "!ENABLE_BUILD_PACKAGES!" == "!FALSE!" (
 	SET ENABLE_TESTS=!FALSE!
 	SET ENABLE_INTEGRATION_TESTS=!FALSE!
 	SET ENABLE_UNIT_TESTS=!FALSE!
-	SET ENABLE_LIBSSH2=!FALSE!
 	SET ENABLE_ZLIB=!FALSE!
 	SET GENERATE_SOLUTION=!FALSE!
-	IF !BUILD_DEPENDENCIES_ONLY! EQU !FALSE! SET USE_BOOST_ATOMIC=!TRUE!
+	IF !BUILD_DEPENDENCIES_ONLY! EQU !FALSE! (
+		SET USE_BOOST_ATOMIC=!TRUE!
+		SET ENABLE_LIBSSH2=!FALSE!
+	)
+
 
 	REM Add common 7-zip locations to system path
 	SET "PATH=!PATH!;!PROGRAMFILES!\7-zip;!PROGRAMFILES(X86)!\7-zip"
@@ -830,7 +834,7 @@ IF "!ENABLE_BUILD_PACKAGES!" == "!FALSE!" (
 	IF !ENABLE_LIBSSH2! EQU !TRUE! (
 		REM Determine if libssh2 needs to be built
 		IF NOT EXIST "!ABSOLUTE_LIBSSH2_LIBRARY_DIRECTORY!" (
-			CALL :BUILDLIBSSH2 "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBSSH2_DIRECTORY!" "!ABSOLUTE_LIBSSH2_LIBRARY_DIRECTORY!" "!ABSOLUTE_OPENSSL_LIBRARY_DIRECTORY!" "!ABSOLUTE_ZLIB_LIBRARY_DIRECTORY!" !TARGET_ARCHITECTURE! !VISUAL_STUDIO_INTERNAL_SHORTHAND_VERSION! "!LOG_LIBSSH2_BUILD!"
+			CALL :BUILDLIBSSH2 "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBSSH2_DIRECTORY!" "!ABSOLUTE_LIBSSH2_LIBRARY_DIRECTORY!" "!ABSOLUTE_OPENSSL_LIBRARY_DIRECTORY!" "!ABSOLUTE_ZLIB_LIBRARY_DIRECTORY!" !TARGET_ARCHITECTURE! !VISUAL_STUDIO_INTERNAL_SHORTHAND_VERSION! !FALSE! "!LOG_LIBSSH2_BUILD!"
 			IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 		)
 	) ELSE (
@@ -954,6 +958,16 @@ IF "!ENABLE_BUILD_PACKAGES!" == "!FALSE!" (
 					IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 				)
 
+				REM Build libssh2 (static) as well for dependency only builds
+				IF !ENABLE_LIBSSH2! EQU !TRUE! (
+					IF "%%D" == "!LIBRARY_TYPE_STATIC!" (
+						SET DEPENDENCY_PACKAGE_LIBSSH2_INSTALLATION_DIRECTORY=!DEPENDENCY_PACKAGE_INSTALLATION_DIRECTORY!\!LIBSSH2_DIRECTORY!
+						SET "ABSOLUTE_DEPENDENCY_PACKAGE_LIBSSH2_INSTALLATION_DIRECTORY=!ABSOLUTE_PACKAGES_DIRECTORY!\!DEPENDENCY_PACKAGE_LIBSSH2_INSTALLATION_DIRECTORY!"
+						CALL :BUILDLIBSSH2 "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBSSH2_DIRECTORY!" "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBSSH2_INSTALLATION_DIRECTORY!" "!ABSOLUTE_DEPENDENCY_PACKAGE_OPENSSL_INSTALLATION_DIRECTORY!" "" %%C !VISUAL_STUDIO_INTERNAL_SHORTHAND_VERSION! !TRUE! "!LOG_LIBSSH2_BUILD!"
+						IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
+					)
+				)
+
 				REM Clean-up the dependency packages
 				IF NOT EXIST "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBUV_INSTALLATION_DIRECTORY!\..\!LIBRARY_INCLUDE_DIRECTORY!" MOVE /Y "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBUV_INSTALLATION_DIRECTORY!\!LIBRARY_INCLUDE_DIRECTORY!" "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBUV_INSTALLATION_DIRECTORY!\..\!LIBRARY_INCLUDE_DIRECTORY!" >> "!LOG_PACKAGE_BUILD!" 2>&1
 				IF EXIST "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBUV_INSTALLATION_DIRECTORY!\!LIBRARY_INCLUDE_DIRECTORY!" RMDIR /S /Q "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBUV_INSTALLATION_DIRECTORY!\!LIBRARY_INCLUDE_DIRECTORY!" >> "!LOG_PACKAGE_BUILD!" 2>&1
@@ -973,7 +987,7 @@ IF "!ENABLE_BUILD_PACKAGES!" == "!FALSE!" (
 
 				REM Skip a line on the display
 				ECHO.
-			)			
+			)
 
 			REM Build the zip packages for the current target architecture and Visual Studio version
 			IF !BUILD_DEPENDENCIES_ONLY! EQU !FALSE! (
@@ -1005,6 +1019,17 @@ IF "!ENABLE_BUILD_PACKAGES!" == "!FALSE!" (
 				EXIT /B !EXIT_CODE_PACKAGE_FAILED!
 			)
 			ECHO done.
+			IF !ENABLE_LIBSSH2! EQU !TRUE! (
+				ECHO | SET /P=Building the libssh2 package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ... 
+				ECHO !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\libssh2-!LIBSSH2_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r !ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!LIBSSH2_DIRECTORY!\ >> "!LOG_PACKAGE_BUILD!"
+				!ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\libssh2-!LIBSSH2_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r "!ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!LIBSSH2_DIRECTORY!\*" >> "!LOG_PACKAGE_BUILD!" 2>&1
+				IF NOT !ERRORLEVEL! EQU 0 (
+					ECHO FAILED!
+					ECHO 	See !LOG_PACKAGE_BUILD! for more details
+					EXIT /B !EXIT_CODE_PACKAGE_FAILED!
+				)
+				ECHO done.
+			)
 			ECHO.
 
 			REM Reset the system PATH
@@ -1482,8 +1507,10 @@ REM                               indicates zlib disabled
 REM @param target-architecture 32 or 64-bit
 REM @param visual-studio-version Shortened Visual Studio version; empty
 REM                              string indicates Windows SDK build
+REM @param is-clean-after-install True if clean should be performed after
+REM                               install; false otherwise
 REM @param log-filename Absolute path and filename for log output
-:BUILDLIBSSH2 [source-directory] [install-directory] [openssl-library-directory] [zlib-library-directory] [target-architecture] [visual-studio-version] [log-filename]
+:BUILDLIBSSH2 [source-directory] [install-directory] [openssl-library-directory] [zlib-library-directory] [target-architecture] [visual-studio-version] [is-clean-after-install] [log-filename]
 	REM Create library variables from arguments
 	SET "LIBSSH2_SOURCE_DIRECTORY=%~1"
 	SHIFT
@@ -1497,6 +1524,8 @@ REM @param log-filename Absolute path and filename for log output
 	SHIFT
 	SET "LIBSSH2_VISUAL_STUDIO_VERSION=%~1"
 	SHIFT
+	SET LIBSSH2_IS_CLEAN_AFTER_INSTALL=%~1
+	SHIFT
 	SET "LIBSSH2_LOG_FILENAME=%~1"
 
 	REM Build libssh2 dependency
@@ -1538,6 +1567,11 @@ REM @param log-filename Absolute path and filename for log output
 		EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
 	)
 	ECHO done.
+	IF !LIBSSH2_IS_CLEAN_AFTER_INSTALL! EQU !TRUE! (
+		ECHO | SET /P=Cleaning libssh2 build ... 
+		DEL /S /Q * >> "!LIBSSH2_LOG_FILENAME!" 2>&1
+		ECHO done.
+	)
 	POPD
 	EXIT /B
 
@@ -1651,7 +1685,17 @@ REM @param log-filename Absolute path and filename for log output
 	IF !DRIVER_BUILD_TESTS! EQU !TRUE! SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DCASS_BUILD_TESTS=ON"
 	IF !DRIVER_BUILD_INTEGRATION_TESTS! EQU !TRUE! SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DCASS_BUILD_INTEGRATION_TESTS=ON"
 	IF !DRIVER_BUILD_UNIT_TESTS! EQU !TRUE! SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DCASS_BUILD_UNIT_TESTS=ON"
-	IF NOT "!TESTS_BOOST_LIBRARY_DIRECTORY!" == "" SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DBOOST_ROOT_DIR=^"!TESTS_BOOST_LIBRARY_DIRECTORY!^""
+	IF NOT "!TESTS_BOOST_LIBRARY_DIRECTORY!" == "" (
+		REM Determine if using Boost distributed or include/lib binaries
+		SET "BOOST_DISTRIBUTION_ROOT_DIRECTORY=!TESTS_BOOST_LIBRARY_DIRECTORY!"
+		SET "BOOST_DISTRIBUTION_INCLUDE_DIRECTORY=!BOOST_DISTRIBUTION_ROOT_DIRECTORY!"
+		SET "BOOST_DISTRIBUTION_LIBRARY_DIRECTORY=!BOOST_DISTRIBUTION_ROOT_DIRECTORY!\lib!DRIVER_TARGET_ARCHITECTURE!-msvc-!DRIVER_VISUAL_STUDIO_VERSION!.0"
+		IF NOT EXIST "!BOOST_DISTRIBUTION_LIBRARY_DIRECTORY!" (
+			SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DBOOST_ROOT_DIR=^"!TESTS_BOOST_LIBRARY_DIRECTORY!^""
+		) ELSE (
+			SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DBOOST_ROOT=^"!BOOST_DISTRIBUTION_ROOT_DIRECTORY!^" -DBOOST_INCLUDEDIR=^"!BOOST_DISTRIBUTION_INCLUDE_DIRECTORY!^" -DBOOST_LIBRARYDIR=^"!BOOST_DISTRIBUTION_LIBRARY_DIRECTORY!^""
+		)
+	)
 	IF NOT "!TESTS_LIBSSH2_LIBRARY_DIRECTORY!" == "" (
 		SET "DRIVER_CMAKE_COMMAND_LINE=!DRIVER_CMAKE_COMMAND_LINE! -DCASS_USE_LIBSSH2=ON -DLIBSSH2_ROOT_DIR=^"!TESTS_LIBSSH2_LIBRARY_DIRECTORY!^""
 	) ELSE (