Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-landing bug 289461, now that we've figured out the creature problem: AS perl doesn't like the file-open mode "+>>". This version separates the read and append bits into two pieces, r=Hixie for the changes.

Browse Source
This commit is contained in:
bsmedberg%covad.net 2005-04-15 12:31:49 +00:00
parent a53716e16d
commit e47d9accae
1 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
config/make-jars.pl
View File

@ -31,6 +31,7 @@ use Time::localtime;
use File::Copy;
use File::Path;
use File::Spec;
use File::Basename;
use IO::File;
use Config;
require mozLock;
@ -294,6 +295,50 @@ sub _moz_abs2rel
return File::Spec->abs2rel($target, $linkname);
}
sub UniqIt
{
my $manifest = shift;
return if (scalar(@_) == 0); # no entries, don't bother
my %lines = map { $_ => 1 } @_;
my $lockfile = "$manifest.lck";
print "+++ updating chrome $manifest\n";
my $dir = dirname($manifest);
mkpath($dir, 0, 0755);
mozLock($lockfile) if (!$nofilelocks);
if (-f $manifest) {
unless (open(FILE, "<$manifest")) {
mozUnlock($lockfile) if (!$nofilelocks);
die "error: can't open $manifest: $!";
};
# Read through the file: if the lines already exist, no need to write
# them again.
while (defined($_ = <FILE>)) {
chomp;
delete $lines{$_};
}
}
close(FILE);
unless (open(FILE, ">>$manifest")) {
mozUnlock($lockfile) if (!$nofilelocks);
die "error: can't open $manifest: $!";
};
print FILE map("$_\n", keys(%lines));
close(FILE) or my $err = 1;
mozUnlock($lockfile) if (!$nofilelocks);
if ($err) {
die "error: can't close $manifest: $!";
}
}
sub RegIt
{
my ($chromeDir, $jarFileName, $chromeType, $pkgName) = @_;\
@ -307,58 +352,7 @@ sub RegIt
$line = "$chromeType,install,url,jar:resource:/chrome/$jarFileName.jar!/$chromeType/$pkgName/";
}
my $installedChromeFile = "$chromeDir/installed-chrome.txt";
my $lockfile = "$installedChromeFile.lck";
mozLock($lockfile) if (!$nofilelocks);
my $err = 0;
if (open(FILE, "<$installedChromeFile")) {
while (<FILE>) {
chomp;
if ($_ eq $line) {
# line already appears in installed-chrome.txt file
# just update the mod date
close(FILE) or $err = 1;
if ($err) {
mozUnlock($lockfile) if (!$nofilelocks);
die "error: can't close $installedChromeFile: $!";
}
my $now = time;
utime($now, $now, $installedChromeFile) or $err = 1;
mozUnlock($lockfile) if (!$nofilelocks);
if ($err) {
die "couldn't touch $installedChromeFile";
}
print "+++ updating chrome $installedChromeFile\n+++\t$line\n";
return;
}
}
close(FILE) or $err = 1;
if ($err) {
mozUnlock($lockfile) if (!$nofilelocks);
die "error: can't close $installedChromeFile: $!";
}
}
mozUnlock($lockfile) if (!$nofilelocks);
my $dir = $installedChromeFile;
if ("$dir" =~ /([\w\d.\-\\\/\+]+)[\\\/]([\w\d.\-]+)/) {
$dir = $1;
}
mkpath($dir, 0, 0755);
mozLock($lockfile) if (!$nofilelocks);
$err = 0;
open(FILE, ">>$installedChromeFile") or $err = 1;
if ($err) {
mozUnlock($lockfile) if (!$nofilelocks);
die "can't open $installedChromeFile: $!";
}
print FILE "$line\n";
close(FILE) or $err = 1;
mozUnlock($lockfile) if (!$nofilelocks);
if ($err) {
die "error: can't close $installedChromeFile: $!";
}
print "+++ adding chrome $installedChromeFile\n+++\t$line\n";
UniqIt($installedChromeFile, $line);
}
sub EnsureFileInDir
@ -492,6 +486,8 @@ start:
my $args = "";
my $overrides = "";
my $cwd = cwd();
my @manifestLines;
print "+++ making chrome $cwd => $chromeDir/$jarfile.jar\n";
while (defined($_ = shift @gLines)) {
if (/^\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
@ -529,14 +525,26 @@ start:
my $pkg_name = $2;
RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
}
} elsif (/^\%\s+(.*)$/) {
my $path = $1;
if ($fileformat eq "flat" || $fileformat eq "symlink") {
$path =~ s|\%|$jarfile/$0|;
} else {
$path =~ s|\%|jar:$jarfile.jar!/$1|;
}
push @manifestLines, $path;
} elsif (/^\s*$/) {
# end with blank line
last;
} else {
UniqIt("$chromeDir/$jarfile.manifest", @manifestLines);
JarIt($chromeDir, $jarfile, $args, $overrides);
goto start;
}
}
UniqIt("$chromeDir/$jarfile.manifest", @manifestLines);
JarIt($chromeDir, $jarfile, $args, $overrides);
} elsif (/^\s*\#.*$/) {