#25 -- Merge branch 'win_installer' into master

Author: roman-modelist-dev

keychain_cmd_app/CMakeLists.txt

@@ -102,6 +102,15 @@ else()
 			PUBLIC "${CMAKE_SOURCE_DIR}/keychain_win/keychain_agent/include"
 		)
 		target_link_libraries(keychain keychain_common secmodlib keychain_agent fc_light eth-crypto ${LIB_OPENSSL} ${Boost_LIBRARIES} Crypt32.lib Userenv.lib Wtsapi32.lib)
+		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+			set(BUILD_TYPE_PATH Debug )
+		else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+			set(BUILD_TYPE_PATH Release )
+		endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+		add_custom_command(TARGET keychain 
+						   POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
+						   ${CMAKE_CURRENT_BINARY_DIR}/${BUILD_TYPE_PATH}/keychain.exe
+						   ../keychain_win/keychain_service/service_installer/wsserverinstaller/wsservice/keychain.exe)
 	else()
 		target_link_libraries(keychain keychain_common fc_light eth-crypto ${LIB_OPENSSL} ${Boost_LIBRARIES})
 		if(APPLE) 

keychain_lib/CMakeLists.txt

@@ -7,6 +7,7 @@ include( GetGitRevisionDescription )
 get_git_head_revision( GIT_REFSPEC KEYCHAIN_COMMON_GIT_REVISION )
 get_git_unix_timestamp(KEYCHAIN_COMMON_GIT_REVISION_UNIX_TIMESTAMP)
 git_describe(KEYCHAIN_COMMON_GIT_REVISION_DESCRIPTION --tags)
+
 configure_file("${CMAKE_SOURCE_DIR}/keychain_lib/src/git_revision.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp" @ONLY)
 
 set(CMAKE_CXX_FLAGS "-std=c++14")

keychain_win/keychain_gui/CMakeLists.txt

@@ -65,3 +65,15 @@ add_executable(keychain_win_gui ${KEYCHAIN_GUI_SOURCES} ${KEYCHAIN_GUI_INCLUDES}
 
 target_link_libraries(keychain_win_gui Crypt32.lib Qt5::Widgets Qt5::Core Qt5::Qml Qt5::Svg keychain_common secmodlib kaitai_struct_cpp_stl_runtime fc_light ${Boost_LIBRARIES} ${LIB_OPENSSL})
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	set(BUILD_TYPE_PATH Debug )
+	set(CMAKE_CXX_FLAGS "/EHsc")
+else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	set(BUILD_TYPE_PATH Release )
+endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+
+add_custom_command(TARGET keychain_win_gui 
+				   POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
+				   ${CMAKE_CURRENT_BINARY_DIR}/${BUILD_TYPE_PATH}/keychain_win_gui.exe
+				   ../keychain_service/service_installer/wsserverinstaller/wsservice/keychain_win_gui.exe)
+

keychain_win/keychain_service/CMakeLists.txt

@@ -1,5 +1,9 @@
 project( KeychainWinService  )
 
+
+add_subdirectory(./service_installer)
+add_subdirectory(./service_installer/wsserverinstaller)
+
 cmake_minimum_required( VERSION 3.0.2 )
 
 set(CMAKE_CXX_FLAGS "-std=c++11 /EHsc")

keychain_win/keychain_service/service_installer/CMakeLists.txt

@@ -0,0 +1,73 @@
+project( service_installer  )
+
+if(WIN32)
+
+	add_custom_target(deploy)
+	find_path(WIX_PATH candle.exe)
+
+	if(NOT WIX_PATH)
+		message(FATAL_ERROR "Unable to find WiX in the PATH. The WiX installer will be disabled.")
+	else(WIX_PATH)
+
+	set(wixsrcpath "${CMAKE_CURRENT_SOURCE_DIR}")
+	set(wixoutputpath "installer")
+	message(STATUS "wixsrcpath: ${wixsrcpath}")
+
+	#find libcrypto.dll file inside openssl installed folder
+	if("$ENV{OPENSSL_ROOT_DIR}" OR "${OPENSSL_ROOT_DIR}" STREQUAL "")
+		message(FATAL_ERROR "CANNOT FIND OPENSSL LIBRARY")
+	else()
+		set(openssl_path "${OPENSSL_ROOT_DIR}")
+		message(STATUS "OPENSSL PATH: ${openssl_path}")
+		file(GLOB_RECURSE globalcrypto FOLLOW_SYMLINKS ${OPENSSL_ROOT_DIR}/bin/libcrypto*.dll)
+		list(GET globalcrypto 0 cryptolib)
+		message(STATUS "FOUND LIBCRYPTO: ${cryptolib}")
+	endif()
+
+	#set copy files to alias
+	set( PREBUILD_FILES
+	   "${wixsrcpath}/wix_app_entry.wxs"
+	   "${wixsrcpath}/service_manager.bat"
+	   "${wixsrcpath}/delete_service.bat"
+	   "${wixsrcpath}/license.rtf"
+	   "${wixsrcpath}/keychain_banner.jpg"
+	   "${wixsrcpath}/keychain_logo_maximal.ico"
+	   "${wixsrcpath}/keychain_logo_minimal.ico"
+	   "${wixsrcpath}/keychain_dialog_banner.jpg"
+	   ${cryptolib}
+	)
+
+	message(STATUS "PREBUILD FILES: ${PREBUILD_FILES}")
+
+	#copy files in build folder
+	foreach( file_to_copy ${PREBUILD_FILES})
+		add_custom_command(TARGET deploy PRE_BUILD COMMAND ${CMAKE_COMMAND}
+		ARGS -E copy_if_different ${file_to_copy} "${wixoutputpath}")
+	endforeach( file_to_copy )
+
+	#TODO
+	#if keychain_common target will correctly build with clang-cl compiler
+	#after that all chain of target builds will work properly 
+	#and next commands can be placed here target binary copy files
+	#add_dependencies(deploy keychain_service_win keychain_pass_entry_app)
+	#add_custom_command(TARGET keychain_pass_entry_app POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/debug/keychain_pass_entry_app.exe ../service_installer/installer/keychain_pass_entry_app.exe)
+	#add_custom_command(TARGET keychain_service_win POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/debug/keychain_service_win.exe ${CMAKE_CURRENT_BINARY_DIR}/service_installer/installer/keychain_service_win.exe)
+
+	set(installerpath "${CMAKE_CURRENT_BINARY_DIR}/installer")
+
+	message(STATUS "Deploy Path: ${CMAKE_CURRENT_BINARY_DIR}")
+	message(STATUS "Deploy installer Path: ")
+	message(STATUS "WIX Path: ${WIX_PATH}")
+
+	#-bf - flag causes all of the files to be bound int the resulting .wixout/.* file. 
+	#-out - flag tells the linker where to output the .wixout/.* file
+	#-xo - this flag tells the linker to output an XML representation of the MSI, instead of the actual MSI,  required to use the -bf switch
+	
+	add_custom_command(TARGET deploy
+					   POST_BUILD
+		               COMMAND ${WIX_PATH}/candle.exe ${installerpath}/wix_app_entry.wxs -bf -xo -out ${installerpath}/wix_app_entry.wixobj
+		               COMMAND ${WIX_PATH}/light.exe -ext WixUIExtension ${installerpath}/wix_app_entry.wixobj -out ${installerpath}/${PROJECT_NAME}.msi
+					   VERBATIM)
+
+	endif()
+endif()

keychain_win/keychain_service/service_installer/delete_service.bat

@@ -0,0 +1,2 @@
+sc stop keychainservice
+sc delete keychainservice