diff options
| author | Anel Husakovic <anel@mariadb.org> | 2021-03-15 11:37:19 +0100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-03-28 12:51:48 +1100 |
| commit | 67eeb7770bb758832cf7dc5371c11e0f2ab76613 (patch) | |
| tree | 5effde49b97227ac30e93b34a00538dfc43527d5 | |
| parent | e538cb095f6290c40e8928e3813db6ac679740a2 (diff) | |
| download | mariadb-git-67eeb7770bb758832cf7dc5371c11e0f2ab76613.tar.gz | |
MDEV-23429: Remove WSREP when using WITHOUT_SERVER
Under WITHOUT_WSREP:
Exclude support files that are server only like
* wsrep.cnf
* wsrep_notify
* log rotate config files
* mysqld_multi
Exclude man pages of server components
| -rw-r--r-- | man/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | support-files/CMakeLists.txt | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 6c5fe2c2050..848c8672f90 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -12,7 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA - +SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1 + wsrep_sst_rsync_wan.1) SET(MAN1_SERVER innochecksum.1 my_print_defaults.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 @@ -24,12 +25,11 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 mariadb-service-convert.1 - mysqld_safe_helper.1 wsrep_sst_common.1 - wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 + mysqld_safe_helper.1 + wsrep_sst_mysqldump.1 galera_recovery.1 galera_new_cluster.1 mysql_ldb.1 myrocks_hotbackup.1 - wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1 - wsrep_sst_rsync_wan.1) + mbstream.1 mariabackup.1 ${MAN1_WSREP}) 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 @@ -39,9 +39,11 @@ 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 my_safe_process.1) +IF(NOT WITHOUT_SERVER) + INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) + INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) +ENDIF() -INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) -INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 7fac042dca6..338ae90cd42 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -41,14 +41,14 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() -IF(WITH_WSREP) +IF(WITH_WSREP AND NOT WITHOUT_SERVER) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} DESTINATION ${inst_location} COMPONENT IniFiles) ENDIF() -IF(UNIX) +IF(UNIX AND NOT WITHOUT_SERVER) SET(prefix ${CMAKE_INSTALL_PREFIX}) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh |