Skip to content

Commit 1cdbc87

Browse files
Tor Didriksenrafalmol-mysql
authored andcommitted
Bug #33972316 Server 8.0 MSI is missing INFO_BIN and INFO_SRC
Port the patch from packaging/WiX/CMakeLists.txt to storage/ndb/wix/CMakeLists.txt Change-Id: I48372d0bdadecb29aa3f66d1565d354f4bc0b6ab (cherry picked from commit c686ab5a17591b4d6644f7eebbe7d327f2b4b844) (cherry picked from commit 2f7165e07732959e45902475b415770f992a4d91) (cherry picked from commit 1a981fbf9de63a82ac2057445a871b0c48339287)
1 parent 452756a commit 1cdbc87

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

storage/ndb/wix/CMakeLists.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2013, 2022, Oracle and/or its affiliates.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0,
@@ -150,3 +150,20 @@ ELSE(WIX_DONT_SET_CPACK_MONOLITHIC_INSTALL)
150150
VERBATIM)
151151
ENDIF(WIX_DONT_SET_CPACK_MONOLITHIC_INSTALL)
152152
ADD_DEPENDENCIES(NDB_MSI configure_mysql_server_extra)
153+
154+
# The 'dist' target will create Docs/INFO_SRC, and our top level cmake file does:
155+
# INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
156+
# We install only the copy in ${CMAKE_BINARY_DIR}/Docs/INFO_SRC
157+
# There is a similar target in packaging/WiX/CMakeLists.txt
158+
# but we have not seen that yet when processing this file.
159+
IF(DEFINED ENV{PB2WORKDIR})
160+
IF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
161+
ADD_CUSTOM_TARGET(ndb_remove_INFO_SRC_from_bs
162+
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC
163+
)
164+
ENDIF()
165+
ENDIF()
166+
167+
IF(TARGET ndb_remove_INFO_SRC_from_bs)
168+
ADD_DEPENDENCIES(NDB_MSI ndb_remove_INFO_SRC_from_bs)
169+
ENDIF()

0 commit comments

Comments
 (0)