Skip to content

Commit b01ccca

Browse files
committed
Bug#36379291 Add more information/attributes to the Windows EXE/DLL files
Added the attributes CompanyName ProductName LegalCopyright LegalTrademarks Change-Id: I79cb92b90aabc0ca1961559b0b62c36aa5c525ca
1 parent ab7d956 commit b01ccca

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

cmake/package_name.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,20 @@ STRING(TIMESTAMP MYSQL_COPYRIGHT_YEAR "%Y")
176176
IF(MSVC)
177177
GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
178178

179+
IF(WITH_NDB)
180+
SET(VINFO_PRODUCT_NAME "MySQL NDB Cluster")
181+
ELSE()
182+
SET(VINFO_PRODUCT_NAME "MySQL Server")
183+
ENDIF()
184+
185+
# Find the copyright line from the top README file
186+
FILE(STRINGS ${CMAKE_SOURCE_DIR}/README VINFO_COPYRIGHT_LINE
187+
ENCODING UTF-8 LIMIT_COUNT 1 REGEX "^Copyright")
188+
IF(NOT VINFO_COPYRIGHT_LINE)
189+
MESSAGE(FATAL_ERROR "Can't read copyright line from top README")
190+
ENDIF()
191+
MESSAGE(STATUS "Windows EXE/DLL file info copyright line: ${VINFO_COPYRIGHT_LINE}")
192+
179193
SET(FILETYPE VFT_APP)
180194
CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in
181195
${CMAKE_BINARY_DIR}/versioninfo_exe.rc)

cmake/versioninfo.rc.in

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// it under the terms of the GNU General Public License, version 2.0,
55
// as published by the Free Software Foundation.
66
//
7-
// This program is designed to work with certain software (including
8-
// but not limited to OpenSSL) that is licensed under separate terms,
9-
// as designated in a particular file or component or in included license
10-
// documentation. The authors of MySQL hereby grant you an additional
11-
// permission to link the program and your derivative works with the
12-
// separately licensed software that they have either included with
13-
// the program or referenced in the documentation.
14-
//
7+
// This program is designed to work with certain software (including
8+
// but not limited to OpenSSL) that is licensed under separate terms,
9+
// as designated in a particular file or component or in included license
10+
// documentation. The authors of MySQL hereby grant you an additional
11+
// permission to link the program and your derivative works with the
12+
// separately licensed software that they have either included with
13+
// the program or referenced in the documentation.
14+
//
1515
// This program is distributed in the hope that it will be useful,
1616
// but WITHOUT ANY WARRANTY; without even the implied warranty of
1717
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -35,8 +35,12 @@ BEGIN
3535
BEGIN
3636
BLOCK "040904E4"
3737
BEGIN
38+
VALUE "CompanyName", "Oracle Corporation\0"
39+
VALUE "ProductName", "@VINFO_PRODUCT_NAME@\0"
3840
VALUE "FileVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.0\0"
3941
VALUE "ProductVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.0\0"
42+
VALUE "LegalCopyright", "@VINFO_COPYRIGHT_LINE@\0"
43+
VALUE "LegalTrademarks", "Oracle(R), Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.\0"
4044
END
4145
END
4246
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)