Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Followup to bug 298670 - use cygpath as necessary to convert win32 paths for xpt_link, a=Chase

Browse Source
This commit is contained in:
bsmedberg%covad.net 2005-07-01 01:18:49 +00:00
parent 47ec6b7088
commit 829fcc5862
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/installer/packager.mk
View File

@ -203,7 +203,7 @@ ifdef MOZ_PKG_MANIFEST
$(RM) -rf $(DIST)/xpt
$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
Packager::Copy("$(DIST)", "$(DIST)/$(MOZ_PKG_APPNAME)", \
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 10);'
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1);'
$(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -o $(PKGCP_OS)
else # !MOZ_PKG_MANIFEST
ifeq ($(MOZ_PKG_FORMAT),DMG)

4
xpinstall/packager/Packager.pm
View File

@ -258,8 +258,6 @@ sub do_copyfile
}
} else {
if ( $dirflag ) { # directory copy, no altdest
print ("XXXBsmedberg: copying '$destpathcomp', '$File::Find::name'\n");
my $destfile = $File::Find::name;
if ($os eq "MSDOS") {
$destfile =~ s|\\|/|;
@ -268,8 +266,6 @@ sub do_copyfile
($destname, $destpath, $destsuffix) = fileparse("$destpathcomp/$destfile", '\..*?$');
print ("XXXXbsmedberg: destpath = '$destpath' srcdir='$srcdir'\n");
($debug >= 5) &&
print " dir copy w/o altdest: $destpath $destname $destsuffix\n";
} else { # single file copy, no altdest

20
xpinstall/packager/xptlink.pl
View File

@ -125,14 +125,14 @@ foreach my $component (@xptdirs) {
foreach my $file (@files) {
($debug >= 6) && print "$file\n";
if ( $file =~ /\.xpt$/ ) {
push @xptfiles, "$destdir/$component/$bindir"."components/$file";
push @xptfiles, "$destdir/$component/$bindir"."components/$file";
($debug >= 8) && print "xptfiles:\t@xptfiles\n";
}
}
closedir (COMPDIR);
# merge .xpt files into one if we found any in the dir
if ( $#xptfiles ) {
if ( scalar(@xptfiles) ) {
my ($merged, $fmerged);
if ($finaldir ne "") {
$merged = "$finaldir/$component.xpt";
@ -142,7 +142,21 @@ foreach my $component (@xptdirs) {
$merged = $fmerged.".new";
}
my $cmdline = "$srcdir/bin/xpt_link $merged @xptfiles";
my @realxptfiles;
my $realmerged;
if ($os eq "MSDOS") {
@realxptfiles = map {my $file = `cygpath -t mixed $_`;
chomp $file;
$file} @xptfiles;
$realmerged = `cygpath -t mixed $merged`;
chomp $realmerged;
}
else {
@realxptfiles = @xptfiles;
$realmerged = $merged;
}
my $cmdline = "$srcdir/bin/xpt_link $realmerged @realxptfiles";
($debug >= 4) && print "$cmdline\n";
system($cmdline) == 0 || die ("'$cmdline' failed");