Tera TermRevision: 8332
https://osdn.net/projects/ttssh2/scm/svn/commits/8332
Author: zmatsuo
Date: 2019-10-26 14:28:45 +0900 (Sat, 26 Oct 2019)
Log Message:
-----------
cmakeビルドで OpenSSL 1.1.1dのライブラリをビルド
- パッチは未適応
- libs/openssl_patch/
- ttxssh で crypt32.lib をリンク
Modified Paths:
--------------
trunk/libs/buildall.cmake
trunk/libs/lib_openssl.cmake
trunk/ttssh2/ttxssh/CMakeLists.txt
Added Paths:
-----------
trunk/libs/openssl11.cmake
-------------- next part --------------
Modified: trunk/libs/buildall.cmake
===================================================================
--- trunk/libs/buildall.cmake 2019-10-25 15:01:20 UTC (rev 8331)
+++ trunk/libs/buildall.cmake 2019-10-26 05:28:45 UTC (rev 8332)
@@ -35,8 +35,8 @@
execute_process(
COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P SFMT.cmake
)
-message("openssl")
+message("openssl 1.1")
execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P openssl.cmake
+ COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P openssl11.cmake
)
message("done buildall.cmake")
Modified: trunk/libs/lib_openssl.cmake
===================================================================
--- trunk/libs/lib_openssl.cmake 2019-10-25 15:01:20 UTC (rev 8331)
+++ trunk/libs/lib_openssl.cmake 2019-10-26 05:28:45 UTC (rev 8332)
@@ -1,7 +1,7 @@
include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
-set(OPENSSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET})
+set(OPENSSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/openssl11_${TOOLSET})
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(OPENSSL_ROOT "${OPENSSL_ROOT}_x64")
endif()
@@ -21,7 +21,7 @@
)
set(OPENSSL_LIB
- debug ${OPENSSL_ROOT}_debug/lib/libeay32.lib
- optimized ${OPENSSL_ROOT}/lib/libeay32.lib
+ debug ${OPENSSL_ROOT}_debug/lib/libcrypto.lib
+ optimized ${OPENSSL_ROOT}/lib/libcrypto.lib
)
endif()
Added: trunk/libs/openssl11.cmake
===================================================================
--- trunk/libs/openssl11.cmake (rev 0)
+++ trunk/libs/openssl11.cmake 2019-10-26 05:28:45 UTC (rev 8332)
@@ -0,0 +1,335 @@
+# for OpenSSL 1.1.1
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P openssl11.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P openssl11.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P openssl11.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+ # multi-configuration
+ execute_process(
+ COMMAND ${CMAKE_COMMAND}
+ -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+ -DCMAKE_CONFIGURATION_TYPE=Release
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+ -DARCHITECTURE=${ARCHITECTURE}
+ -P openssl11.cmake
+ )
+ execute_process(
+ COMMAND ${CMAKE_COMMAND}
+ -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+ -DCMAKE_CONFIGURATION_TYPE=Debug
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+ -DARCHITECTURE=${ARCHITECTURE}
+ -P openssl11.cmake
+ )
+ return()
+ elseif("$ENV{MSYSTEM}" MATCHES "MINGW32")
+ # mingw on msys2
+ # single-configuration
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+ set(CMAKE_BUILD_TYPE Release)
+ endif()
+ elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+ # mingw
+ # single-configuration
+ if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+ endif()
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+ set(CMAKE_BUILD_TYPE Release)
+ endif()
+ elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+ # VS nmake
+ # single-configuration
+ if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+ endif()
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+ set(CMAKE_BUILD_TYPE Release)
+ endif()
+ else()
+ # single-configuration
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+ set(CMAKE_BUILD_TYPE Release)
+ endif()
+ endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "openssl-1.1.1d")
+set(SRC_ARC "openssl-1.1.1d.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-1.1.1d.tar.gz")
+set(SRC_ARC_HASH_SHA256 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
+
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl11/src_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl11_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64"))
+ set(EXTRACT_DIR "${EXTRACT_DIR}_x64")
+ set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Debug"))
+ set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
+ set(INSTALL_DIR "${INSTALL_DIR}_debug")
+endif()
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+
+########################################
+
+file(DOWNLOAD
+ ${SRC_URL}
+ ${DOWN_DIR}/${SRC_ARC}
+ EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+ SHOW_PROGRESS
+ )
+
+########################################
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+ find_program(
+ PERL perl
+ )
+elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+ # Active/Strawberry Perl (cygwin版は使えない)
+ find_program(
+ PERL perl.exe
+ HINTS c:/Perl64/bin
+ HINTS c:/Perl/bin
+ HINTS C:/Strawberry/perl/bin
+# HINTS c:/cygwin/usr/bin
+# HINTS c:/cygwin64/usr/bin
+ )
+else()
+ # MinGW
+ find_program(
+ PERL perl
+ HINTS C:/msys64/usr/bin
+ )
+endif()
+
+if(${PERL} STREQUAL "PERL-NOTFOUND")
+ message(FATAL_ERROR "perl not found")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${EXTRACT_DIR}
+ )
+
+endif()
+
+########################################
+
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") OR
+ (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
+ ######################################## VS
+ if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+ find_program(
+ VCVARS32 vcvarsall.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+ find_program(
+ VCVARS32 vcvarsall.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
+ )
+ else()
+ message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
+ endif()
+ if(VCVARS32-NOTFOUND OR (${VCVARS32} STREQUAL "VCVARS32-NOTFOUND"))
+ message(FATAL_ERROR "vcvars32.bat not found")
+ endif()
+
+ if((${CMAKE_GENERATOR} MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64"))
+ set(CONFIG_TARGET "VC-WIN64A")
+ set(DO_MS "ms\\do_win64a.bat")
+ else()
+ set(CONFIG_TARGET "VC-WIN32")
+ set(DO_MS "ms\\do_ms.bat")
+ endif()
+ if(("${CMAKE_BUILD_TYPE}" STREQUAL "Release") OR ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Release"))
+ else()
+ set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
+ endif()
+
+ file(WRITE "${SRC_DIR}/build_cmake.bat"
+ "cd /d %~dp0\n"
+ "setlocal\n"
+ )
+ file(TO_NATIVE_PATH ${PERL} PERL_N)
+ file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+ file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
+ string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "set PATH=${PERL_N_PATH};%PATH%\n"
+ )
+ if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+ ## Visual Studio 2005 特別処理
+ # include,libパスの設定
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+ "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+ "set LIB=%SDK%\\lib;%LIB%\n"
+ )
+ endif()
+ if(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+ if("${ARCHITECTURE}" MATCHES "x64")
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32_N}\" amd64\n"
+ )
+ else()
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32_N}\" x86\n"
+ )
+ endif()
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32_N}\" amd64\n"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32_N}\" x86\n"
+ )
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32_N}\"\n"
+ )
+ endif()
+ # jomでビルドの高速化を試したが次のエラーが出てしまう
+ # 複数の CL.EXE が同じ .PDB ファイルに書き込む場合、/FS を使用してください。
+ # if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/jom/nmake.exe")
+ # file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CMAKE_CURRENT_SOURCE_DIR_N)
+ # file(APPEND "${SRC_DIR}/build_cmake.bat"
+ # "set PATH=${CMAKE_CURRENT_SOURCE_DIR_N}\\jom;%PATH%\n"
+ # )
+ # endif()
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "set PATH=%PATH%;${PERL_N_PATH}\n"
+ "perl Configure no-asm no-async no-shared ${CONFIG_TARGET} --prefix=${INSTALL_DIR_N} --openssldir=${INSTALL_DIR_N}\\SSL\n"
+ "nmake -f makefile install\n"
+ )
+ set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+ file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+ execute_process(
+ COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+ WORKING_DIRECTORY ${SRC_DIR}
+ RESULT_VARIABLE rv
+ )
+ if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+ endif()
+else()
+ ######################################## MinGW
+ execute_process(
+ COMMAND "uname" -s
+ OUTPUT_VARIABLE ov)
+ string(REGEX MATCH "[A-Za-z0-9]+" UNAME_S ${ov})
+ if("${UNAME_S}" STREQUAL "CYGWIN")
+ find_program(
+ MAKE make.exe
+ HINTS c:/cygwin/usr/bin
+ HINTS c:/cygwin64/usr/bin
+ )
+ elseif(("${UNAME_S}" STREQUAL "MINGW32") OR ("${UNAME_S}" STREQUAL "MINGW64"))
+ find_program(
+ MAKE make
+ )
+ elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+ find_program(
+ MAKE make
+ )
+ else()
+ message(FATAL_ERROR "unsported")
+ endif()
+ set(ENV{PATH} "/usr/bin;/bin")
+ if("${UNAME_S}" STREQUAL "MINGW32")
+ set(CMAKE_C_COMPILER "cc")
+ set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin")
+ elseif("${UNAME_S}" STREQUAL "MINGW64")
+ set(CMAKE_C_COMPILER "cc")
+ set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin")
+ else()
+ include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
+ set(ENV{PREFIX} i686-w64-mingw32)
+ set(ENV{CC} ${CMAKE_C_COMPILER})
+ set(ENV{AR} "i686-w64-mingw32-ar")
+ set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
+ set(PATH "/usr/bin:/bin")
+ endif()
+ if("${UNAME_S}" STREQUAL "MINGW64")
+ set(CONFIG_NAME "mingw64")
+ else()
+ set(CONFIG_NAME "mingw")
+ endif()
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure no-async no-shared ${CONFIG_NAME} --prefix=${INSTALL_DIR} --openssldir=${INSTALL_DIR_N}/SSL
+ WORKING_DIRECTORY ${SRC_DIR}
+ RESULT_VARIABLE rv
+ )
+ if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake configure fail ${rv}")
+ endif()
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER}
+ WORKING_DIRECTORY ${SRC_DIR}
+ RESULT_VARIABLE rv
+ )
+ if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+ endif()
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install
+ WORKING_DIRECTORY ${SRC_DIR}
+ RESULT_VARIABLE rv
+ )
+ if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+ endif()
+endif()
+
Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt 2019-10-25 15:01:20 UTC (rev 8331)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt 2019-10-26 05:28:45 UTC (rev 8332)
@@ -149,6 +149,8 @@
gdi32
comdlg32
delayimp
+ # OpenSSL が使用
+ crypt32.lib # TODO このlibを使用しないパッチを適応したら削除すること
)
### create puttyversion.h