[tor-commits] [tor-messenger-build/master] Bug 23542: download tor-browser alpha

[arlo at torproject.org]

commit a9059897742431dd0b043e0402e8b83cb32afe9f
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Sat Oct 14 13:34:56 2017 -0400

    Bug 23542: download tor-browser alpha
---
 projects/tor-browser-alpha/build  |  3 ---
 projects/tor-browser-alpha/config | 34 ----------------------------------
 projects/tor-browser/config       |  5 +++++
 projects/tor-messenger/config     |  3 ++-
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/projects/tor-browser-alpha/build b/projects/tor-browser-alpha/build
deleted file mode 100644
index a78518d..0000000
--- a/projects/tor-browser-alpha/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-cp -p [% c('input_files_by_name/torbrowser-alpha') %] [% dest_dir %]/[% c('filename') %]
diff --git a/projects/tor-browser-alpha/config b/projects/tor-browser-alpha/config
deleted file mode 100644
index d9dec20..0000000
--- a/projects/tor-browser-alpha/config
+++ /dev/null
@@ -1,34 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 7.5a5
-filename: 'tor-browser-alpha-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
-
-input_files:
-  - URL: "[% c('var/base_url') %]/tor-browser-[% c('var/tb_osname') %]-[% c('version') %]_en-US.tar.xz"
-    name: torbrowser-alpha
-    file_gpg_id: 1
-    sig_ext: asc
-    gpg_keyring: torbrowser.gpg
-    var:
-      base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]"
-    targets:
-      windows-i686:
-        URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe"
-      osx-x86_64:
-        URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg"
-
-var:
-  extension: 'tar.xz'
-
-targets:
-  linux-x86_64:
-    var:
-      tb_osname: linux64
-  linux-i686:
-    var:
-      tb_osname: linux32
-  windows-i686:
-    var:
-      extension: 'exe'
-  osx-x86_64:
-    var:
-      extension: 'dmg'
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index f2b40c8..fb92e8e 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -19,6 +19,11 @@ input_files:
 var:
   extension: 'tar.xz'
 
+steps:
+  tor-browser-alpha:
+    tor-browser-alpha: '[% INCLUDE build %]'
+    version: 7.5a5
+
 targets:
   linux-x86_64:
     var:
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index 2301270..92fc588 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -10,8 +10,9 @@ input_files:
     name: tor-launcher
   - project: tor-browser
     name: tor-browser
-  - project: tor-browser-alpha
+  - project: tor-browser
     name: tor-browser-alpha
+    pkg_type: tor-browser-alpha
   - project: bundle-data
     name: bundle-data
   - project: gcc