diff options
| -rwxr-xr-x | Build-tools/Bootstrap | 4 | ||||
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rwxr-xr-x | scripts/make_win_src_distribution.sh | 36 |
3 files changed, 18 insertions, 23 deletions
diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap index 15dfb31dfdd..33eca958ae0 100755 --- a/Build-tools/Bootstrap +++ b/Build-tools/Bootstrap @@ -310,10 +310,6 @@ $command= "make dist"; if ($opt_win_dist) { &logger ("Creating Windows source package"); - chdir("scripts"); - $command= "make make_win_src_distribution"; - &run_command($command, "make make_win_src_distribution failed!"); - chdir(".."); $command= "./scripts/make_win_src_distibution"; &run_command($command, "make_win_src_distribution failed!"); } diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d6f59cb1ae9..72fc73ef28b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -17,6 +17,7 @@ ## Process this file with automake to create Makefile.in bin_SCRIPTS = @server_scripts@ \ + make_win_src_distribution \ msql2mysql \ mysql_config \ mysql_fix_privilege_tables \ diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index d2b50e06f54..8f8ee344e93 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -38,9 +38,9 @@ fi # Debug print of the status # -print_debug() +print_debug() { - for statement + for statement do if [ "$DEBUG" = "1" ] ; then echo $statement @@ -52,7 +52,7 @@ print_debug() # Usage of the script # -show_usage() +show_usage() { echo "MySQL utility script to create a Windows src package, and it takes" echo "the following arguments:" @@ -98,14 +98,14 @@ 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 - + # # @@ -123,14 +123,12 @@ $CP -r $SOURCE/VC++Files $BASE ( find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -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 + # ^M -> type CTRL V + CTRL M + cat $v | sed 's/
//' | sed 's/$/
/' > $v.tmp rm $v mv $v.tmp $v done @@ -149,7 +147,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 @@ -171,9 +169,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 @@ -198,14 +196,14 @@ copy_dir_dirs() { for arg do basedir=$arg - + if [ ! -d $BASE/$arg ]; then mkdir $BASE/$arg fi - + copy_dir_files $arg - - cd $SOURCE/$arg/ + + cd $SOURCE/$arg/ for i in * do if [ -d $SOURCE/$basedir/$i ] && [ "$i" != "SCCS" ]; then |