mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
Better Windows support in the scripts directory mysql_config.pl.in, mysql_install_db.pl.in: New Perl version of Unix shell script, mainly for Windows Many files in scripts directory: Use default Perl location "#!/usr/bin/perl" instead of the build host path extra/CMakeLists.txt: Added target for executable "resolveip" extra/resolveip.c: Exclude Unix specific headers when compiling on Windows scripts/CMakeLists.txt: On Windows, filter Perl scripts and change name from ".sh" to ".pl" mysql_convert_table_format.sh mysql_explain_log.sh mysql_secure_installation.sh mysql_tableinfo.sh mysqld_multi.sh mysqldumpslow.sh mysqlhotcopy.sh Do the same for the new Windows specific Perl versions of shell scripts mysql_config.pl.in mysql_install_db.pl.in In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on. scripts/Makefile.am: Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR scripts/make_win_bin_dist: Only include explicitly listed scripts from the "scripts" directory scripts/mysql_convert_table_format.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_explain_log.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_tableinfo.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqld_multi.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqldumpslow.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqlhotcopy.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_config.pl.in: New Perl version of Unix shell script, mainly for Windows scripts/mysql_install_db.pl.in: New Perl version of Unix shell script, mainly for Windows
This commit is contained in:
@ -327,27 +327,26 @@ if [ -d mysql-test/extra ] ; then
|
||||
fi
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Copy what could be usable in the "scripts" directory. Currently
|
||||
# only SQL files, others are Bourne shell scripts or Perl scripts
|
||||
# not really usable on Windows.
|
||||
#
|
||||
# But to be nice to the few Cygwin users we might have in 5.0 we
|
||||
# continue to copy the stuff, but don't include it in the WiX install.
|
||||
# Copy what could be usable in the "scripts" directory
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
mysql_scripts="\
|
||||
mysql_config.pl \
|
||||
mysql_convert_table_format.pl \
|
||||
mysql_explain_log.pl \
|
||||
mysql_install_db.pl \
|
||||
mysql_secure_installation.pl \
|
||||
mysql_tableinfo.pl \
|
||||
mysqld_multi.pl \
|
||||
mysqldumpslow.pl \
|
||||
mysqlhotcopy.pl \
|
||||
"
|
||||
|
||||
mkdir -p $DESTDIR/scripts
|
||||
|
||||
# Uncomment and remove the for loop in 5.1
|
||||
#cp scripts/*.sql $DESTDIR/scripts/
|
||||
|
||||
for i in `cd scripts && ls`; do \
|
||||
if echo $i | grep -q '\.sh'; then \
|
||||
cp scripts/$i $DESTDIR/scripts/`echo $i | sed -e 's/\.sh$//'`; \
|
||||
elif [ -d scripts/$i -o $i = Makefile.am -o $i = Makefile.in -o -e scripts/$i.sh ] ; then \
|
||||
: ; \
|
||||
else \
|
||||
cp scripts/$i $DESTDIR/scripts/$i; \
|
||||
fi; \
|
||||
for i in $mysql_scripts
|
||||
do
|
||||
cp scripts/$i $DESTDIR/scripts/$i
|
||||
done
|
||||
|
||||
cp -pR sql/share $DESTDIR/
|
||||
@ -355,7 +354,7 @@ cp -pR sql-bench $DESTDIR/
|
||||
rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
|
||||
|
||||
# The SQL initialisation code is really expected to be in "share"
|
||||
mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true
|
||||
mv $DESTDIR/scripts/*.sql $DESTDIR/share/
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Clean up from possibly copied SCCS directories
|
||||
|
Reference in New Issue
Block a user