mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
- some fixed for make_win_src_distribution to work properly
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:
@ -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
|
||||
@ -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
|
||||
@ -171,9 +169,9 @@ copy_dir_files()
|
||||
if [ ! -d $BASE/$arg ]; then
|
||||
print_debug "Creating directory '$arg'"
|
||||
mkdir $BASE/$arg
|
||||
README INSTALL* LICENSE
|
||||
do
|
||||
if [ -f $i ]
|
||||
fi
|
||||
for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \
|
||||
README INSTALL* LICENSE
|
||||
do
|
||||
if [ -f $i ]
|
||||
then
|
||||
@ -198,14 +196,14 @@ copy_dir_dirs() {
|
||||
copy_dir_dirs() {
|
||||
|
||||
for arg do
|
||||
|
||||
|
||||
basedir=$arg
|
||||
|
||||
if [ ! -d $BASE/$arg ]; then
|
||||
|
||||
mkdir $BASE/$arg
|
||||
fi
|
||||
|
||||
cd $SOURCE/$arg/
|
||||
|
||||
copy_dir_files $arg
|
||||
|
||||
cd $SOURCE/$arg/
|
||||
for i in *
|
||||
|
Reference in New Issue
Block a user