Commit b8782409 authored by monty@mysql.com's avatar monty@mysql.com

Add missing .cnf files to windows installation (Bug #4216)

parent 8db6c064
...@@ -110,6 +110,9 @@ print_debug "Copying sql-bench to $DIRNAME/bench" ...@@ -110,6 +110,9 @@ print_debug "Copying sql-bench to $DIRNAME/bench"
mkdir $DIRNAME/bench mkdir $DIRNAME/bench
cp -fr sql-bench/* $DIRNAME/bench cp -fr sql-bench/* $DIRNAME/bench
print_debug "Copying support-files to $DIRNAME"
cp support-files/* $DIRNAME
# Files for bin # Files for bin
for i in client_release/* client_debug/mysqld.exe lib_release/libmySQL.dll for i in client_release/* client_debug/mysqld.exe lib_release/libmySQL.dll
do do
...@@ -124,7 +127,7 @@ do ...@@ -124,7 +127,7 @@ do
cp $i $DIRNAME/include cp $i $DIRNAME/include
done done
# Windows users are used to having dbug.h # Windows users are used to having dbug.h ?
cp include/my_dbug.h $DIRNAME/include/dbug.h cp include/my_dbug.h $DIRNAME/include/dbug.h
# Libraries found in lib_release and lib_debug # Libraries found in lib_release and lib_debug
......
...@@ -178,18 +178,8 @@ rm -r -f "$BASE/share/Makefile" ...@@ -178,18 +178,8 @@ rm -r -f "$BASE/share/Makefile"
rm -r -f "$BASE/share/Makefile.in" rm -r -f "$BASE/share/Makefile.in"
rm -r -f "$BASE/share/Makefile.am" rm -r -f "$BASE/share/Makefile.am"
#
# Clean up if we did this from a bk tree
#
if [ -d $BASE/SCCS ]
then
find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
fi
mkdir $BASE/Docs $BASE/extra $BASE/include mkdir $BASE/Docs $BASE/extra $BASE/include
# #
# Copy directory files # Copy directory files
# #
...@@ -287,7 +277,7 @@ for i in COPYING ChangeLog README \ ...@@ -287,7 +277,7 @@ for i in COPYING ChangeLog README \
INSTALL-WIN-SOURCE \ INSTALL-WIN-SOURCE \
Docs/manual_toc.html Docs/manual.html \ Docs/manual_toc.html Docs/manual.html \
Docs/manual.txt Docs/mysqld_error.txt \ Docs/manual.txt Docs/mysqld_error.txt \
Docs/INSTALL-BINARY Docs/INSTALL-BINARY Docs/internals.texi
do do
print_debug "Copying file '$i'" print_debug "Copying file '$i'"
...@@ -297,6 +287,12 @@ do ...@@ -297,6 +287,12 @@ do
fi fi
done done
#
# support files
#
mkdir $BASE/support-files
cp support-files/*.cnf $BASE/support-files
# #
# Raw dirs from source tree # Raw dirs from source tree
# #
...@@ -312,7 +308,7 @@ do ...@@ -312,7 +308,7 @@ do
done done
# #
# Fix some windows files # Fix some windows files to avoid compiler warnings
# #
./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp ./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp
...@@ -320,6 +316,15 @@ done ...@@ -320,6 +316,15 @@ done
unix_to_dos $BASE/README unix_to_dos $BASE/README
mv $BASE/README $BASE/README.txt mv $BASE/README $BASE/README.txt
#
# Clean up if we did this from a bk tree
#
if [ -d $BASE/SSL/SCCS ]
then
find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
fi
# #
# Initialize the initial data directory # Initialize the initial data directory
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment