1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into here.mwagner.org:/Volumes/BK/mysql-4.1
This commit is contained in:
unknown 2004-06-23 15:39:51 -05:00
commit dc52522791
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -116,6 +116,7 @@ mskold@mysql.com
msvensson@build.mysql.com msvensson@build.mysql.com
mwagner@cash.mwagner.org mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
mwagner@here.mwagner.org
mwagner@work.mysql.com mwagner@work.mysql.com
mydev@mysql.com mydev@mysql.com
mysql@home.(none) mysql@home.(none)

61
Build-tools/mysql-copyright
View File

@ -102,27 +102,13 @@ sub main
# exist in the new mysql distributions, but let's be sure.. # exist in the new mysql distributions, but let's be sure..
unlink("$destdir/PUBLIC", "$destdir/README"); unlink("$destdir/PUBLIC", "$destdir/README");
copy("$WD/Docs/MySQLEULA.txt", "$destdir"); copy("$WD/Docs/MySQLEULA.txt", "$destdir");
# remove readline subdir and update configure accordingly # remove readline, bdb subdirs and update 'configure'
system("rm -rf $destdir/cmd-line-utils/readline"); my @extra_fat= ('bdb', 'cmd-line-utils/readline');
if ($win_flag) {
chdir("$destdir") or (print "$! Unable to change directory to $desdir!\n" && exit(0)); foreach my $fat (@extra_fat)
} else { {
chdir("$destdir"); &trim_the_fat($fat);
unlink ("configure") or die "Can't delete $destdir/configure: $!\n";
open(CONFIGURE,"<configure.in") or die "$! Unable to open configure.in to read from!\n";
undef $/;
my $configure = <CONFIGURE>;
close(CONFIGURE);
$configure =~ s|cmd\-line\-utils/readline/Makefile dnl\n?||g;
open(CONFIGURE,">configure.in") or die "$! Unable to open configure.in to write to!\n";
print CONFIGURE $configure;
close(CONFIGURE);
`autoconf`;
if (! -f "configure") {
print "\"./configure\" was not produced, exiting!\n";
exit(0);
}
} }
# fix file copyrights # fix file copyrights
@ -154,6 +140,39 @@ sub main
exit(0); exit(0);
} }
####
#### This function will remove unwanted parts of a src tree for the mysqlcom
#### distributions.
####
sub trim_the_fat
{
my $the_fat= shift;
my $cwd= getcwd();
system("rm -rf $destdir/${the_fat}");
if ($win_flag)
{
chdir("$destdir") or die "Unable to change directory to $destdir!: $!\n";
}
else
{
chdir("$destdir");
unlink ("configure") or die "Can't delete $destdir/configure: $!\n";
open(CONFIGURE,"<configure.in") or die "Unable to open configure.in for read: $!\n";
undef $/;
my $configure= <CONFIGURE>;
close(CONFIGURE);
$configure=~ s|${the_fat}/Makefile dnl\n?||g;
open(CONFIGURE,">configure.in") or die "Unable to open configure.in for write: $!\n";
print CONFIGURE $configure;
close(CONFIGURE);
`autoconf`;
die "'./configure' was not produced!" unless (-f "configure");
chdir("$cwd");
}
}
#### ####
#### mysqld and MySQL client programs have a usage printed with --help. #### mysqld and MySQL client programs have a usage printed with --help.
#### This usage includes a copyright, which needs to be modified #### This usage includes a copyright, which needs to be modified