Skip to content

Commit

Permalink
Separate client and server components (man/scripts)
Browse files Browse the repository at this point in the history
cleanups from PR 900:

- Use mariadb names instead of mysql and add secure-installation and
additionally organize man pages.

- Remove obsolete script `/make_binary_distribution`
- Don't build binary `mariadb-install-db` in case of without-server
  • Loading branch information
an3l authored and grooverdan committed Mar 28, 2021
1 parent 3523aed commit 09202b2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
11 changes: 6 additions & 5 deletions man/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
aria_s3_copy.1
myisamlog.1 myisampack.1 mysql.server.1 mariadb-conv.1
mysql_convert_table_format.1 mysql_fix_extensions.1
mysql_fix_extensions.1
mysql_install_db.1
mysql_secure_installation.1 mysql_setpermission.1
mysql_tzinfo_to_sql.1 mysql_upgrade.1
mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
perror.1 replace.1 resolve_stack_dump.1
mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1
perror.1 resolve_stack_dump.1
resolveip.1 mariadb-service-convert.1
mysqld_safe_helper.1
wsrep_sst_mysqldump.1
Expand All @@ -34,7 +33,9 @@ SET(MAN8_SERVER mysqld.8)
SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1
mysql_plugin.1 mysql_embedded.1 my_print_defaults.1)
mysql_plugin.1 mysql_embedded.1 my_print_defaults.1
mysqlhotcopy.1 mysql_setpermission.1
mysql_convert_table_format.1 replace.1 mysql_secure_installation.1)
SET(MAN1_DEVEL mysql_config.1)
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1
Expand Down
14 changes: 5 additions & 9 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,6 @@ ADD_CUSTOM_TARGET(GenFixPrivs
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
)

IF(UNIX)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
EXECUTE_PROCESS(
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
)
ENDIF()

# Configure two scripts from one 'in' file.
# The maria_add_gis_sp.sql - to be sent to 'mysql' tool
# and the maria_add_gis_sp_bootstrap.sql, that can be sent to
Expand Down Expand Up @@ -214,7 +206,7 @@ SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir
# install mysql_install_db.sh at this point since it needs
# different values for the above variables that will change
# afterwards
IF(UNIX)
IF(UNIX AND NOT WITHOUT_SERVER)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db ESCAPE_QUOTES @ONLY)
EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db)
Expand Down Expand Up @@ -260,6 +252,10 @@ SET(msql2mysql_COMPONENT Client)
SET(mariadb-access_COMPONENT Client)
SET(mariadb-find-rows_COMPONENT Client)
SET(mytop_COMPONENT Mytop)
SET(mariadb-hotcopy_COMPONENT COMPONENT Client)
SET(mariadb-convert-table-format_COMPONENT COMPONENT Client)
SET(mariadb-setpermission_COMPONENT COMPONENT Client)
SET(mariadb-secure-installation_COMPONENT COMPONENT Client)

IF(WIN32)
# On Windows, some .sh and some .pl.in files are configured
Expand Down

0 comments on commit 09202b2

Please sign in to comment.