[tor-commits] [tor-messenger-build/master] Create tor-messenger tarball in a container

[boklm at torproject.org]

commit 27a0e57822506bd93eb2dcd9d35839e7e1aa9e2f
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Mar 13 14:09:56 2015 +0100

    Create tor-messenger tarball in a container
    
    Because the host system may not have 7z installed.
    
    Also, use 7z instead of unzip so we don't have to install both 7z and
    unzip.
---
 projects/tor-messenger/build  |    4 ++--
 projects/tor-messenger/config |   10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index b7a3be7..60cb99c 100644
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -3,7 +3,7 @@ set -e
 
 mkdir bundle
 [% IF c("var/windows") -%]
-unzip -d bundle [% c('input_files_by_name/instantbird') %]
+7z x -y -obundle [% c('input_files_by_name/instantbird') %]
 mv bundle/instantbird bundle/Messenger
 [% ELSE -%]
 mkdir bundle/Messenger
@@ -22,7 +22,7 @@ cd bundle/Messenger/extensions
 tar xf ../../../[% c('input_files_by_name/ctypes-otr') %]
 mv ctypes-otr* 'ctypes-otr at tormessenger'
 mkdir tor-launcher at torproject.org
-unzip -q ../../../[% c('input_files_by_name/tor-launcher') %] -d tor-launcher at torproject.org
+7z x -y -otor-launcher at torproject.org ../../../[% c('input_files_by_name/tor-launcher') %]
 mkdir -p tor-launcher at torproject.org/TorBrowser/Data
 [% IF c("var/windows") -%]
 7z x ../../../[% c('input_files_by_name/tor-browser') %]
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index ea5e6b5..73e2473 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -14,3 +14,13 @@ input_files:
     name: gcc
     enable: '[% c("var/linux") %]'
   - filename: start-tor-messenger
+  - project: docker-image
+
+remote_docker: 1
+lsb_release:
+    id: Ubuntu
+    release: 12.04
+    codename: precise
+var:
+    deps:
+        - p7zip-full