From 965050afc9340a108a389ada8e3ecea948da1302 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Aug 2003 23:21:21 +0200 Subject: - enabled embedded server in the binary distributions by default (Do-compile) - added mysql.info to the binary distribution files (BUG#1019) - heavily reworked the Do-rpm script to be more in line with Do-pkg - create a "docs" subdirectory in the binary distribution and moved the manual, ChangeLog and mysql.info file into it to unclutter the top directory Build-tools/Do-compile: - enable compiling with the embedded server by default (as requested by BrianA) - disable it with the "--disable-embedded" compile option. Build-tools/Do-rpm: - replaced the original Shell script with a Perl script, similar to Do-pkg. Some more work remains to be done (copying the resulting packages, enable using different compile flags and compilers). scripts/make_binary_distribution.sh: - move some docs into a subdirectory "docs" to not clutter the top directory with too many files. - added mysql.info info file to the docs dir (BUG#1019) --- scripts/make_binary_distribution.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 73aa95a1100..8735fc800ce 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -61,7 +61,7 @@ case $system in esac -mkdir $BASE $BASE/bin \ +mkdir $BASE $BASE/bin $BASE/docs \ $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \ $BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \ $BASE/mysql-test/include $BASE/mysql-test/std_data @@ -73,9 +73,20 @@ if [ $BASE_SYSTEM != "netware" ] ; then chmod o-rwx $BASE/data $BASE/data/* fi -for i in ChangeLog COPYING COPYING.LIB README Docs/INSTALL-BINARY \ - MySQLEULA.txt Docs/manual.html Docs/manual.txt Docs/manual_toc.html \ - LICENSE.doc README.NW Docs/mysqlbug.txt +for i in ChangeLog \ + Docs/manual.html \ + Docs/manual.txt \ + Docs/manual_toc.html \ + Docs/mysql.info +do + if [ -f $i ] + then + $CP $i $BASE/docs + fi +done + +for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \ + MySQLEULA.txt LICENSE.doc README.NW do if [ -f $i ] then -- cgit v1.2.1 From 791581016cf3fbaa7df0dfbfd3ae4ab7e8972df9 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Aug 2003 04:52:03 +0200 Subject: make_win_src_distribution.sh: Copy some previously missed files scripts/make_win_src_distribution.sh: Copy some previously missed files --- scripts/make_win_src_distribution.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 8f8ee344e93..fc07068d735 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -249,11 +249,12 @@ touch $BASE/innobase/ib_config.h # cd $SOURCE -for i in COPYING ChangeLog README \ +for i in COPYING COPYING.LIB ChangeLog README \ INSTALL-SOURCE INSTALL-WIN \ INSTALL-WIN-SOURCE \ Docs/manual_toc.html Docs/manual.html \ - Docs/mysqld_error.txt Docs/INSTALL-BINARY + Docs/manual.txt Docs/mysqld_error.txt \ + Docs/INSTALL-BINARY do print_debug "Copying file '$i'" @@ -263,6 +264,20 @@ do fi done +# +# Raw dirs from source tree +# + +for i in Docs/Flags scripts sql-bench SSL \ + tests tools +do + print_debug "Copying directory '$i'" + if [ -d $i ] + then + $CP -R $i $BASE/$i + fi +done + # # Fix some windows files # -- cgit v1.2.1 From 78b59b190eb3a18b407c388209f66363b5b227e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Aug 2003 16:36:01 +0200 Subject: make_win_src_distribution.sh: Clean up script, add needed modifications to generate a complete 4.0 Windows source package scripts/make_win_src_distribution.sh: Clean up script, add needed modifications to generate a complete 4.0 Windows source package --- scripts/make_win_src_distribution.sh | 82 ++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 36 deletions(-) (limited to 'scripts') diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index fc07068d735..f0cc70c10c5 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -98,16 +98,30 @@ parse_arguments "$@" for i in $TMP $TMPDIR $TEMPDIR $TEMP /tmp do - if [ "$i" ]; then + if [ "$i" ]; then print_debug "Setting TMP to '$i'" - TMP=$i + TMP=$i break fi done - + +# +# Convert argument file from unix to DOS text # +unix_to_dos() +{ + for arg do + print_debug "Replacing LF -> CRLF from '$arg'" + + sed -e 's/$/\r/' $arg > $arg.tmp + rm -f $arg + mv $arg.tmp $arg + done +} + + # # Create a tmp dest directory to copy files # @@ -121,16 +135,11 @@ fi $CP -r $SOURCE/VC++Files $BASE ( -find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print +find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.txt" \) -and -not -path \*SCCS\* -print )|( - while read v + while read v do - print_debug "Replacing LF -> CRLF from '$v'" - - # ^M -> type CTRL V + CTRL M - cat $v | sed 's/ //' | sed 's/$/ /' > $v.tmp - rm $v - mv $v.tmp $v + unix_to_dos $v done ) @@ -147,7 +156,7 @@ rm -r -f "$BASE/share/Makefile.am" # Clean up if we did this from a bk tree # -if [ -d $BASE/SCCS ] +if [ -d $BASE/SCCS ] then find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f fi @@ -169,9 +178,9 @@ copy_dir_files() mkdir $BASE/$arg fi for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \ - README INSTALL* LICENSE - do - if [ -f $i ] + README INSTALL* LICENSE + do + if [ -f $i ] then $CP $SOURCE/$arg/$i $BASE/$arg/$i fi @@ -195,21 +204,19 @@ copy_dir_dirs() { for arg do - basedir=$arg - - if [ ! -d $BASE/$arg ]; then - mkdir $BASE/$arg - fi - - copy_dir_files $arg - - cd $SOURCE/$arg/ - for i in * - do - if [ -d $SOURCE/$basedir/$i ] && [ "$i" != "SCCS" ]; then - copy_dir_files $basedir/$i - fi - done + cd $SOURCE + ( + find $arg -type d \ + -and -not -path \*SCCS\* \ + -and -not -path \*.deps\* \ + -and -not -path \*autom4te.cache -print + )|( + while read v + do + copy_dir_files $v + done + ) + done } @@ -254,11 +261,11 @@ for i in COPYING COPYING.LIB ChangeLog README \ INSTALL-WIN-SOURCE \ Docs/manual_toc.html Docs/manual.html \ Docs/manual.txt Docs/mysqld_error.txt \ - Docs/INSTALL-BINARY - + Docs/INSTALL-BINARY + do print_debug "Copying file '$i'" - if [ -f $i ] + if [ -f $i ] then $CP $i $BASE/$i fi @@ -284,11 +291,14 @@ done ./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp +unix_to_dos $BASE/README +mv $BASE/README $BASE/README.txt + # # 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 @@ -349,9 +359,9 @@ which_1 () # Create the result zip/tar file # -set_tarzip_options() +set_tarzip_options() { - for arg + for arg do if [ "$arg" = "tar" ]; then ZIPFILE1=gnutar -- cgit v1.2.1 From 88977ce1dc83a5a4f4e98925346f337235b935f9 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Aug 2003 16:45:28 +0200 Subject: make_win_src_distribution.sh: Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces scripts/make_win_src_distribution.sh: Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces --- scripts/make_win_src_distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index f0cc70c10c5..89454345c7b 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -135,7 +135,7 @@ fi $CP -r $SOURCE/VC++Files $BASE ( -find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.txt" \) -and -not -path \*SCCS\* -print +find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print )|( while read v do -- cgit v1.2.1 From e4e8a2f3cc3b4869007ec1447afd3a5364a3723b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Aug 2003 17:00:22 +0200 Subject: make_win_src_distribution.sh: 'tools' contains intermediate files scripts/make_win_src_distribution.sh: 'tools' contains intermediate files --- scripts/make_win_src_distribution.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 89454345c7b..1946da16186 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -227,7 +227,7 @@ copy_dir_dirs() { for i in client dbug extra heap include isam \ libmysql libmysqld merge myisam \ myisammrg mysys regex sql strings \ - vio zlib + tools vio zlib do copy_dir_files $i done @@ -276,7 +276,7 @@ done # for i in Docs/Flags scripts sql-bench SSL \ - tests tools + tests do print_debug "Copying directory '$i'" if [ -d $i ] -- cgit v1.2.1 From 9ac61d15faf874589bd01ae9fa8d1854f6dc6621 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Aug 2003 19:32:34 +0200 Subject: make_win_src_distribution.sh: Add --zip option for finer grain control over what package formats are created Bootstrap: Create both Windows source packages Build-tools/Bootstrap: Create both Windows source packages scripts/make_win_src_distribution.sh: Add --zip option for finer grain control over what package formats are created --- scripts/make_win_src_distribution.sh | 79 ++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 27 deletions(-) (limited to 'scripts') diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 1946da16186..9b310722886 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -14,6 +14,7 @@ SILENT=0 SUFFIX="" DIRNAME="" OUTTAR=0 +OUTZIP=0 # # This script must run from MySQL top directory @@ -62,7 +63,8 @@ show_usage() echo " --suffix Suffix name for the package" echo " --dirname Directory name to copy files (intermediate)" echo " --silent Do not list verbosely files processed" - echo " --tar Create tar.gz package instead of .zip" + echo " --tar Create tar.gz package" + echo " --zip Create zip package" echo " --help Show this help message" exit 0 @@ -75,12 +77,14 @@ show_usage() parse_arguments() { for arg do case "$arg" in + --add-tar) ADDTAR=1 ;; --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 ;; + --zip) OUTZIP=1 ;; --help) show_usage ;; *) echo "Unknown argument '$arg'" @@ -359,6 +363,10 @@ which_1 () # Create the result zip/tar file # +if [ [ "$OUTTAR" = "0" ] && [ "$OUTZIP" = "0" ] ]; then + OUTZIP=1 +fi + set_tarzip_options() { for arg @@ -385,43 +393,60 @@ set_tarzip_options() done } -if [ "$OUTTAR" = "1" ]; then - set_tarzip_options 'tar' -else - set_tarzip_options 'zip' -fi - -tar=`which_1 $ZIPFILE1 $ZIPFILE2` -if test "$?" = "1" -o "$tar" = "" -then - print_debug "Search failed for '$ZIPFILE1', '$ZIPFILE2', using default 'tar'" - tar=tar - set_tarzip_options 'tar' -fi # # Create the archive # +create_archive() +{ -print_debug "Using $tar to create archive" + print_debug "Using $tar to create archive" -cd $TMP + cd $TMP -rm -f $SOURCE/$NEW_NAME$EXT -$tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME -cd $SOURCE + rm -f $SOURCE/$NEW_NAME$EXT + $tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME + cd $SOURCE -if [ "$NEED_COMPRESS" = "1" ] -then - print_debug "Compressing archive" - gzip -9 $NEW_NAME$EXT - EXT="$EXT.gz" + if [ "$NEED_COMPRESS" = "1" ] + then + print_debug "Compressing archive" + gzip -9 $NEW_NAME$EXT + EXT="$EXT.gz" + fi + + if [ "$SILENT" = "0" ] ; then + echo "$NEW_NAME$EXT created successfully !!" + fi +} + +if [ "$OUTTAR" = "1" ]; then + set_tarzip_options 'tar' + + tar=`which_1 $ZIPFILE1 $ZIPFILE2` + if test "$?" = "1" -o "$tar" = "" + then + print_debug "Search failed for '$ZIPFILE1', '$ZIPFILE2', using default 'tar'" + tar=tar + set_tarzip_options 'tar' + fi + + create_archive +fi + +if [ "$OUTZIP" = "1" ]; then + set_tarzip_options 'zip' + + tar=`which_1 $ZIPFILE1 $ZIPFILE2` + if test "$?" = "1" -o "$tar" = "" + then + echo "Search failed for '$ZIPFILE1', '$ZIPFILE2', cannot create zip!" + fi + + create_archive fi print_debug "Removing temporary directory" rm -r -f $BASE -if [ "$SILENT" = "0" ] ; then - echo "$NEW_NAME$EXT created successfully !!" -fi # End of script -- cgit v1.2.1 From 7a21caabab32c3cce0357fbccf772b2af482d470 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Aug 2003 14:29:13 +0200 Subject: - Reverted a fix for bug#897, as it broke the installation on some other operating systems - some implementations of "hostname" simply set the host name to "-f" instead of giving an error about an unkown option --- scripts/mysql_install_db.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index ffb857933cd..920bd27cc88 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -107,13 +107,8 @@ then fi fi -# Try to determine the fully qualified domain name (FQDN) -HOSTNAME="@HOSTNAME@" -if $HOSTNAME -f > /dev/null 2>&1 ; then - hostname=`$HOSTNAME -f` -else - hostname=`$HOSTNAME` -fi +# Try to determine the hostname +hostname=`@HOSTNAME@` # Check if hostname is valid if test "$IN_RPM" -eq 0 -a $force -eq 0 -- cgit v1.2.1 From 59de978b8938f4ce16bb314e5c17ae68270ebb6c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Aug 2003 19:22:14 +0300 Subject: Added a warning to my_print_defaults if --verbose is given and --defaults-file is a non-existing or non-regular file. Bug#755 scripts/mysqld_safe.sh: Added a warning to my_print_defaults if --verbose is given and --defaults-file is a non-existing or non-regular file. Bug#755 --- scripts/mysqld_safe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index d7e3eedb84e..1c056e963cb 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -148,7 +148,7 @@ else fi args= -parse_arguments `$print_defaults $defaults mysqld server mysqld_safe safe_mysqld` +parse_arguments `$print_defaults --loose-verbose $defaults mysqld server mysqld_safe safe_mysqld` parse_arguments PICK-ARGS-FROM-ARGV "$@" if test ! -x $ledir/$MYSQLD -- cgit v1.2.1