2003-02-20 14:05:58 -08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
#
|
|
|
|
# Script to create a Windows src package
|
|
|
|
#
|
|
|
|
|
|
|
|
version=@VERSION@
|
|
|
|
export version
|
|
|
|
CP="cp -p"
|
|
|
|
|
|
|
|
DEBUG=0
|
|
|
|
SILENT=0
|
|
|
|
SUFFIX=""
|
2003-06-15 23:24:37 +03:00
|
|
|
DIRNAME=""
|
2003-09-04 12:56:02 -04:00
|
|
|
OUTTAR="0"
|
|
|
|
OUTZIP="0"
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2005-03-10 21:13:46 +01:00
|
|
|
#
|
|
|
|
# An "abort" function taking a variable number of strings (one per line)
|
|
|
|
#
|
|
|
|
|
|
|
|
abort()
|
|
|
|
{
|
|
|
|
for line
|
|
|
|
do
|
|
|
|
echo "$line"
|
|
|
|
done
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
# This script must run from MySQL top directory
|
|
|
|
#
|
|
|
|
|
2003-03-02 14:05:51 -08:00
|
|
|
if [ ! -f scripts/make_win_src_distribution ]; then
|
2005-03-10 21:13:46 +01:00
|
|
|
abort "ERROR : You must run this script from the MySQL top-level directory"
|
2003-02-20 14:05:58 -08:00
|
|
|
fi
|
2004-10-27 21:59:34 +02:00
|
|
|
SOURCE=`pwd`
|
2003-03-02 14:05:51 -08:00
|
|
|
|
|
|
|
#
|
|
|
|
# Check for source compilation/configuration
|
|
|
|
#
|
|
|
|
|
|
|
|
if [ ! -f sql/sql_yacc.cc ]; then
|
2005-03-10 21:13:46 +01:00
|
|
|
abort "ERROR : Sorry, you must run this script after the complete build," \
|
|
|
|
" hope you know what you are trying to do !!"
|
2003-03-02 14:05:51 -08:00
|
|
|
fi
|
|
|
|
|
|
|
|
#
|
2003-03-07 10:16:23 -08:00
|
|
|
# Debug print of the status
|
2003-03-02 14:05:51 -08:00
|
|
|
#
|
|
|
|
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug()
|
|
|
|
{
|
|
|
|
for statement
|
|
|
|
do
|
|
|
|
if [ "$DEBUG" = "1" ] ; then
|
|
|
|
echo $statement
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
2003-03-02 14:05:51 -08:00
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
# Usage of the script
|
|
|
|
#
|
|
|
|
|
2003-03-07 10:16:23 -08:00
|
|
|
show_usage()
|
|
|
|
{
|
2003-02-20 14:05:58 -08:00
|
|
|
echo "MySQL utility script to create a Windows src package, and it takes"
|
|
|
|
echo "the following arguments:"
|
|
|
|
echo ""
|
|
|
|
echo " --debug Debug, without creating the package"
|
|
|
|
echo " --tmp Specify the temporary location"
|
2003-06-17 14:29:20 -07:00
|
|
|
echo " --suffix Suffix name for the package"
|
|
|
|
echo " --dirname Directory name to copy files (intermediate)"
|
2003-02-20 14:05:58 -08:00
|
|
|
echo " --silent Do not list verbosely files processed"
|
2003-08-13 19:32:34 +02:00
|
|
|
echo " --tar Create tar.gz package"
|
|
|
|
echo " --zip Create zip package"
|
2003-02-20 14:05:58 -08:00
|
|
|
echo " --help Show this help message"
|
|
|
|
|
2003-03-02 14:05:51 -08:00
|
|
|
exit 0
|
2003-02-20 14:05:58 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Parse the input arguments
|
|
|
|
#
|
|
|
|
|
|
|
|
parse_arguments() {
|
|
|
|
for arg do
|
|
|
|
case "$arg" in
|
2003-08-13 19:32:34 +02:00
|
|
|
--add-tar) ADDTAR=1 ;;
|
2003-02-20 14:05:58 -08:00
|
|
|
--debug) DEBUG=1;;
|
|
|
|
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
|
|
|
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
2003-06-15 23:24:37 +03:00
|
|
|
--dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
|
2003-02-20 14:05:58 -08:00
|
|
|
--silent) SILENT=1 ;;
|
|
|
|
--tar) OUTTAR=1 ;;
|
2003-08-13 19:32:34 +02:00
|
|
|
--zip) OUTZIP=1 ;;
|
2003-02-20 14:05:58 -08:00
|
|
|
--help) show_usage ;;
|
2005-03-10 21:13:46 +01:00
|
|
|
*) abort "Unknown argument '$arg'"
|
2003-02-20 14:05:58 -08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
parse_arguments "$@"
|
|
|
|
|
2003-03-07 10:16:23 -08:00
|
|
|
#
|
|
|
|
# Assign the tmp directory if it was set from the environment variables
|
|
|
|
#
|
|
|
|
|
|
|
|
for i in $TMP $TMPDIR $TEMPDIR $TEMP /tmp
|
|
|
|
do
|
2003-08-13 16:36:01 +02:00
|
|
|
if [ "$i" ]; then
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug "Setting TMP to '$i'"
|
2003-08-13 16:36:01 +02:00
|
|
|
TMP=$i
|
2003-03-07 10:16:23 -08:00
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2003-08-13 16:36:01 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Convert argument file from unix to DOS text
|
2003-03-07 10:16:23 -08:00
|
|
|
#
|
|
|
|
|
2003-09-15 17:39:50 -04:00
|
|
|
unix_to_dos()
|
|
|
|
{
|
|
|
|
for arg do
|
|
|
|
print_debug "Replacing LF -> CRLF from '$arg'"
|
2003-09-04 12:56:02 -04:00
|
|
|
|
2004-10-27 21:59:34 +02:00
|
|
|
awk '{sub(/$/,"\r");print}' < $arg > $arg.tmp
|
2003-09-15 17:39:50 -04:00
|
|
|
rm -f $arg
|
|
|
|
mv $arg.tmp $arg
|
|
|
|
done
|
|
|
|
}
|
2003-08-13 16:36:01 +02:00
|
|
|
|
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
# Create a tmp dest directory to copy files
|
|
|
|
#
|
|
|
|
|
|
|
|
BASE=$TMP/my_win_dist$SUFFIX
|
|
|
|
|
|
|
|
if [ -d $BASE ] ; then
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug "Destination directory '$BASE' already exists, deleting it"
|
2003-02-20 14:05:58 -08:00
|
|
|
rm -r -f $BASE
|
|
|
|
fi
|
|
|
|
|
|
|
|
$CP -r $SOURCE/VC++Files $BASE
|
2005-03-10 21:13:46 +01:00
|
|
|
# This includes an implicit 'mkdir $BASE' !
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2003-09-15 17:39:50 -04:00
|
|
|
#
|
|
|
|
# Process version tags in InstallShield files
|
|
|
|
#
|
|
|
|
|
|
|
|
vreplace()
|
|
|
|
{
|
|
|
|
for arg do
|
|
|
|
unix_to_dos $arg
|
|
|
|
cat $arg | sed -e 's!@''VERSION''@!@VERSION@!' > $arg.tmp
|
|
|
|
rm -f $arg
|
|
|
|
mv $arg.tmp $arg
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2004-06-26 10:57:00 +03:00
|
|
|
if test -d $BASE/InstallShield
|
|
|
|
then
|
|
|
|
for d in 4.1.XX-gpl 4.1.XX-pro 4.1.XX-classic
|
|
|
|
do
|
|
|
|
cd $BASE/InstallShield/$d/String\ Tables/0009-English
|
|
|
|
vreplace value.shl
|
|
|
|
cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
|
|
|
|
vreplace infolist.txt
|
|
|
|
done
|
|
|
|
fi
|
2003-09-15 17:39:50 -04:00
|
|
|
|
2003-03-02 14:05:51 -08:00
|
|
|
#
|
|
|
|
# Move all error message files to root directory
|
|
|
|
#
|
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
$CP -r $SOURCE/sql/share $BASE/
|
2003-03-07 10:16:23 -08:00
|
|
|
rm -r -f "$BASE/share/Makefile"
|
|
|
|
rm -r -f "$BASE/share/Makefile.in"
|
|
|
|
rm -r -f "$BASE/share/Makefile.am"
|
2003-02-20 14:05:58 -08:00
|
|
|
|
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
2005-07-21 21:47:46 +02:00
|
|
|
mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
|
2003-02-20 14:05:58 -08:00
|
|
|
|
|
|
|
#
|
|
|
|
# Copy directory files
|
|
|
|
#
|
|
|
|
|
2003-06-15 23:24:37 +03:00
|
|
|
copy_dir_files()
|
|
|
|
{
|
2003-02-20 14:05:58 -08:00
|
|
|
for arg do
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug "Copying files from directory '$arg'"
|
2003-06-15 23:24:37 +03:00
|
|
|
cd $SOURCE/$arg
|
|
|
|
if [ ! -d $BASE/$arg ]; then
|
|
|
|
print_debug "Creating directory '$arg'"
|
|
|
|
mkdir $BASE/$arg
|
|
|
|
fi
|
2005-12-11 09:21:13 +01:00
|
|
|
for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \
|
2005-05-18 16:04:44 +02:00
|
|
|
README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
|
|
|
|
*.inc *.test *.result *.pem Moscow_leap des_key_file \
|
2005-08-04 10:08:55 -05:00
|
|
|
*.vcproj *.sln *.dat *.000001 *.require *.opt
|
2003-08-13 16:36:01 +02:00
|
|
|
do
|
|
|
|
if [ -f $i ]
|
2003-03-02 14:05:51 -08:00
|
|
|
then
|
|
|
|
$CP $SOURCE/$arg/$i $BASE/$arg/$i
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
for i in *.cc
|
|
|
|
do
|
|
|
|
if [ -f $i ]
|
|
|
|
then
|
|
|
|
i=`echo $i | sed 's/.cc$//g'`
|
|
|
|
$CP $SOURCE/$arg/$i.cc $BASE/$arg/$i.cpp
|
|
|
|
fi
|
|
|
|
done
|
2003-02-20 14:05:58 -08:00
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Copy directory contents recursively
|
|
|
|
#
|
|
|
|
|
|
|
|
copy_dir_dirs() {
|
|
|
|
|
|
|
|
for arg do
|
|
|
|
|
2003-08-13 16:36:01 +02:00
|
|
|
cd $SOURCE
|
|
|
|
(
|
|
|
|
find $arg -type d \
|
|
|
|
-and -not -path \*SCCS\* \
|
|
|
|
-and -not -path \*.deps\* \
|
2005-05-18 16:04:44 +02:00
|
|
|
-and -not -path \*.libs\* \
|
2003-08-13 16:36:01 +02:00
|
|
|
-and -not -path \*autom4te.cache -print
|
|
|
|
)|(
|
|
|
|
while read v
|
|
|
|
do
|
|
|
|
copy_dir_files $v
|
|
|
|
done
|
|
|
|
)
|
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Input directories to be copied
|
|
|
|
#
|
|
|
|
|
2006-03-01 21:10:30 +01:00
|
|
|
for i in client dbug extra storage/heap include storage/archive storage/csv \
|
2006-02-18 04:23:24 +01:00
|
|
|
include/mysql libmysql libmysqld storage/myisam storage/example \
|
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
2005-07-21 21:47:46 +02:00
|
|
|
storage/myisammrg mysys regex sql strings sql-common sql/examples \
|
2003-08-13 17:00:22 +02:00
|
|
|
tools vio zlib
|
2003-03-02 14:05:51 -08:00
|
|
|
do
|
|
|
|
copy_dir_files $i
|
|
|
|
done
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2004-11-10 00:03:01 +01:00
|
|
|
#
|
|
|
|
# Create project files for ndb
|
|
|
|
#
|
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
2005-07-21 21:47:46 +02:00
|
|
|
make -C $SOURCE/storage/ndb windoze
|
2004-11-10 00:03:01 +01:00
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
# Input directories to be copied recursively
|
|
|
|
#
|
|
|
|
|
2006-02-18 08:46:18 +01:00
|
|
|
for i in storage/bdb storage/innobase storage/ndb extra/yassl server-tools plugin
|
2003-03-02 14:05:51 -08:00
|
|
|
do
|
|
|
|
copy_dir_dirs $i
|
|
|
|
done
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2003-03-02 14:05:51 -08:00
|
|
|
#
|
|
|
|
# Create dummy innobase configure header
|
|
|
|
#
|
|
|
|
|
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
2005-07-21 21:47:46 +02:00
|
|
|
if [ -f $BASE/storage/innobase/ib_config.h ]; then
|
|
|
|
rm -f $BASE/storage/innobase/ib_config.h
|
2003-02-20 14:05:58 -08:00
|
|
|
fi
|
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
2005-07-21 21:47:46 +02:00
|
|
|
touch $BASE/storage/innobase/ib_config.h
|
2003-03-02 14:05:51 -08:00
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
|
|
|
|
#
|
|
|
|
# Copy miscellaneous files
|
|
|
|
#
|
|
|
|
|
|
|
|
cd $SOURCE
|
2004-08-05 17:05:11 +02:00
|
|
|
for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\
|
2003-02-20 14:05:58 -08:00
|
|
|
INSTALL-SOURCE INSTALL-WIN \
|
2003-06-24 12:10:35 +03:00
|
|
|
INSTALL-WIN-SOURCE \
|
2005-10-11 21:16:08 +02:00
|
|
|
Docs/INSTALL-BINARY Docs/manual.chm
|
2003-02-20 14:05:58 -08:00
|
|
|
do
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug "Copying file '$i'"
|
2003-08-13 16:36:01 +02:00
|
|
|
if [ -f $i ]
|
2003-02-20 14:05:58 -08:00
|
|
|
then
|
2003-03-02 14:05:51 -08:00
|
|
|
$CP $i $BASE/$i
|
2003-02-20 14:05:58 -08:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2004-12-14 01:54:16 +02:00
|
|
|
cp extra/sql_state.h extra/mysqld_error.h $BASE/include
|
|
|
|
|
2004-06-25 18:54:43 +03:00
|
|
|
#
|
|
|
|
# support files
|
|
|
|
#
|
|
|
|
mkdir $BASE/support-files
|
2004-10-05 14:42:15 +02:00
|
|
|
|
|
|
|
# Rename the cnf files to <file>.ini
|
|
|
|
for i in support-files/*.cnf
|
|
|
|
do
|
|
|
|
i=`echo $i | sed 's/.cnf$//g'`
|
|
|
|
cp $i.cnf $BASE/$i.ini
|
|
|
|
done
|
2004-06-25 18:54:43 +03:00
|
|
|
|
2003-08-13 04:52:03 +02:00
|
|
|
#
|
|
|
|
# Raw dirs from source tree
|
|
|
|
#
|
|
|
|
|
2005-03-09 01:34:22 +01:00
|
|
|
for i in scripts sql-bench mysql-test SSL tests
|
2003-08-13 04:52:03 +02:00
|
|
|
do
|
|
|
|
print_debug "Copying directory '$i'"
|
|
|
|
if [ -d $i ]
|
|
|
|
then
|
2005-03-10 21:13:46 +01:00
|
|
|
if [ -d $BASE/$i ]
|
|
|
|
then
|
|
|
|
$CP -R $i $BASE
|
|
|
|
else
|
|
|
|
$CP -R $i $BASE/$i
|
|
|
|
fi
|
2003-08-13 04:52:03 +02:00
|
|
|
fi
|
2005-05-18 16:04:44 +02:00
|
|
|
# But remove object files from destination
|
|
|
|
find $BASE/$i -type f -name \*.o | xargs rm -f
|
2003-08-13 04:52:03 +02:00
|
|
|
done
|
|
|
|
|
2003-05-06 06:20:16 +03:00
|
|
|
#
|
2004-05-28 00:03:19 +03:00
|
|
|
# Fix some windows files to avoid compiler warnings
|
2003-05-06 06:20:16 +03:00
|
|
|
#
|
|
|
|
|
2004-05-28 00:03:19 +03:00
|
|
|
./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' > $BASE/sql/sql_yacc.cpp-new
|
|
|
|
mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
|
|
|
|
|
2004-10-27 21:59:34 +02:00
|
|
|
#
|
|
|
|
# Search the tree for plain text files and adapt the line end marker
|
|
|
|
#
|
2005-12-11 09:21:13 +01:00
|
|
|
find $BASE \( -name "*.cnf" -o -name "*.ini" \
|
2005-08-06 03:10:35 +02:00
|
|
|
-o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \
|
|
|
|
-o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
|
2005-08-04 10:08:55 -05:00
|
|
|
-o -name "*.vcproj" -o -name "*.sln" \) -type f -print \
|
2004-10-27 21:59:34 +02:00
|
|
|
| while read v
|
|
|
|
do
|
|
|
|
unix_to_dos $v
|
|
|
|
done
|
|
|
|
# File extension '.txt' matches too many other files, error messages etc.
|
|
|
|
unix_to_dos $BASE/Docs/*.txt
|
|
|
|
|
2003-08-13 16:36:01 +02:00
|
|
|
mv $BASE/README $BASE/README.txt
|
|
|
|
|
2003-12-08 12:25:37 +02:00
|
|
|
#
|
|
|
|
# Clean up if we did this from a bk tree
|
|
|
|
#
|
|
|
|
|
|
|
|
if [ -d $BASE/SSL/SCCS ]
|
|
|
|
then
|
2004-06-25 18:49:36 +03:00
|
|
|
find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
|
2003-12-08 12:25:37 +02:00
|
|
|
fi
|
2005-06-28 05:25:29 +02:00
|
|
|
find $BASE/ -type d -name .deps -printf " \"%p\"" | xargs rm -r -f
|
|
|
|
find $BASE/ -type d -name .libs -printf " \"%p\"" | xargs rm -r -f
|
|
|
|
rm -r -f "$BASE/mysql-test/var"
|
2003-12-08 12:25:37 +02:00
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
2003-03-02 14:05:51 -08:00
|
|
|
# Initialize the initial data directory
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
|
2003-08-13 16:36:01 +02:00
|
|
|
if [ -f scripts/mysql_install_db ]; then
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug "Initializing the 'data' directory"
|
2003-06-15 23:24:37 +03:00
|
|
|
scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data
|
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
VC++Files/bdb/bdb.dsp:
Small, automatic changes
VC++Files/client/mysql.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
Automatic changes
VC++Files/dbug/dbug.dsp:
Automatic changes
VC++Files/heap/heap.dsp:
automatic changes
VC++Files/innobase/innobase.dsp:
Automatic changes
VC++Files/isam/isam.dsp:
Automatic changes
VC++Files/isamchk/isamchk.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Add missing files
VC++Files/libmysqld/libmysqld.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
Automatic changes
VC++Files/merge/merge.dsp:
Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
automatic changes
VC++Files/myisamchk/myisamchk.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
Automatic changes
VC++Files/mysys/mysys.dsp:
Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
Automatic changes
VC++Files/replace/replace.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
Automatic changes
VC++Files/thr_test/thr_test.dsp:
Automatic changes
VC++Files/vio/vio.dsp:
Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
Automatic changes
VC++Files/zlib/zlib.dsp:
Automatic changes
extra/my_print_defaults.c:
Fixed bug in --verbose
include/m_string.h:
Portability fix
include/mysql_embed.h:
Better setting of server_version variable
include/mysql_version.h.in:
Better license text handling
innobase/pars/pars0lex.l:
Remove compiler warnings
innobase/trx/trx0sys.c:
Remove compiler warnings
libmysqld/lib_sql.cc:
Better setting of server_version variable
libmysqld/libmysqld.def:
Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
Remove compiler warnings
mysys/sha1.c:
Remove compiler warnings
scripts/make_win_src_distribution.sh:
Safety fix
scripts/mysql_install_db.sh:
Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
Add new file mysqld_suffix.h
Remove not used file sql_olap.h
sql/ha_innodb.cc:
Remove not used variable
sql/mysqld.cc:
Better setting of server_version variable
sql/set_var.cc:
Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
Remove compiler warnings
2004-05-19 16:38:12 +03:00
|
|
|
if test "$?" = 1
|
|
|
|
then
|
|
|
|
exit 1;
|
|
|
|
fi
|
2003-03-02 14:05:51 -08:00
|
|
|
fi
|
|
|
|
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
# Specify the distribution package name and copy it
|
|
|
|
#
|
|
|
|
|
2003-06-15 23:24:37 +03:00
|
|
|
if test -z $DIRNAME
|
|
|
|
then
|
|
|
|
NEW_DIR_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version$SUFFIX
|
|
|
|
else
|
|
|
|
NEW_DIR_NAME=$DIRNAME
|
|
|
|
fi
|
2003-03-07 10:16:23 -08:00
|
|
|
NEW_NAME=$NEW_DIR_NAME-win-src
|
|
|
|
|
|
|
|
BASE2=$TMP/$NEW_DIR_NAME
|
2003-02-20 14:05:58 -08:00
|
|
|
rm -r -f $BASE2
|
|
|
|
mv $BASE $BASE2
|
|
|
|
BASE=$BASE2
|
|
|
|
|
|
|
|
#
|
|
|
|
# If debugging, don't create a zip/tar/gz
|
|
|
|
#
|
|
|
|
|
2003-03-07 10:16:23 -08:00
|
|
|
if [ "$DEBUG" = "1" ] ; then
|
2003-02-20 14:05:58 -08:00
|
|
|
echo "Please check the distribution files from $BASE"
|
|
|
|
echo "Exiting (without creating the package).."
|
|
|
|
exit
|
|
|
|
fi
|
|
|
|
|
|
|
|
#
|
|
|
|
# This is needed to prefere gnu tar instead of tar because tar can't
|
|
|
|
# always handle long filenames
|
|
|
|
#
|
|
|
|
|
|
|
|
PATH_DIRS=`echo $PATH | sed -e 's/^:/. /' -e 's/:$/ ./' -e 's/::/ . /g' -e 's/:/ /g' `
|
|
|
|
which_1 ()
|
|
|
|
{
|
|
|
|
for cmd
|
|
|
|
do
|
|
|
|
for d in $PATH_DIRS
|
|
|
|
do
|
|
|
|
for file in $d/$cmd
|
|
|
|
do
|
|
|
|
if test -x $file -a ! -d $file
|
|
|
|
then
|
|
|
|
echo $file
|
|
|
|
exit 0
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
done
|
|
|
|
done
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
2003-03-02 14:05:51 -08:00
|
|
|
# Create the result zip/tar file
|
2003-02-20 14:05:58 -08:00
|
|
|
#
|
|
|
|
|
2003-09-04 12:56:02 -04:00
|
|
|
if [ "$OUTTAR" = "0" ]; then
|
|
|
|
if [ "$OUTZIP" = "0" ]; then
|
|
|
|
OUTZIP=1
|
|
|
|
fi
|
2003-08-13 19:32:34 +02:00
|
|
|
fi
|
|
|
|
|
2003-08-13 16:36:01 +02:00
|
|
|
set_tarzip_options()
|
2003-03-02 14:05:51 -08:00
|
|
|
{
|
2003-08-13 16:36:01 +02:00
|
|
|
for arg
|
2003-03-02 14:05:51 -08:00
|
|
|
do
|
2003-03-07 10:16:23 -08:00
|
|
|
if [ "$arg" = "tar" ]; then
|
2003-03-02 14:05:51 -08:00
|
|
|
ZIPFILE1=gnutar
|
|
|
|
ZIPFILE2=gtar
|
|
|
|
OPT=cvf
|
|
|
|
EXT=".tar"
|
|
|
|
NEED_COMPRESS=1
|
2003-03-07 10:16:23 -08:00
|
|
|
if [ "$SILENT" = "1" ] ; then
|
2003-03-02 14:05:51 -08:00
|
|
|
OPT=cf
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
ZIPFILE1=zip
|
|
|
|
ZIPFILE2=""
|
2003-06-24 12:10:35 +03:00
|
|
|
OPT="-r"
|
2003-03-02 14:05:51 -08:00
|
|
|
EXT=".zip"
|
|
|
|
NEED_COMPRESS=0
|
2003-03-07 10:16:23 -08:00
|
|
|
if [ "$SILENT" = "1" ] ; then
|
2003-06-15 23:24:37 +03:00
|
|
|
OPT="$OPT -q"
|
2003-03-02 14:05:51 -08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# Create the archive
|
|
|
|
#
|
2003-08-13 19:32:34 +02:00
|
|
|
create_archive()
|
|
|
|
{
|
2003-03-02 14:05:51 -08:00
|
|
|
|
2003-08-13 19:32:34 +02:00
|
|
|
print_debug "Using $tar to create archive"
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2003-08-13 19:32:34 +02:00
|
|
|
cd $TMP
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2003-08-13 19:32:34 +02:00
|
|
|
rm -f $SOURCE/$NEW_NAME$EXT
|
|
|
|
$tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME
|
|
|
|
cd $SOURCE
|
2003-02-20 14:05:58 -08:00
|
|
|
|
2003-08-13 19:32:34 +02:00
|
|
|
if [ "$NEED_COMPRESS" = "1" ]
|
|
|
|
then
|
|
|
|
print_debug "Compressing archive"
|
|
|
|
gzip -9 $NEW_NAME$EXT
|
|
|
|
EXT="$EXT.gz"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "$SILENT" = "0" ] ; then
|
|
|
|
echo "$NEW_NAME$EXT created successfully !!"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
if [ "$OUTTAR" = "1" ]; then
|
|
|
|
set_tarzip_options 'tar'
|
|
|
|
|
|
|
|
tar=`which_1 $ZIPFILE1 $ZIPFILE2`
|
|
|
|
if test "$?" = "1" -o "$tar" = ""
|
|
|
|
then
|
|
|
|
print_debug "Search failed for '$ZIPFILE1', '$ZIPFILE2', using default 'tar'"
|
|
|
|
tar=tar
|
|
|
|
set_tarzip_options 'tar'
|
|
|
|
fi
|
|
|
|
|
|
|
|
create_archive
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "$OUTZIP" = "1" ]; then
|
|
|
|
set_tarzip_options 'zip'
|
|
|
|
|
|
|
|
tar=`which_1 $ZIPFILE1 $ZIPFILE2`
|
|
|
|
if test "$?" = "1" -o "$tar" = ""
|
|
|
|
then
|
|
|
|
echo "Search failed for '$ZIPFILE1', '$ZIPFILE2', cannot create zip!"
|
|
|
|
fi
|
|
|
|
|
|
|
|
create_archive
|
2003-02-20 14:05:58 -08:00
|
|
|
fi
|
|
|
|
|
2003-03-07 10:16:23 -08:00
|
|
|
print_debug "Removing temporary directory"
|
2003-02-20 14:05:58 -08:00
|
|
|
rm -r -f $BASE
|
|
|
|
|
|
|
|
# End of script
|