Skip to content

Commit

Permalink
Fix xulapp generation broken by changes required by wxi
Browse files Browse the repository at this point in the history
  • Loading branch information
prefiks committed Feb 13, 2013
1 parent 765cfa7 commit 5e15200
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tools/perl5lib/OneTeam/Builder/Filter/Saver/XPI.pm
Expand Up @@ -43,7 +43,7 @@ sub path_convert {


sub finalize { sub finalize {
my $self = shift; my $self = shift;
my $tmpdir = catdir(tempdir('otXXXXXX', TMPDIR => 1, CLEANUP => 1), "OneTeam"); my $tmpdir = catdir(tempdir('otXXXXXX', TMPDIR => 1, CLEANUP => ), "OneTeam");
my $tmppfxdir = $self->_prefix ? catdir($tmpdir, $self->_prefix) : $tmpdir; my $tmppfxdir = $self->_prefix ? catdir($tmpdir, $self->_prefix) : $tmpdir;
my $chromedir = catdir($tmppfxdir, "chrome"); my $chromedir = catdir($tmppfxdir, "chrome");


Expand All @@ -62,7 +62,7 @@ sub _make_package {
my ($self, $tmpdir, $tmppfxdir) = @_; my ($self, $tmpdir, $tmppfxdir) = @_;
my $cwd = getcwd(); my $cwd = getcwd();


chdir("$self->{outputdir}/chrome"); chdir($tmppfxdir);
system(qw(zip -q -9 -r), catfile($self->{topdir}, $self->_output_filename), "."); system(qw(zip -q -9 -r), catfile($self->{topdir}, $self->_output_filename), ".");
chdir($cwd); chdir($cwd);
} }
Expand All @@ -77,6 +77,7 @@ sub _prepare_files_for_packing {
$d, qw(default.ico default.xpm)); $d, qw(default.ico default.xpm));


my $cwd = getcwd(); my $cwd = getcwd();

chdir("$self->{outputdir}/chrome"); chdir("$self->{outputdir}/chrome");
system(qw(zip -q -0 -r), catfile($chromedir, 'oneteam.jar'), "."); system(qw(zip -q -0 -r), catfile($chromedir, 'oneteam.jar'), ".");
chdir($cwd); chdir($cwd);
Expand Down

0 comments on commit 5e15200

Please sign in to comment.