commit d20b7ffa7b23e9121096ca2b503ef3e04a6745f7 Author: Nicolas Vigier boklm@torproject.org Date: Fri Oct 31 00:07:34 2014 +0100

tor-launcher: use 'make package' to create an xpi file --- projects/tor-launcher/build | 5 ++++- projects/tor-launcher/config | 2 +- projects/tor-messenger/build | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 097a786..560c998 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -1,3 +1,6 @@ #!/bin/sh set -e -mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir _ '/' _ c('filename') %] +tar xvf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +make package +mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e69ad2d..ccf6aec 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -3,4 +3,4 @@ git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg tag_gpg_id: 1 -filename: "[% project %]-[% c('version') %]-src.tar.gz" +filename: "[% project %]-[% c('version') %].xpi" diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 96b64e8..664924e 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -7,9 +7,8 @@ cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/ cd instantbird/extensions tar xf ../../[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* 'ctypes-otr@tormessenger' -tar xf ../../[% c('input_files_by_name/tor-launcher') %] -mv tor-launcher-*/src tor-launcher@torproject.org -rm -Rf tor-launcher-* +mkdir tor-launcher@torproject.org +unzip -q ../../[% c('input_files_by_name/tor-launcher') %] -d tor-launcher@torproject.org mkdir -p tor-launcher@torproject.org/TorBrowser/Data tar xf ../../[% c('input_files_by_name/tor-browser') %] mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher@torproject.org/TorBrowser/Tor