[tbb-commits] [tor-browser-build/master] Bug 28044: Integrate Tor Launcher into tor-browser

[gk at torproject.org]

commit 6d94f73dc055c1739a67ffd422f7f5bf29218723
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Feb 26 10:16:15 2019 -0500

    Bug 28044: Integrate Tor Launcher into tor-browser
    
    Place the Tor Launcher sources within browser/extension before
    starting the Firefox build (instead of creating an .xpi which
    was included during the tor-browser packaging step).
---
 projects/firefox/build                   |  5 +++++
 projects/firefox/config                  |  3 +++
 projects/firefox/mozconfig-android-armv7 |  3 +++
 projects/firefox/mozconfig-android-x86   |  3 +++
 projects/tor-browser/build               |  1 -
 projects/tor-browser/config              |  3 ---
 projects/tor-launcher/build              | 12 ++++--------
 projects/tor-launcher/config             |  2 +-
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 5cf86a4..3aa4a4d 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -151,6 +151,11 @@ fi
   patch -p1 < $rootdir/1527534.patch
 [% END -%]
 
+[% IF ! c("var/android") %]
+  # Place a copy of the Tor Launcher sources under browser/extensions
+  tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher') %]
+[% END -%]
+
 rm -f configure
 rm -f js/src/configure
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 566cbc0..c60ee8e 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -149,6 +149,9 @@ input_files:
     enable: '[% c("var/linux") %]'
   - filename: start-firefox
     enable: '[% c("var/linux") %]'
+  - project: tor-launcher
+    name: tor-launcher
+    enable: '[% ! c("var/android") %]'
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
index dfa3aaf..6dde8b1 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -19,6 +19,9 @@ ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm
 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
 
+# We do not use Tor Launcher on Android:
+ac_add_options --disable-tor-launcher
+
 if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
 # Because Google Play will likely be the primary distribution medium,
 # we disable updating and rely on Google Play by default. The
diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86
index defe5c3..b332f52 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -19,6 +19,9 @@ ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/x86
 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
 
+# We do not use Tor Launcher on Android:
+ac_add_options --disable-tor-launcher
+
 if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
 # Because Google Play will likely be the primary distribution medium,
 # we disable updating and rely on Google Play by default. The
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 1d73ff5..45dbb53 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -49,7 +49,6 @@ mkdir -p "$TBDIR/$MEEKPROFILEPATH/extensions"
 unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip
 MARTOOLS=$rootdir/mar-tools
 
-mv [% c('input_files_by_name/tor-launcher') %] "$TBDIR/$EXTSPATH/tor-launcher at torproject.org.xpi"
 mv [% c('input_files_by_name/torbutton') %] "$TBDIR/$EXTSPATH/torbutton at torproject.org.xpi"
 mv [% c('input_files_by_name/https-everywhere') %] "$TBDIR/$EXTSPATH/https-everywhere-eff at eff.org.xpi"
 mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 39093d4..ad382e2 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -60,9 +60,6 @@ input_files:
   - project: firefox-langpacks
     name: firefox-langpacks
     enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
-  - project: tor-launcher
-    name: tor-launcher
-    enable: '[% ! c("var/android") %]'
   - project: torbutton
     name: torbutton
     enable: '[% ! c("var/android") %]'
diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 90c5268..710416a 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -1,12 +1,8 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
 tar xvf [% project %]-[% c('version') %].tar.gz
-cd [% project %]-[% c('version') %]
-make package
-mkdir pkg/tmp
-cd pkg/tmp
-unzip ../*.xpi
-[% c('zip', {
-        zip_src => [ '.' ],
-        zip_args => dest_dir _ '/' _ c('filename'),
+mv [% project %]-[% c("version") %] [% project %]
+[% c('tar', {
+        tar_src => [ project ],
+        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
     }) %]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 151f836..8ea0a08 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -4,7 +4,7 @@ git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
 tag_gpg_id: 1
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
+filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
 var:
   container:
     use_container: 1