[tbb-commits] [tor-browser-build/master] There is no separate Torbutton project to build anymore

[gk at torproject.org]

commit 44c6bc36a106f2e95eec12c296041bd13c999c58
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Aug 8 08:09:57 2019 +0000

    There is no separate Torbutton project to build anymore
---
 projects/tor-browser/build  |  1 -
 projects/tor-browser/config |  3 ---
 projects/torbutton/build    | 13 -------------
 projects/torbutton/config   | 26 --------------------------
 4 files changed, 43 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 71084f2..f728612 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/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 dc95350..cf8fcb3 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: torbutton
-    name: torbutton
-    enable: '[% ! c("var/android") %]'
   - project: https-everywhere
     name: https-everywhere
   - project: fonts
diff --git a/projects/torbutton/build b/projects/torbutton/build
deleted file mode 100644
index 38136c4..0000000
--- a/projects/torbutton/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-tar xvf [% project %]-[% c('version') %].tar.gz
-cd [% project %]-[% c('version') %]
-mkdir -p pkg
-./makexpi.sh
-mkdir pkg/tmp
-cd pkg/tmp
-unzip ../*.xpi
-[% c('zip', {
-        zip_src => [ '.' ],
-        zip_args => dest_dir _ '/' _ c('filename'),
-    }) %]
diff --git a/projects/torbutton/config b/projects/torbutton/config
deleted file mode 100644
index 1e37b80..0000000
--- a/projects/torbutton/config
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 2.2.1
-git_url: https://git.torproject.org/torbutton.git
-git_hash: '[% c("version") %]'
-gpg_keyring: torbutton.gpg
-tag_gpg_id: 1
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
-var:
-  container:
-    use_container: 1
-input_files:
-  - project: container-image
-
-steps:
-  src-tarballs:
-    filename: 'src-[% project %]-[% c("version") %].tar.xz'
-    input_files: []
-    var:
-      container:
-        use_container: 0
-
-targets:
-  nightly:
-    version: '[% c("abbrev") %]'
-    git_hash: master
-    tag_gpg_id: 0