summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2017-11-09 08:36:59 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2017-11-09 08:36:59 +0100
commit0ee067229c784df83c8e1d85b232b6252c323b82 (patch)
treed0b218cbb4712102b0294d10c05ae4a2bd472b23
parent79c0c202da5414abbbe4a0342c289e384c055b88 (diff)
downloadmariadb-git-0ee067229c784df83c8e1d85b232b6252c323b82.tar.gz
Bug#26022865 BUILD FOR WINDOWS-S12-64BIT,ADVANCED IS FAILING ON PB2 MYSQL-5.6
Remove cmake code for signing executables. Automatic signing has always failed anyways. It should be done manually as part of the release process.
-rw-r--r--cmake/build_configurations/mysql_release.cmake7
-rw-r--r--cmake/install_macros.cmake60
2 files changed, 1 insertions, 66 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 7d54e2aec77..58808943124 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -100,13 +100,6 @@ IF(NOT COMPILATION_COMMENT)
SET(COMPILATION_COMMENT "MySQL Community Server (GPL)")
ENDIF()
-IF(WIN32)
- IF(NOT CMAKE_USING_VC_FREE_TOOLS)
- # Sign executables with authenticode certificate
- SET(SIGNCODE 1 CACHE BOOL "")
- ENDIF()
-ENDIF()
-
IF(UNIX)
SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index be243a42924..5475dbe2686 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -151,60 +151,6 @@ IF(UNIX)
ENDIF()
ENDMACRO()
-IF(WIN32)
- OPTION(SIGNCODE "Sign executables and dlls with digital certificate" OFF)
- MARK_AS_ADVANCED(SIGNCODE)
- IF(SIGNCODE)
- SET(SIGNTOOL_PARAMETERS
- /a /t http://timestamp.verisign.com/scripts/timstamp.dll
- CACHE STRING "parameters for signtool (list)")
- FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool)
- IF(NOT SIGNTOOL_EXECUTABLE)
- MESSAGE(FATAL_ERROR
- "signtool is not found. Signing executables not possible")
- ENDIF()
- IF(NOT DEFINED SIGNCODE_ENABLED)
- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/testsign.c "int main(){return 0;}")
- MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/testsign)
- TRY_COMPILE(RESULT ${CMAKE_CURRENT_BINARY_DIR}/testsign ${CMAKE_CURRENT_BINARY_DIR}/testsign.c
- COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/testsign.exe
- )
-
- EXECUTE_PROCESS(COMMAND
- ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS} ${CMAKE_CURRENT_BINARY_DIR}/testsign.exe
- RESULT_VARIABLE ERR ERROR_QUIET OUTPUT_QUIET
- )
- IF(ERR EQUAL 0)
- SET(SIGNCODE_ENABLED 1 CACHE INTERNAL "Can sign executables")
- ELSE()
- MESSAGE(STATUS "Disable authenticode signing for executables")
- SET(SIGNCODE_ENABLED 0 CACHE INTERNAL "Invalid or missing certificate")
- ENDIF()
- ENDIF()
- MARK_AS_ADVANCED(SIGNTOOL_EXECUTABLE SIGNTOOL_PARAMETERS)
- ENDIF()
-ENDIF()
-
-MACRO(SIGN_TARGET target)
- GET_TARGET_PROPERTY(target_type ${target} TYPE)
- IF(target_type AND NOT target_type MATCHES "STATIC")
- GET_TARGET_PROPERTY(target_location ${target} LOCATION)
- IF(CMAKE_GENERATOR MATCHES "Visual Studio")
- STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
- target_location ${target_location})
- ENDIF()
- INSTALL(CODE
- "EXECUTE_PROCESS(COMMAND
- ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS} ${target_location}
- RESULT_VARIABLE ERR)
- IF(NOT \${ERR} EQUAL 0)
- MESSAGE(FATAL_ERROR \"Error signing ${target_location}\")
- ENDIF()
- ")
- ENDIF()
-ENDMACRO()
-
-
# Installs targets, also installs pdbs on Windows.
#
#
@@ -225,10 +171,6 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
FOREACH(target ${TARGETS})
- # If signing is required, sign executables before installing
- IF(SIGNCODE AND SIGNCODE_ENABLED)
- SIGN_TARGET(${target})
- ENDIF()
# Install man pages on Unix
IF(UNIX)
GET_TARGET_PROPERTY(target_location ${target} LOCATION)