Commit eadd3510 authored by kent@mysql.com's avatar kent@mysql.com

make_win_src_distribution.sh:

  Include "sql_yacc.yy" for completeness (bug#20387)
parent 5a242ffc
#!/bin/sh #!/bin/sh
# Terminate loudly on error, we don't want partial package
set -e
trap "echo '*** script failed ***'" 0
# #
# Script to create a Windows src package # Script to create a Windows src package
# #
version=@VERSION@ version=@VERSION@
export version
CP="cp -p" CP="cp -p"
DEBUG=0 DEBUG=0
...@@ -199,7 +202,7 @@ copy_dir_files() ...@@ -199,7 +202,7 @@ copy_dir_files()
print_debug "Creating directory '$arg'" print_debug "Creating directory '$arg'"
mkdir $BASE/$arg mkdir $BASE/$arg
fi fi
for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \ for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy \
README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
*.inc *.test *.result *.pem Moscow_leap des_key_file \ *.inc *.test *.result *.pem Moscow_leap des_key_file \
*.vcproj *.sln *.dat *.000001 *.require *.opt *.vcproj *.sln *.dat *.000001 *.require *.opt
...@@ -260,7 +263,7 @@ done ...@@ -260,7 +263,7 @@ done
# #
# Create project files for ndb # Create project files for ndb
# #
make -C $SOURCE/ndb windoze make -C $SOURCE/ndb windoze || true
# #
# Input directories to be copied recursively # Input directories to be copied recursively
...@@ -334,8 +337,17 @@ done ...@@ -334,8 +337,17 @@ done
# Fix some windows files to avoid compiler warnings # Fix some windows files to avoid compiler warnings
# #
./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' > $BASE/sql/sql_yacc.cpp-new if [ -x extra/replace ] ; then
mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp ./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | \
sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' \
> $BASE/sql/sql_yacc.cpp-new
mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
else
if [ "$SILENT" = "0" ] ; then
echo 'WARNING: "extra/replace" not built, can not filter "sql_yacc.ccp"'
echo 'WARNING: to reduce the number of warnings when building'
fi
fi
# #
# Search the tree for plain text files and adapt the line end marker # Search the tree for plain text files and adapt the line end marker
...@@ -349,8 +361,6 @@ find $BASE \( -name "*.cnf" -o -name "*.ini" \ ...@@ -349,8 +361,6 @@ find $BASE \( -name "*.cnf" -o -name "*.ini" \
do do
unix_to_dos $v unix_to_dos $v
done done
# File extension '.txt' matches too many other files, error messages etc.
unix_to_dos $BASE/Docs/*.txt
mv $BASE/README $BASE/README.txt mv $BASE/README $BASE/README.txt
...@@ -358,19 +368,23 @@ mv $BASE/README $BASE/README.txt ...@@ -358,19 +368,23 @@ mv $BASE/README $BASE/README.txt
# Clean up if we did this from a bk tree # Clean up if we did this from a bk tree
# #
if [ -d $BASE/SSL/SCCS ] find $BASE -type d \( -name SCCS -o -name .deps -o -name .libs \) -print0 | \
then xargs -0 rm -r -f
find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
fi
find $BASE/ -type d -name .deps -printf " \"%p\"" | xargs rm -r -f
find $BASE/ -type d -name .libs -printf " \"%p\"" | xargs rm -r -f
rm -r -f "$BASE/mysql-test/var" rm -r -f "$BASE/mysql-test/var"
# #
# Initialize the initial data directory # Initialize the initial data directory
# #
if [ -f scripts/mysql_install_db ]; then if [ ! -f scripts/mysql_install_db ] ; then
if [ "$SILENT" = "0" ] ; then
echo 'WARNING: "scripts/mysql_install_db" is not built, can not initiate databases'
fi
elif [ ! -f extra/my_print_defaults ]; then
if [ "$SILENT" = "0" ] ; then
echo 'WARNING: "extra/my_print_defaults" is not built, can not initiate databases'
fi
else
print_debug "Initializing the 'data' directory" print_debug "Initializing the 'data' directory"
scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data
if test "$?" = 1 if test "$?" = 1
...@@ -451,7 +465,7 @@ set_tarzip_options() ...@@ -451,7 +465,7 @@ set_tarzip_options()
OPT=cvf OPT=cvf
EXT=".tar" EXT=".tar"
NEED_COMPRESS=1 NEED_COMPRESS=1
if [ "$SILENT" = "1" ] ; then if [ "$DEBUG" = "0" ] ; then
OPT=cf OPT=cf
fi fi
else else
...@@ -460,7 +474,7 @@ set_tarzip_options() ...@@ -460,7 +474,7 @@ set_tarzip_options()
OPT="-r" OPT="-r"
EXT=".zip" EXT=".zip"
NEED_COMPRESS=0 NEED_COMPRESS=0
if [ "$SILENT" = "1" ] ; then if [ "$DEBUG" = "0" ] ; then
OPT="$OPT -q" OPT="$OPT -q"
fi fi
fi fi
...@@ -523,4 +537,7 @@ fi ...@@ -523,4 +537,7 @@ fi
print_debug "Removing temporary directory" print_debug "Removing temporary directory"
rm -r -f $BASE rm -r -f $BASE
# No need to report anything if we got here
trap "" 0
# End of script # End of script
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