[tor-commits] [tor-messenger-build/master] Make projects/instantbird output to a directory

[boklm@xxxxxxxxxxxxxx]

commit b677cb75447d7e3823b2bd179e8d6e335e510f8f
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Fri Nov 4 20:28:20 2016 +0100

    Make projects/instantbird output to a directory
---
 projects/instantbird/build       | 3 ++-
 projects/instantbird/config      | 2 +-
 projects/tor-messenger/build     | 4 ++--
 projects/tor-messenger/build.osx | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 9b808bc..08b22a5 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -64,4 +64,5 @@ echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version")
 ./mozilla/mach build
 ./mozilla/mach package
 
-mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]
+mkdir -p [% dest_dir _ '/' _ c('filename') %]
+mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]/instantbird.[% c('var/archive_suffix') %]
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 47014bc..e2ee4dd 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -2,7 +2,7 @@
 version: '[% c("abbrev") %]'
 hg_url: https://hg.mozilla.org/releases/comm-esr45/
 hg_hash: THUNDERBIRD_45_4_0_RELEASE
-filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]"
+filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]"
 remote_docker: 1
 var:
   archive_suffix: tar.bz2
diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index ee6b2f3..23834b2 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -10,11 +10,11 @@ rootdir=$(pwd)
 
 mkdir bundle
 [% IF c("var/windows") -%]
-7z x -y -obundle [% c('input_files_by_name/instantbird') %]
+7z x -y -obundle [% c('input_files_by_name/instantbird') %]/instantbird.zip
 mv bundle/instantbird bundle/Browser
 [% ELSE -%]
 mkdir bundle/Browser
-tar xf [% c('input_files_by_name/instantbird') %] -C bundle/Browser --strip 1
+tar xf [% c('input_files_by_name/instantbird') %]/instantbird.tar.bz2 -C bundle/Browser --strip 1
 [% END -%]
 find bundle/Browser -exec touch -m -t $(date -d @[% c('timestamp') %] +%Y%m%d%H%M) {} \;
 
diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 02fa589..e9d3d07 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 rootdir=$(pwd)
-tar xf [% c('input_files_by_name/instantbird') %]
+tar xf [% c('input_files_by_name/instantbird') %]/instantbird.tar.bz2
 
 tar xf [% c('input_files_by_name/libdmg') %]
 export PATH="$(pwd)/libdmg-hfsplus:$PATH"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits