1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- some fixed for make_win_src_distribution to work properly

Browse Source 
Build-tools/Bootstrap:
   - no need to create the make_win_src_distribution script in here - do
     it in the Makefile instead.
scripts/Makefile.am:
   - added make_win_src_distribution to bin_SCRIPTS, so it's automatically
     built
scripts/make_win_src_distribution.sh:
   - merge fixes (looks like CRLF problems)
This commit is contained in:
unknown 2003-08-07 18:54:59 +02:00
parent bbc9d64fea
commit 46f5c97d31
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build-tools/Bootstrap
View File

@ -310,10 +310,6 @@ $command= "make dist";
if ($opt_win_dist) if ($opt_win_dist)
{ {
&logger ("Creating Windows source package"); &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"; $command= "./scripts/make_win_src_distibution";
&run_command($command, "make_win_src_distribution failed!"); &run_command($command, "make_win_src_distribution failed!");
} }

1
scripts/Makefile.am
View File

@ -17,6 +17,7 @@
## Process this file with automake to create Makefile.in ## Process this file with automake to create Makefile.in
bin_SCRIPTS = @server_scripts@ \ bin_SCRIPTS = @server_scripts@ \
make_win_src_distribution \
msql2mysql \ msql2mysql \
mysql_config \ mysql_config \
mysql_fix_privilege_tables \ mysql_fix_privilege_tables \

4
scripts/make_win_src_distribution.sh
View File

@ -128,9 +128,7 @@ find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print
print_debug "Replacing LF -> CRLF from '$v'" print_debug "Replacing LF -> CRLF from '$v'"
# ^M -> type CTRL V + CTRL M # ^M -> type CTRL V + CTRL M
cat $v | sed 's/ cat $v | sed 's/ //' | sed 's/$/ /' > $v.tmp
//' | sed 's/$/
/' > $v.tmp
rm $v rm $v
mv $v.tmp $v mv $v.tmp $v
done done