Commit c0678369 authored by Joerg Bruehe's avatar Joerg Bruehe

Bug #58241

Please exclude make_binary_distribution from the distribution

With cmake (5.5 and up), "make package" will do it,
or cpack.
The (generated) "scripts/make_binary_distribution" is just
a wrapper around a "cpack" call,
with path names set at build time.

Similar, "make_win_bin_dist" is not needed any more.

scripts/CMakeLists.txt:
  Cleanup:
  Append a trailing newline when generating "make_binary_distribution"
  (which is just a wrapper around a "cpack" call).
support-files/mysql.spec.sh:
  "make_win_bin_dist" is removed from the sources,
  so its man page is gone,
  and it need not be removed when creating the RPMs.
parent ccd3bc06
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
...@@ -65,7 +65,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs ...@@ -65,7 +65,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
IF(UNIX) IF(UNIX)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake" ) "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
) )
......
This diff is collapsed.
This diff is collapsed.
...@@ -535,7 +535,7 @@ install -m 644 "%{malloc_lib_source}" \ ...@@ -535,7 +535,7 @@ install -m 644 "%{malloc_lib_source}" \
# Remove man pages we explicitly do not want to package, avoids 'unpackaged # Remove man pages we explicitly do not want to package, avoids 'unpackaged
# files' warning. # files' warning.
rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1* # This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
############################################################################## ##############################################################################
# Post processing actions, i.e. when installed # Post processing actions, i.e. when installed
...@@ -1153,6 +1153,10 @@ echo "=====" >> $STATUS_HISTORY ...@@ -1153,6 +1153,10 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %changelog
* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- "make_win_bin_dist" and its manual are dropped, cmake does it different.
* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com> * Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Add the manual page for "mysql_plugin" to the server package. - Add the manual page for "mysql_plugin" to the server package.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment