database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixes for make_win_src_distributions

Browse Source 
Removed compiler warnings


scripts/make_win_src_distribution.sh:
  Added option --dirname
  Also copy sql-common directory
  Create mysql data files even if mysqld is not installed
scripts/mysql_create_system_tables.sh:
  Update for usage with make_win_src_distribution
scripts/mysql_install_db.sh:
  Update for usage with make_win_src_distribution
sql-common/client.c:
  Portability fix
sql/item_cmpfunc.cc:
  Removed compiler warning
sql/sql_acl.cc:
  Indentation cleanup
  Removed compiler warning
sql/sql_parse.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed compiler warning
sql/sql_yacc.yy:
  Removed compiler warning
strings/ctype-utf8.c:
  Removed compiler warning
This commit is contained in:
unknown
2003-06-15 23:24:37 +03:00
parent fb2825e2b5
commit ed1d28fdb6
10 changed files with 91 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
scripts/make_win_src_distribution.sh
View File

@ -12,6 +12,7 @@ CP="cp -p"
DEBUG=0
SILENT=0
SUFFIX=""
DIRNAME=""
OUTTAR=0
#
@ -75,6 +76,7 @@ parse_arguments() {
--debug) DEBUG=1;;
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
--dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
--silent) SILENT=1 ;;
--tar) OUTTAR=1 ;;
--help) show_usage ;;
@ -155,11 +157,15 @@ mkdir $BASE/Docs $BASE/extra $BASE/include
#
# Copy directory files
#
#
copy_dir_files()
{
for arg do
for arg do
print_debug "Copying files from directory '$arg'"
cd $SOURCE/$arg
if [ ! -d $BASE/$arg ]; then
print_debug "Creating directory '$arg'"
mkdir $BASE/$arg
fi
for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \
@ -199,9 +205,6 @@ copy_dir_dirs() {
cd $SOURCE/$arg/
for i in *
do
if [ -d $SOURCE/$basedir/$i ] && [ "$i" != "SCCS" ]; then
if [ ! -d $BASE/$basedir/$i ]; then
do
if [ -d $SOURCE/$basedir/$i ] && [ "$i" != "SCCS" ]; then
copy_dir_files $basedir/$i
@ -214,7 +217,7 @@ copy_dir_dirs() {
# Input directories to be copied
#
for i in client dbug extra heap include isam \
for i in client dbug extra heap include isam \
libmysql libmysqld merge myisam \
myisammrg mysys regex sql strings sql-common \
vio zlib
@ -270,15 +273,19 @@ done
# Initialize the initial data directory
#
if [ -f scripts/mysql_install_db ]; then
if [ -f scripts/mysql_install_db ]; then
print_debug "Initializing the 'data' directory"
scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data
fi
fi
#
# Specify the distribution package name and copy it
#
#
if test -z $DIRNAME
then
NEW_DIR_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version$SUFFIX
else
NEW_DIR_NAME=$DIRNAME
fi
NEW_NAME=$NEW_DIR_NAME-win-src
@ -345,7 +352,7 @@ set_tarzip_options()
ZIPFILE2=""
OPT="-vr"
EXT=".zip"
NEED_COMPRESS=0
NEED_COMPRESS=0
if [ "$SILENT" = "1" ] ; then
OPT="$OPT -q"
fi
@ -386,9 +393,7 @@ fi
fi
print_debug "Removing temporary directory"
rm -r -f $BASE
rm -r -f $BASE
if [ "$SILENT" = "0" ] ; then
echo "$NEW_NAME$EXT created successfully !!"
# End of script