Skip to content

Commit d9682c9

Browse files
sreedharssreedhars
committed
Fix to resolve build msi issue on cluster-7.4.7-release branch
1 parent c0646be commit d9682c9

File tree

6 files changed

+1183
-1183
lines changed

6 files changed

+1183
-1183
lines changed

‎packaging/WiX/CPackWixConfig.cmake‎

Lines changed: 161 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1,161 +1,161 @@
1-
# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
2-
#
3-
# This program is free software; you can redistribute it and/or modify
4-
# it under the terms of the GNU General Public License as published by
5-
# the Free Software Foundation; version 2 of the License.
6-
#
7-
# This program is distributed in the hope that it will be useful,
8-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10-
# GNU General Public License for more details.
11-
#
12-
# You should have received a copy of the GNU General Public License
13-
# along with this program; if not, write to the Free Software
14-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15-
16-
IF(ESSENTIALS)
17-
SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
18-
SET(CPACK_WIX_UI "WixUI_InstallDir")
19-
IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
20-
SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-winx64")
21-
ELSE()
22-
SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-win32")
23-
ENDIF()
24-
ELSE()
25-
SET(CPACK_COMPONENTS_USED
26-
"Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts")
27-
28-
IF("${VERSION}" MATCHES "-ndb-")
29-
MESSAGE(STATUS "This is Cluster build, append additional components")
30-
SET(CPACK_COMPONENTS_USED
31-
"${CPACK_COMPONENTS_USED};ClusterTools;ClusterDataNode;ClusterManagementServer;ClusterManagementClient;ClusterJ;nodejs")
32-
ENDIF()
33-
34-
35-
# Some components like Embedded are optional
36-
# We will build MSI without embedded if it was not selected for build
37-
#(need to modify CPACK_COMPONENTS_ALL for that)
38-
SET(CPACK_ALL)
39-
FOREACH(comp1 ${CPACK_COMPONENTS_USED})
40-
SET(found)
41-
FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
42-
IF(comp1 STREQUAL comp2)
43-
SET(found 1)
44-
BREAK()
45-
ENDIF()
46-
ENDFOREACH()
47-
IF(found)
48-
SET(CPACK_ALL ${CPACK_ALL} ${comp1})
49-
ENDIF()
50-
ENDFOREACH()
51-
SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
52-
53-
# Always install (hidden), includes Readme files
54-
SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
55-
SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
56-
57-
# Feature MySQL Server
58-
SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")
59-
SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
60-
SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
61-
# Subfeature "Server" (hidden)
62-
SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
63-
SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
64-
# Subfeature "Client"
65-
SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
66-
SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
67-
SET(CPACK_COMPONENT_CLIENT_DESCRIPTION
68-
"Various helpful (commandline) tools including the mysql command line client" )
69-
# Subfeature "Debug binaries"
70-
#SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
71-
#SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
72-
#SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION
73-
# "Debug/trace versions of executables and libraries" )
74-
#SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
75-
76-
77-
#Subfeature "Data Files"
78-
SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
79-
SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
80-
SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
81-
SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
82-
83-
84-
#Feature "Devel"
85-
SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
86-
SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
87-
#Subfeature "Development"
88-
SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
89-
SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
90-
91-
#Subfeature "Shared libraries"
92-
SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
93-
SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
94-
SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
95-
96-
#Subfeature "Embedded"
97-
SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
98-
SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
99-
SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
100-
SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
101-
102-
#Feature Debug Symbols
103-
SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
104-
SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
105-
SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
106-
SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
107-
SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
108-
109-
#Feature Documentation
110-
SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
111-
SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
112-
SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
113-
114-
#Feature tests
115-
SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
116-
SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
117-
SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
118-
119-
IF("${VERSION}" MATCHES "-ndb-")
120-
MESSAGE(STATUS "This is Cluster build, define additional components")
121-
122-
#Feature "Cluster"
123-
SET(CPACK_COMPONENT_GROUP_CLUSTER_DISPLAY_NAME "MySQL Cluster")
124-
SET(CPACK_COMPONENT_GROUP_CLUSTER_DESCRIPTION "Installs MySQL Cluster")
125-
126-
#Subfeature "ClusterTools"
127-
SET(CPACK_COMPONENT_CLUSTERTOOLS_GROUP "Cluster")
128-
SET(CPACK_COMPONENT_CLUSTERTOOLS_DISPLAY_NAME "Cluster Tools")
129-
SET(CPACK_COMPONENT_CLUSTERTOOLS_DESCRIPTION "Installs Cluster Tools")
130-
131-
#Subfeature "Cluster Storage Engines"
132-
SET(CPACK_COMPONENT_CLUSTERDATANODE_GROUP "Cluster")
133-
SET(CPACK_COMPONENT_CLUSTERDATANODE_DISPLAY_NAME "Cluster Storage Engines")
134-
SET(CPACK_COMPONENT_CLUSTERDATANODE_DESCRIPTION "Installs Cluster Storage Engines")
135-
136-
#Subfeature "Cluster Management Server"
137-
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_GROUP "Cluster")
138-
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_DISPLAY_NAME "Cluster Management Server")
139-
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_DESCRIPTION "Installs Cluster Management Server")
140-
141-
#Subfeature "Cluster Management Client"
142-
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_GROUP "Cluster")
143-
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_DISPLAY_NAME "Cluster Management Client")
144-
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_DESCRIPTION "Installs Cluster Management Client")
145-
146-
#Subfeature "ClusterJ"
147-
SET(CPACK_COMPONENT_CLUSTERJ_GROUP "Devel")
148-
SET(CPACK_COMPONENT_CLUSTERJ_DISPLAY_NAME "ClusterJ Java Connector for Cluster")
149-
SET(CPACK_COMPONENT_CLUSTERJ_DESCRIPTION "Installs ClusterJ")
150-
151-
#Subfeature "nodejs"
152-
SET(CPACK_COMPONENT_NODEJS_GROUP "Devel")
153-
SET(CPACK_COMPONENT_NODEJS_DISPLAY_NAME "nodejs Connector for Cluster")
154-
SET(CPACK_COMPONENT_NODEJS_DESCRIPTION "Installs nodejs connector")
155-
ENDIF()
156-
157-
#Feature Misc (hidden, installs only if everything is installed)
158-
SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
159-
SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
160-
SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
161-
SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
1+
# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
IF(ESSENTIALS)
17+
SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
18+
SET(CPACK_WIX_UI "WixUI_InstallDir")
19+
IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
20+
SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-winx64")
21+
ELSE()
22+
SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-win32")
23+
ENDIF()
24+
ELSE()
25+
SET(CPACK_COMPONENTS_USED
26+
"Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts")
27+
28+
IF("${VERSION}" MATCHES "-ndb-")
29+
MESSAGE(STATUS "This is Cluster build, append additional components")
30+
SET(CPACK_COMPONENTS_USED
31+
"${CPACK_COMPONENTS_USED};ClusterTools;ClusterDataNode;ClusterManagementServer;ClusterManagementClient;ClusterJ;nodejs")
32+
ENDIF()
33+
ENDIF()
34+
35+
# Some components like Embedded are optional
36+
# We will build MSI without embedded if it was not selected for build
37+
#(need to modify CPACK_COMPONENTS_ALL for that)
38+
SET(CPACK_ALL)
39+
FOREACH(comp1 ${CPACK_COMPONENTS_USED})
40+
SET(found)
41+
FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
42+
IF(comp1 STREQUAL comp2)
43+
SET(found 1)
44+
BREAK()
45+
ENDIF()
46+
ENDFOREACH()
47+
IF(found)
48+
SET(CPACK_ALL ${CPACK_ALL} ${comp1})
49+
ENDIF()
50+
ENDFOREACH()
51+
SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
52+
53+
# Always install (hidden), includes Readme files
54+
SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
55+
SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
56+
57+
# Feature MySQL Server
58+
SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")
59+
SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
60+
SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
61+
# Subfeature "Server" (hidden)
62+
SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
63+
SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
64+
# Subfeature "Client"
65+
SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
66+
SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
67+
SET(CPACK_COMPONENT_CLIENT_DESCRIPTION
68+
"Various helpful (commandline) tools including the mysql command line client" )
69+
# Subfeature "Debug binaries"
70+
#SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
71+
#SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
72+
#SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION
73+
# "Debug/trace versions of executables and libraries" )
74+
#SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
75+
76+
77+
#Subfeature "Data Files"
78+
SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
79+
SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
80+
SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
81+
SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
82+
83+
84+
#Feature "Devel"
85+
SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
86+
SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
87+
#Subfeature "Development"
88+
SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
89+
SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
90+
91+
#Subfeature "Shared libraries"
92+
SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
93+
SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
94+
SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
95+
96+
#Subfeature "Embedded"
97+
SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
98+
SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
99+
SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
100+
SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
101+
102+
#Feature Debug Symbols
103+
SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
104+
SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
105+
SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
106+
SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
107+
SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
108+
109+
#Feature Documentation
110+
SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
111+
SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
112+
SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
113+
114+
#Feature tests
115+
SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
116+
SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
117+
SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
118+
119+
IF("${VERSION}" MATCHES "-ndb-")
120+
MESSAGE(STATUS "This is Cluster build, define additional components")
121+
122+
#Feature "Cluster"
123+
SET(CPACK_COMPONENT_GROUP_CLUSTER_DISPLAY_NAME "MySQL Cluster")
124+
SET(CPACK_COMPONENT_GROUP_CLUSTER_DESCRIPTION "Installs MySQL Cluster")
125+
126+
#Subfeature "ClusterTools"
127+
SET(CPACK_COMPONENT_CLUSTERTOOLS_GROUP "Cluster")
128+
SET(CPACK_COMPONENT_CLUSTERTOOLS_DISPLAY_NAME "Cluster Tools")
129+
SET(CPACK_COMPONENT_CLUSTERTOOLS_DESCRIPTION "Installs Cluster Tools")
130+
131+
#Subfeature "Cluster Storage Engines"
132+
SET(CPACK_COMPONENT_CLUSTERDATANODE_GROUP "Cluster")
133+
SET(CPACK_COMPONENT_CLUSTERDATANODE_DISPLAY_NAME "Cluster Storage Engines")
134+
SET(CPACK_COMPONENT_CLUSTERDATANODE_DESCRIPTION "Installs Cluster Storage Engines")
135+
136+
#Subfeature "Cluster Management Server"
137+
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_GROUP "Cluster")
138+
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_DISPLAY_NAME "Cluster Management Server")
139+
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_DESCRIPTION "Installs Cluster Management Server")
140+
141+
#Subfeature "Cluster Management Client"
142+
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_GROUP "Cluster")
143+
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_DISPLAY_NAME "Cluster Management Client")
144+
SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_DESCRIPTION "Installs Cluster Management Client")
145+
146+
#Subfeature "ClusterJ"
147+
SET(CPACK_COMPONENT_CLUSTERJ_GROUP "Devel")
148+
SET(CPACK_COMPONENT_CLUSTERJ_DISPLAY_NAME "ClusterJ Java Connector for Cluster")
149+
SET(CPACK_COMPONENT_CLUSTERJ_DESCRIPTION "Installs ClusterJ")
150+
151+
#Subfeature "nodejs"
152+
SET(CPACK_COMPONENT_NODEJS_GROUP "Devel")
153+
SET(CPACK_COMPONENT_NODEJS_DISPLAY_NAME "nodejs Connector for Cluster")
154+
SET(CPACK_COMPONENT_NODEJS_DESCRIPTION "Installs nodejs connector")
155+
ENDIF()
156+
157+
#Feature Misc (hidden, installs only if everything is installed)
158+
SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
159+
SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
160+
SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
161+
SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")

0 commit comments

Comments
 (0)