commit 6d39528d393f2bcae3ea8ca2dd4ee27d010e64c5 Author: Nicolas Vigier boklm@torproject.org Date: Wed Nov 26 18:40:23 2014 +0100

Fix instantbird filename on Windows --- projects/instantbird/build | 2 +- projects/instantbird/config | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build index f389db4..5bfa723 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -58,4 +58,4 @@ cd ../.. cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package -mv obj-*/dist/*.tar.bz2 [% dest_dir _ '/' _ c('filename') %] +mv obj-*/dist/*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/instantbird/config b/projects/instantbird/config index 6d25676..f49d4f8 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,13 +1,14 @@ version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/releases-comm-central git_hash: master -filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].tar.bz2" +filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 lsb_release: id: Ubuntu release: 10.04 codename: lucid var: + archive_suffix: tar.bz2 deps: - build-essential - libmpc2 @@ -35,6 +36,7 @@ targets: release: 12.04 codename: precise var: + archive_suffix: zip arch_deps: - yasm linux-x86_64: