Commit be66b2e1 authored by unknown's avatar unknown

- Polished mysql-copyright a bit and added call to remove

   cmd-line-utils/readline from the commercial distribution
 - fixed some copyright headers so mysql-copyright can process them


Build-tools/mysql-copyright:
   - remove the cmd-line-utils/readline directory from the commercial
     distribution
   - make use of more builtin Perl functions instead of forking 
     subprocesses
include/my_pthread.h:
   - fixed copyright header
sql/filesort.cc:
   - fixed copyright header
sql/gen_lex_hash.cc:
   - fixed copyright header
sql/item.h:
   - fixed copyright header
sql/item_cmpfunc.cc:
   - fixed copyright header
sql/records.cc:
   - fixed copyright header
parent dc9043c6
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
# Untar a MySQL distribution, change the copyright texts, # Untar a MySQL distribution, change the copyright texts,
# pack it up again to a given directory # pack it up again to a given directory
$VER="1.2"; $VER="1.3";
use Cwd;
use File::Basename;
use File::Copy;
use Getopt::Long; use Getopt::Long;
$opt_help = 0; $opt_help = 0;
...@@ -17,8 +20,7 @@ GetOptions("help","version","target=s") || error(); ...@@ -17,8 +20,7 @@ GetOptions("help","version","target=s") || error();
# fix the directory prefix for target dir # fix the directory prefix for target dir
$WD= `pwd`; $WD= cwd();
chop $WD;
$opt_target= $WD . '/' . $opt_target; $opt_target= $WD . '/' . $opt_target;
&main(); &main();
...@@ -73,11 +75,11 @@ sub main ...@@ -73,11 +75,11 @@ sub main
$newdistname= $1."com".$2.$3; $newdistname= $1."com".$2.$3;
} }
# find out the extract path (should be same as distname!) # find out the extract path (should be same as distname!)
$destdir= `tar tvzf ../$distfile | head -1`; chomp($destdir= `tar ztf ../$distfile | head -1`);
# remove leading crab # remove slash from the end
$destdir =~ s/.*\d+:\d+:\d+[ ]//; $destdir= substr($destdir, 0, -1);
# remove newline and slash from the end print "destdir: $destdir\n";
$destdir= substr($destdir, 0, -2); print "distname: $distname\n";
if ("$destdir" ne "$distname") if ("$destdir" ne "$distname")
{ {
...@@ -96,15 +98,18 @@ sub main ...@@ -96,15 +98,18 @@ sub main
# remove the 'PUBLIC' file from distribution and copy MySQLEULA.txt # remove the 'PUBLIC' file from distribution and copy MySQLEULA.txt
# on the toplevel of the directory instead. file 'PUBLIC' shouldn't # on the toplevel of the directory instead. file 'PUBLIC' shouldn't
# exist in the new mysql distributions, but let's be sure.. # exist in the new mysql distributions, but let's be sure..
`rm -f $destdir/PUBLIC $destdir/README`; unlink("$destdir/PUBLIC", "$destdir/README");
`cp -p $WD/Docs/MySQLEULA.txt $destdir/`; copy("$WD/Docs/MySQLEULA.txt", "$destdir");
# remove readline subdir
`rm -rf $destdir/cmd-line-utils/readline`;
# fix file copyrights # fix file copyrights
&fix_usage_copyright(); &fix_usage_copyright();
&add_copyright(); &add_copyright();
# rename the directory with new distribution name # rename the directory with new distribution name
`mv -f $destdir $newdistname`; rename($destdir, $newdistname);
# tar the new distribution # tar the new distribution
`tar cz -f $opt_target/$newdistname.tar.gz *`; `tar cz -f $opt_target/$newdistname.tar.gz *`;
......
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
......
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
......
...@@ -430,18 +430,9 @@ int main(int argc,char **argv) ...@@ -430,18 +430,9 @@ int main(int argc,char **argv)
exit(1); exit(1);
printf("/* Copyright (C) 2001 MySQL AB\n\ printf("/* Copyright (C) 2001 MySQL AB\n\
This program is free software; you can redistribute it and/or modify\n\ This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
it under the terms of the GNU General Public License as published by\n\ and you are welcome to modify and redistribute it under the GPL license\n\
the Free Software Foundation; either version 2 of the License, or\n\ \n*/\n\n");
(at your option) any later version.\n\n\
This program is distributed in the hope that it will be useful,\n\
but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
GNU General Public License for more details.\n\n\
You should have received a copy of the GNU General Public License\n\
along with this program; if not, write to the Free Software\n\
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307\
USA */\n\n");
printf("/* This code is generated by gen_lex_hash.cc that seeks for\ printf("/* This code is generated by gen_lex_hash.cc that seeks for\
a perfect\nhash function */\n\n"); a perfect\nhash function */\n\n");
......
/* Copyright (C) 2000-2003 /* Copyright (C) 2000-2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
/* Copyright (C) 2000-2003 /* Copyright (C) 2000-2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
......
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