mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
#51466 : Source packages are broken with cmake in a cmake-agnostic environment
In the worst case possible scenario (no bzr, in-source build), make dist produced a package that compiled ok with autotools but failed to package because extra make_binary_distribution was found in source package and was not built. make_binary_distribution contained paths of the build machine. Fix: exclude some scripts that are produced in cmake build. Note that there is no good general fix for it in this specific scenario. it is advisable to build source packages out of source or in bzr repo.
This commit is contained in:
@ -1,5 +1,6 @@
|
|||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
cmake_parse_arguments.cmake \
|
cmake_parse_arguments.cmake \
|
||||||
|
cpack_source_ignore_files.cmake \
|
||||||
package_name.cmake \
|
package_name.cmake \
|
||||||
configurable_file_content.in \
|
configurable_file_content.in \
|
||||||
check_minimal_version.cmake \
|
check_minimal_version.cmake \
|
||||||
|
40
cmake/cpack_source_ignore_files.cmake
Normal file
40
cmake/cpack_source_ignore_files.cmake
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
SET(CPACK_SOURCE_IGNORE_FILES
|
||||||
|
\\\\.bzr/
|
||||||
|
\\\\.bzr-mysql
|
||||||
|
\\\\.bzrignore
|
||||||
|
CMakeCache\\\\.txt
|
||||||
|
cmake_dist\\\\.cmake
|
||||||
|
CPackSourceConfig\\\\.cmake
|
||||||
|
CPackConfig.cmake
|
||||||
|
/cmake_install\\\\.cmake
|
||||||
|
/CTestTestfile\\\\.cmake
|
||||||
|
/CMakeFiles/
|
||||||
|
/version_resources/
|
||||||
|
/_CPack_Packages/
|
||||||
|
$\\\\.gz
|
||||||
|
$\\\\.zip
|
||||||
|
/CMakeFiles/
|
||||||
|
/version_resources/
|
||||||
|
/_CPack_Packages/
|
||||||
|
scripts/make_binary_distribution$
|
||||||
|
scripts/msql2mysql$
|
||||||
|
scripts/mysql_config$
|
||||||
|
scripts/mysql_convert_table_format$
|
||||||
|
scripts/mysql_find_rows$
|
||||||
|
scripts/mysql_fix_extensions$
|
||||||
|
scripts/mysql_install_db$
|
||||||
|
scripts/mysql_secure_installation$
|
||||||
|
scripts/mysql_setpermission$
|
||||||
|
scripts/mysql_zap$
|
||||||
|
scripts/mysqlaccess$
|
||||||
|
scripts/mysqld_multi$
|
||||||
|
scripts/mysqld_safe$
|
||||||
|
scripts/mysqldumpslow$
|
||||||
|
scripts/mysqlhotcopy$
|
||||||
|
Makefile$
|
||||||
|
include/config\\\\.h$
|
||||||
|
include/my_config\\\\.h$
|
||||||
|
/autom4te\\\\.cache/
|
||||||
|
errmsg\\\\.sys$
|
||||||
|
#
|
||||||
|
)
|
@ -108,17 +108,7 @@ IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
|
|||||||
ENDIF()
|
ENDIF()
|
||||||
SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc")
|
SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc")
|
||||||
SET(CPACK_SOURCE_GENERATOR "TGZ")
|
SET(CPACK_SOURCE_GENERATOR "TGZ")
|
||||||
SET(CPACK_SOURCE_IGNORE_FILES
|
INCLUDE(cpack_source_ignore_files)
|
||||||
\\\\.bzr/
|
|
||||||
\\\\.bzr-mysql
|
|
||||||
.bzrignore
|
|
||||||
CMakeCache.txt
|
|
||||||
/CMakeFiles/
|
|
||||||
/version_resources/
|
|
||||||
/_CPack_Packages/
|
|
||||||
$.gz
|
|
||||||
$.zip
|
|
||||||
)
|
|
||||||
|
|
||||||
# Defintions for windows version resources
|
# Defintions for windows version resources
|
||||||
SET(PRODUCTNAME "MySQL Server")
|
SET(PRODUCTNAME "MySQL Server")
|
||||||
|
Reference in New Issue
Block a user