diff options
Diffstat (limited to 'src/mozclient/lib/MozClient/VCS.pm')
| -rw-r--r-- | src/mozclient/lib/MozClient/VCS.pm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm index 9308c04..9640b99 100644 --- a/src/mozclient/lib/MozClient/VCS.pm +++ b/src/mozclient/lib/MozClient/VCS.pm @@ -340,14 +340,24 @@ sub pack { $self->mkdir($dir, 0755); } if ($self->{'MOZCLIENT_EMBEDDED'}) { - $self->chdir($self->work_dir); my $project = $self->{'MOZCLIENT_PROJECT'}; $project =~ s,/.*,,; - my $cmd = sprintf "tar jcf %s-%s/%s-%s-source.tar.bz2 %s mozilla", - $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion, - $tar_exclude; - $self->run_system($cmd); - $self->chdir(".."); + if ($self->{'MOZCLIENT_WANTMOZDIR'}) { + $self->chdir($self->work_dir); + my $cmd = sprintf "tar jcf %s-%s/%s-%s-source.tar.bz2 %s mozilla", + $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion, + $tar_exclude; + $self->run_system($cmd); + $self->chdir(".."); + } + else { # Embedded tarball but without the toplevel mozilla dir + $self->chdir($self->work_dir . "/mozilla"); + my $cmd = sprintf "tar jcf ../%s-%s/%s-%s-source.tar.bz2 %s .", + $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion, + $tar_exclude; + $self->run_system($cmd); + $self->chdir("../.."); + } } else { my $cmd = sprintf "mv %s/mozilla %s/%s-%s/", |