database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

- some fixed for make_win_src_distribution to work properly

Browse Source
This commit is contained in:
lenz@mysql.com
2003-08-07 18:54:59 +02:00
parent e56383eff2
commit d5547ad13b
3 changed files with 18 additions and 23 deletions
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 \

36
scripts/make_win_src_distribution.sh
View File

@ -38,9 +38,9 @@ fi
# Debug print of the status # Debug print of the status
# #
print_debug() print_debug()
{ {
for statement for statement
do do
if [ "$DEBUG" = "1" ] ; then if [ "$DEBUG" = "1" ] ; then
echo $statement echo $statement
@ -52,7 +52,7 @@ print_debug()
# Usage of the script # Usage of the script
# #
show_usage() show_usage()
{ {
echo "MySQL utility script to create a Windows src package, and it takes" echo "MySQL utility script to create a Windows src package, and it takes"
echo "the following arguments:" echo "the following arguments:"
@ -98,14 +98,14 @@ parse_arguments "$@"
for i in $TMP $TMPDIR $TEMPDIR $TEMP /tmp for i in $TMP $TMPDIR $TEMPDIR $TEMP /tmp
do do
if [ "$i" ]; then if [ "$i" ]; then
print_debug "Setting TMP to '$i'" print_debug "Setting TMP to '$i'"
TMP=$i TMP=$i
break break
fi fi
done done
# #
# #
@ -123,14 +123,12 @@ $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" \) -and -not -path \*SCCS\* -print
)|( )|(
while read v while read v
do do
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/$/ //' | sed 's/$/
/' > $v.tmp /' > $v.tmp
rm $v rm $v
@ -149,7 +147,7 @@ rm -r -f "$BASE/share/Makefile.am"
# #
# Clean up if we did this from a bk tree # Clean up if we did this from a bk tree
if [ -d $BASE/SCCS ] #
if [ -d $BASE/SCCS ] if [ -d $BASE/SCCS ]
then then
@ -171,9 +169,9 @@ copy_dir_files()
if [ ! -d $BASE/$arg ]; then if [ ! -d $BASE/$arg ]; then
print_debug "Creating directory '$arg'" print_debug "Creating directory '$arg'"
mkdir $BASE/$arg mkdir $BASE/$arg
README INSTALL* LICENSE fi
do for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \
if [ -f $i ] README INSTALL* LICENSE
do do
if [ -f $i ] if [ -f $i ]
then then
@ -198,14 +196,14 @@ copy_dir_dirs() {
copy_dir_dirs() { copy_dir_dirs() {
for arg do for arg do
basedir=$arg basedir=$arg
if [ ! -d $BASE/$arg ]; then if [ ! -d $BASE/$arg ]; then
mkdir $BASE/$arg
fi fi
cd $SOURCE/$arg/ copy_dir_files $arg
cd $SOURCE/$arg/ cd $SOURCE/$arg/
for i in * for i in *