summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-06-07 13:36:22 +0200
committerFabien Tassin <fta@sofaraway.org>2008-06-07 13:36:22 +0200
commit7777be84a6ae7f75d5c6981901442afcce2a2803 (patch)
tree2cfe3e8fc8e71209eec81a462c18668ce13f98b1
parent950f43c675e0197d78051bd3f9186a752dc9562c (diff)
* [mozclient] Fix previously ignored MOZCLIENT_WANTMOZDIR when
MOZCLIENT_EMBEDDED is set - update src/mozclient/lib/MozClient/VCS.pm
-rw-r--r--src/mozclient/lib/MozClient/VCS.pm22
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/",