From: Bjorn Munch Date: January 25 2012 2:38pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3771 to 3772) List-Archive: http://lists.mysql.com/commits/142550 Message-Id: <201201251438.q0PEcvFb026493@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3772 Bjorn Munch 2012-01-25 Tentative addition of ndb binaries to Windows MSI Removing embedded clients mysqltest and mysql_client_test from Solaris pkg's modified: libmysqld/examples/CMakeLists.txt packaging/WiX/CPackWixConfig.cmake 3771 Bjorn Munch 2012-01-19 Re-enable embedded in spec file modified: support-files/mysql.spec.sh === modified file 'libmysqld/examples/CMakeLists.txt' --- a/libmysqld/examples/CMakeLists.txt 2011-10-05 08:56:12 +0000 +++ b/libmysqld/examples/CMakeLists.txt 2012-01-25 14:37:12 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2012, 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 @@ -31,30 +31,39 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY}) ENDIF(UNIX) -MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc) -TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver) +# +# The clients with embedded server are big, and at present may cause +# the Solaris SVR4 packages to be too big (>2GB) for the packaging tools +# to handle. So, for now, we just disable it for those builds. +# +IF(NOT INSTALL_LAYOUT MATCHES "SVR4") + MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc) + TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver) -IF(CMAKE_GENERATOR MATCHES "Xcode") + IF(CMAKE_GENERATOR MATCHES "Xcode") # It does not seem possible to tell Xcode the resulting target might need # to be linked with C++ runtime. The project needs to have at least one C++ # file. Add a dummy one. - ADD_CUSTOM_COMMAND(OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc - COMMAND ${CMAKE_COMMAND} -E touch - ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc - ) - MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded - ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc - ../../tests/mysql_client_test.c) -ELSE() - MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c) - SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES HAS_CXX TRUE) + ADD_CUSTOM_COMMAND(OUTPUT + ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc + COMMAND ${CMAKE_COMMAND} -E touch + ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc + ) + MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded + ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc + ../../tests/mysql_client_test.c) + ELSE() + MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c) + SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES HAS_CXX TRUE) + ENDIF() + TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver) ENDIF() -TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver) IF(UNIX) -SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE) -SET_TARGET_PROPERTIES(mysqltest_embedded PROPERTIES ENABLE_EXPORTS TRUE) -SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES ENABLE_EXPORTS TRUE) + SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE) + IF(NOT INSTALL_LAYOUT MATCHES "SVR4") + SET_TARGET_PROPERTIES(mysqltest_embedded PROPERTIES ENABLE_EXPORTS TRUE) + SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES ENABLE_EXPORTS TRUE) + ENDIF() ENDIF() === modified file 'packaging/WiX/CPackWixConfig.cmake' --- a/packaging/WiX/CPackWixConfig.cmake 2011-06-30 15:46:53 +0000 +++ b/packaging/WiX/CPackWixConfig.cmake 2012-01-25 14:37:12 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, 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 @@ -23,7 +23,7 @@ IF(ESSENTIALS) ENDIF() ELSE() SET(CPACK_COMPONENTS_USED - "Server;Client;DataFiles;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries") + "Server;Client;DataFiles;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries;ClusterTools;ClusterDataNode;ClusterManagementServer;ClusterManagementClient") ENDIF() @@ -111,6 +111,29 @@ SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "T SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)") SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2) +#Feature "Cluster" +SET(CPACK_COMPONENT_GROUP_CLUSTER_DISPLAY_NAME "MySQL Cluster") +SET(CPACK_COMPONENT_GROUP_CLUSTER_DESCRIPTION "Installs MySQL Cluster") + + #Subfeature "ClusterTools" + SET(CPACK_COMPONENT_CLUSTERTOOLS_GROUP "Cluster") + SET(CPACK_COMPONENT_CLUSTERTOOLS_DISPLAY_NAME "Cluster Tools") + SET(CPACK_COMPONENT_CLUSTERTOOLS_DESCRIPTION "Installs Cluster Tools") + + #Subfeature "Cluster Storage Engines" + SET(CPACK_COMPONENT_CLUSTERDATANODE_GROUP "Cluster") + SET(CPACK_COMPONENT_CLUSTERDATANODE_DISPLAY_NAME "Cluster Storage Engines") + SET(CPACK_COMPONENT_CLUSTERDATANODE_DESCRIPTION "Installs Cluster Storage Engines") + + #Subfeature "Cluster Management Server" + SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_GROUP "Cluster") + SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_DISPLAY_NAME "Cluster Management Server") + SET(CPACK_COMPONENT_CLUSTERMANAGEMENTSERVER_DESCRIPTION "Installs Cluster Management Server") + + #Subfeature "Cluster Management Client" + SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_GROUP "Cluster") + SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_DISPLAY_NAME "Cluster Management Client") + SET(CPACK_COMPONENT_CLUSTERMANAGEMENTCLIENT_DESCRIPTION "Installs Cluster Management Client") #Feature Misc (hidden, installs only if everything is installed) SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1) No bundle (reason: useless for push emails).