diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/mozclient.pl | 3 | ||||
| -rw-r--r-- | src/mozclient/lib/MozClient/VCS.pm | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mozclient.pl b/src/mozclient.pl index 160ece7..591ba86 100755 --- a/src/mozclient.pl +++ b/src/mozclient.pl @@ -50,12 +50,13 @@ my $work_dir = "mozclient-tmp"; my @conf_mandatory = qw(MOZCLIENT_APPNAME MOZCLIENT_FILE MOZCLIENT_GETVERSION MOZCLIENT_GETDATE MOZCLIENT_VCS MOZCLIENT_VCS_LOC); my @conf_optional = qw(MOZCLIENT_MODULES MOZCLIENT_PROJECT MOZCLIENT_BRANCH - MOZCLIENT_POSTCOCMD MOZCLIENT_EMBEDDED + MOZCLIENT_POSTCOCMD MOZCLIENT_EMBEDDED MOZCLIENT_SEPARATOR MOZCLIENT_WANTMOZDIR MOZCLIENT_WANTPATCH MOZCLIENT_DYNTAG MOZCLIENT_DYNTAG_FILES); my @conf_list = qw(MOZCLIENT_FILE); my $defaults = { + 'MOZCLIENT_SEPARATOR' => '~', 'MOZCLIENT_EXCLUDE_SCRIPT' => 'remove.binonly.sh', 'MOZILLA_CLIENT' => 'mozilla/client.mk', 'MOZCLIENT_PATCHES' => "$patches_dir", diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm index c1ed7d5..9cddbf8 100644 --- a/src/mozclient/lib/MozClient/VCS.pm +++ b/src/mozclient/lib/MozClient/VCS.pm @@ -305,8 +305,8 @@ sub pack { else { $self->chdir($self->work_dir); chomp($tversion = `$self->{'MOZCLIENT_GETVERSION'}`); - $tversion .= '~' . $self->{'MOZCLIENT_VCS'} . $self->{'have_date'} - unless defined $self->{'want_tag'}; + $tversion .= $self->{'MOZCLIENT_SEPARATOR'} . $self->{'MOZCLIENT_VCS'} . + $self->{'have_date'} unless defined $self->{'want_tag'}; $self->LOG2("\$ tversion=`" . $self->{'MOZCLIENT_GETVERSION'} . "` # => $tversion"); $self->chdir(".."); |