Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
This commit is contained in:
commit
b817b007f9
@ -115,6 +115,9 @@ sub main
|
|||||||
# fix file copyrights
|
# fix file copyrights
|
||||||
&fix_usage_copyright();
|
&fix_usage_copyright();
|
||||||
&add_copyright();
|
&add_copyright();
|
||||||
|
|
||||||
|
# fix LICENSE tag in include/mysql_version.h
|
||||||
|
&fix_mysql_version();
|
||||||
|
|
||||||
# rename the directory with new distribution name
|
# rename the directory with new distribution name
|
||||||
chdir("$WD/$dir");
|
chdir("$WD/$dir");
|
||||||
@ -141,6 +144,28 @@ sub main
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
####
|
||||||
|
#### This function will s/GPL/Commercial/ in include/mysql_version.h for the
|
||||||
|
#### LICENSE tag.
|
||||||
|
####
|
||||||
|
sub fix_mysql_version
|
||||||
|
{
|
||||||
|
chdir("$destdir");
|
||||||
|
my $header_file= (-f 'include/mysql_version.h.in')? 'include/mysql_version.h.in' : 'include/mysql_version.h';
|
||||||
|
|
||||||
|
open(MYSQL_VERSION,"<$header_file") or die "Unable to open include/mysql_version.h for read: $!\n";
|
||||||
|
undef $/;
|
||||||
|
my $mysql_version= <MYSQL_VERSION>;
|
||||||
|
close(MYSQL_VERSION);
|
||||||
|
|
||||||
|
$mysql_version=~ s/\#define LICENSE[\s\t]+GPL/#define LICENSE Commercial/;
|
||||||
|
|
||||||
|
open(MYSQL_VERSION,">$header_file") or die "Unable to open include/mysql_version.h for write: $!\n";
|
||||||
|
print MYSQL_VERSION $mysql_version;
|
||||||
|
close(MYSQL_VERSION);
|
||||||
|
chdir("$cwd");
|
||||||
|
}
|
||||||
|
|
||||||
####
|
####
|
||||||
#### This function will remove unwanted parts of a src tree for the mysqlcom
|
#### This function will remove unwanted parts of a src tree for the mysqlcom
|
||||||
#### distributions.
|
#### distributions.
|
||||||
@ -151,11 +176,7 @@ sub trim_the_fat
|
|||||||
my $cwd= getcwd();
|
my $cwd= getcwd();
|
||||||
|
|
||||||
system("rm -rf $destdir/${the_fat}");
|
system("rm -rf $destdir/${the_fat}");
|
||||||
if ($win_flag)
|
if (!$win_flag)
|
||||||
{
|
|
||||||
chdir("$destdir") or die "Unable to change directory to $destdir!: $!\n";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
chdir("$destdir");
|
chdir("$destdir");
|
||||||
unlink ("configure") or die "Can't delete $destdir/configure: $!\n";
|
unlink ("configure") or die "Can't delete $destdir/configure: $!\n";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user