[tor-commits] [tor-messenger-build/master] Add profile directory: use Tor Browser's Bundle-Data

[boklm at torproject.org]

commit 4224f9e6a0931c4a85804c4c967269b35c2cdf52
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Jun 29 18:47:47 2015 +0200

    Add profile directory: use Tor Browser's Bundle-Data
---
 projects/bundle-data/build       |    5 +++++
 projects/bundle-data/config      |   14 ++++++++++++++
 projects/tor-messenger/build     |    3 +++
 projects/tor-messenger/build.osx |    3 +++
 projects/tor-messenger/config    |    2 ++
 5 files changed, 27 insertions(+)

diff --git a/projects/bundle-data/build b/projects/bundle-data/build
new file mode 100644
index 0000000..3528675
--- /dev/null
+++ b/projects/bundle-data/build
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
+cd [% project %]-[% c('version') %]/[% c("var/bundledir") %]
+tar czf [% dest_dir _ '/' _ c('filename') %] .
diff --git a/projects/bundle-data/config b/projects/bundle-data/config
new file mode 100644
index 0000000..1fdc028
--- /dev/null
+++ b/projects/bundle-data/config
@@ -0,0 +1,14 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://git.torproject.org/builders/tor-browser-bundle.git
+git_hash: faa6152ada46c03bac9918dd69fa5646847be2e1
+filename: 'bundle-data-[% c("version") %]-[% c("var/osname") %].tar.gz'
+var:
+  bundledir: Bundle-Data/linux
+targets:
+  windows-i686:
+    var:
+      bundledir: Bundle-Data/windows
+  osx-x86_64:
+    var:
+      bundledir: Bundle-Data/mac/TorBrowser
diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index b08c9f9..b39193b 100644
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -15,6 +15,9 @@ mkdir bundle/Messenger
 tar xf [% c('input_files_by_name/instantbird') %] -C bundle/Messenger --strip 1
 [% END -%]
 
+mkdir bundle/Messenger/TorMessenger
+tar xf [% c('input_files_by_name/bundle-data') %] -C bundle/Messenger/TorMessenger
+
 [% IF c("var/linux") %]
 tar xf [% c('input_files_by_name/gcc') %]
 chmod 755 start-tor-messenger
diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 069c8d4..16e9b47 100644
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -27,6 +27,9 @@ tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %]
 mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr at tormessenger
 cd ..
 
+mkdir Tor\ Messenger.app/TorMessenger
+tar xf [% c('input_files_by_name/bundle-data') %] -C Tor\ Messenger.app/TorMessenger
+
 mkdir dmg
 mv Tor\ Messenger.app dmg
 cd dmg
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index f19a0c0..eaaaba9 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -10,6 +10,8 @@ input_files:
     name: tor-launcher
   - project: tor-browser
     name: tor-browser
+  - project: bundle-data
+    name: bundle-data
   - project: gcc
     name: gcc
     enable: '[% c("var/linux") %]'