mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
make_win_src_distribution.sh:
Add --zip option for finer grain control over what package formats are created Bootstrap: Create both Windows source packages Build-tools/Bootstrap: Create both Windows source packages scripts/make_win_src_distribution.sh: Add --zip option for finer grain control over what package formats are created
This commit is contained in:
@ -329,7 +329,7 @@ $command= "make dist";
|
|||||||
if ($opt_win_dist)
|
if ($opt_win_dist)
|
||||||
{
|
{
|
||||||
&logger ("Creating Windows source package");
|
&logger ("Creating Windows source package");
|
||||||
$command= "./scripts/make_win_src_distribution";
|
$command= "./scripts/make_win_src_distribution --tar --zip";
|
||||||
&run_command($command, "make_win_src_distribution failed!");
|
&run_command($command, "make_win_src_distribution failed!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ SILENT=0
|
|||||||
SUFFIX=""
|
SUFFIX=""
|
||||||
DIRNAME=""
|
DIRNAME=""
|
||||||
OUTTAR=0
|
OUTTAR=0
|
||||||
|
OUTZIP=0
|
||||||
|
|
||||||
#
|
#
|
||||||
# This script must run from MySQL top directory
|
# This script must run from MySQL top directory
|
||||||
@ -62,7 +63,8 @@ show_usage()
|
|||||||
echo " --suffix Suffix name for the package"
|
echo " --suffix Suffix name for the package"
|
||||||
echo " --dirname Directory name to copy files (intermediate)"
|
echo " --dirname Directory name to copy files (intermediate)"
|
||||||
echo " --silent Do not list verbosely files processed"
|
echo " --silent Do not list verbosely files processed"
|
||||||
echo " --tar Create tar.gz package instead of .zip"
|
echo " --tar Create tar.gz package"
|
||||||
|
echo " --zip Create zip package"
|
||||||
echo " --help Show this help message"
|
echo " --help Show this help message"
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
@ -75,12 +77,14 @@ show_usage()
|
|||||||
parse_arguments() {
|
parse_arguments() {
|
||||||
for arg do
|
for arg do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
|
--add-tar) ADDTAR=1 ;;
|
||||||
--debug) DEBUG=1;;
|
--debug) DEBUG=1;;
|
||||||
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
||||||
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
||||||
--dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
|
--dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
|
||||||
--silent) SILENT=1 ;;
|
--silent) SILENT=1 ;;
|
||||||
--tar) OUTTAR=1 ;;
|
--tar) OUTTAR=1 ;;
|
||||||
|
--zip) OUTZIP=1 ;;
|
||||||
--help) show_usage ;;
|
--help) show_usage ;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown argument '$arg'"
|
echo "Unknown argument '$arg'"
|
||||||
@ -359,6 +363,10 @@ which_1 ()
|
|||||||
# Create the result zip/tar file
|
# Create the result zip/tar file
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if [ [ "$OUTTAR" = "0" ] && [ "$OUTZIP" = "0" ] ]; then
|
||||||
|
OUTZIP=1
|
||||||
|
fi
|
||||||
|
|
||||||
set_tarzip_options()
|
set_tarzip_options()
|
||||||
{
|
{
|
||||||
for arg
|
for arg
|
||||||
@ -385,43 +393,60 @@ set_tarzip_options()
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "$OUTTAR" = "1" ]; then
|
|
||||||
set_tarzip_options 'tar'
|
|
||||||
else
|
|
||||||
set_tarzip_options 'zip'
|
|
||||||
fi
|
|
||||||
|
|
||||||
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 the archive
|
# Create the archive
|
||||||
#
|
#
|
||||||
|
create_archive()
|
||||||
|
{
|
||||||
|
|
||||||
print_debug "Using $tar to create archive"
|
print_debug "Using $tar to create archive"
|
||||||
|
|
||||||
cd $TMP
|
cd $TMP
|
||||||
|
|
||||||
rm -f $SOURCE/$NEW_NAME$EXT
|
rm -f $SOURCE/$NEW_NAME$EXT
|
||||||
$tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME
|
$tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME
|
||||||
cd $SOURCE
|
cd $SOURCE
|
||||||
|
|
||||||
if [ "$NEED_COMPRESS" = "1" ]
|
if [ "$NEED_COMPRESS" = "1" ]
|
||||||
then
|
then
|
||||||
print_debug "Compressing archive"
|
print_debug "Compressing archive"
|
||||||
gzip -9 $NEW_NAME$EXT
|
gzip -9 $NEW_NAME$EXT
|
||||||
EXT="$EXT.gz"
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
print_debug "Removing temporary directory"
|
print_debug "Removing temporary directory"
|
||||||
rm -r -f $BASE
|
rm -r -f $BASE
|
||||||
|
|
||||||
if [ "$SILENT" = "0" ] ; then
|
|
||||||
echo "$NEW_NAME$EXT created successfully !!"
|
|
||||||
fi
|
|
||||||
# End of script
|
# End of script
|
||||||
|
Reference in New Issue
Block a user