[tbb-commits] [builders/tor-browser-build] 02/10: Bug 40501: Add base-browser support to projects/release/config

gitolite role git at cupani.torproject.org
Fri Jul 15 09:04:35 UTC 2022


This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master
in repository builders/tor-browser-build.

commit 70dc7d9f9bbcd5439dcf72b7c48e405756f5ef95
Author: Nicolas Vigier <boklm at torproject.org>
AuthorDate: Thu Jun 9 15:05:56 2022 +0200

    Bug 40501: Add base-browser support to projects/release/config
---
 Makefile                | 112 +++++++++++++++---------------
 projects/release/build  |  28 ++++----
 projects/release/config | 176 +++++++++++++++++++++++++-----------------------
 3 files changed, 165 insertions(+), 151 deletions(-)

diff --git a/Makefile b/Makefile
index c4b14ee..6ccb520 100644
--- a/Makefile
+++ b/Makefile
@@ -3,172 +3,172 @@ rbm=./rbm/rbm
 all: release
 
 release: submodule-update
-	$(rbm) build release --target release --target torbrowser-all
+	$(rbm) build release --target release --target browser-all --target torbrowser
 
 release-android: submodule-update
-	$(rbm) build release --target release --target torbrowser-all-android
+	$(rbm) build release --target release --target browser-all-android --target torbrowser
 
 release-android-armv7: submodule-update
-	$(rbm) build release --target release --target torbrowser-android-armv7
+	$(rbm) build release --target release --target browser-android-armv7 --target torbrowser
 
 release-android-x86: submodule-update
-	$(rbm) build release --target release --target torbrowser-android-x86
+	$(rbm) build release --target release --target browser-android-x86 --target torbrowser
 
 release-android-x86_64: submodule-update
-	$(rbm) build release --target release --target torbrowser-android-x86_64
+	$(rbm) build release --target release --target browser-android-x86_64 --target torbrowser
 
 release-android-aarch64: submodule-update
-	$(rbm) build release --target release --target torbrowser-android-aarch64
+	$(rbm) build release --target release --target browser-android-aarch64 --target torbrowser
 
 release-desktop: submodule-update
-	$(rbm) build release --target release --target torbrowser-all-desktop
+	$(rbm) build release --target release --target browser-all-desktop --target torbrowser
 
 release-linux-x86_64: submodule-update
-	$(rbm) build release --target release --target torbrowser-linux-x86_64
+	$(rbm) build release --target release --target browser-linux-x86_64 --target torbrowser
 
 release-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target release --target torbrowser-linux-x86_64-asan
+	$(rbm) build release --target release --target browser-linux-x86_64-asan --target torbrowser
 
 release-linux-i686: submodule-update
-	$(rbm) build release --target release --target torbrowser-linux-i686
+	$(rbm) build release --target release --target browser-linux-i686 --target torbrowser
 
 release-windows-i686: submodule-update
-	$(rbm) build release --target release --target torbrowser-windows-i686
+	$(rbm) build release --target release --target browser-windows-i686 --target torbrowser
 
 release-windows-x86_64: submodule-update
-	$(rbm) build release --target release --target torbrowser-windows-x86_64
+	$(rbm) build release --target release --target browser-windows-x86_64 --target torbrowser
 
 release-osx-x86_64: submodule-update
-	$(rbm) build release --target release --target torbrowser-osx-x86_64
+	$(rbm) build release --target release --target browser-osx-x86_64 --target torbrowser
 
 release-src: submodule-update
-	$(rbm) build release --target release --target torbrowser-src
+	$(rbm) build release --target release --target browser-src --target torbrowser
 
 alpha: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-all
+	$(rbm) build release --target alpha --target browser-all --target torbrowser
 
 alpha-android: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-all-android
+	$(rbm) build release --target alpha --target browser-all-android --target torbrowser
 
 alpha-android-armv7: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-android-armv7
+	$(rbm) build release --target alpha --target browser-android-armv7 --target torbrowser
 
 alpha-android-x86: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-android-x86
+	$(rbm) build release --target alpha --target browser-android-x86 --target torbrowser
 
 alpha-android-x86_64: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-android-x86_64
+	$(rbm) build release --target alpha --target browser-android-x86_64 --target torbrowser
 
 alpha-android-aarch64: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-android-aarch64
+	$(rbm) build release --target alpha --target browser-android-aarch64 --target torbrowser
 
 alpha-desktop: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-all-desktop
+	$(rbm) build release --target alpha --target browser-all-desktop --target torbrowser
 
 alpha-linux-x86_64: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-linux-x86_64
+	$(rbm) build release --target alpha --target browser-linux-x86_64 --target torbrowser
 
 alpha-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-linux-x86_64-asan
+	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target torbrowser
 
 alpha-linux-i686: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-linux-i686
+	$(rbm) build release --target alpha --target browser-linux-i686 --target torbrowser
 
 alpha-windows-i686: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-windows-i686
+	$(rbm) build release --target alpha --target browser-windows-i686 --target torbrowser
 
 alpha-windows-x86_64: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-windows-x86_64
+	$(rbm) build release --target alpha --target browser-windows-x86_64 --target torbrowser
 
 alpha-osx-x86_64: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-osx-x86_64
+	$(rbm) build release --target alpha --target browser-osx-x86_64 --target torbrowser
 
 alpha-src: submodule-update
-	$(rbm) build release --target alpha --target torbrowser-src
+	$(rbm) build release --target alpha --target browser-src --target torbrowser
 
 nightly: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-all
+	$(rbm) build release --target nightly --target browser-all --target torbrowser
 
 nightly-android: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-all-android
+	$(rbm) build release --target nightly --target browser-all-android --target torbrowser
 
 nightly-android-armv7: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-android-armv7
+	$(rbm) build release --target nightly --target browser-android-armv7 --target torbrowser
 
 nightly-android-x86: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-android-x86
+	$(rbm) build release --target nightly --target browser-android-x86 --target torbrowser
 
 nightly-android-x86_64: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-android-x86_64
+	$(rbm) build release --target nightly --target browser-android-x86_64 --target torbrowser
 
 nightly-android-aarch64: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-android-aarch64
+	$(rbm) build release --target nightly --target browser-android-aarch64 --target torbrowser
 
 nightly-desktop: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-all-desktop
+	$(rbm) build release --target nightly --target browser-all-desktop --target torbrowser
 
 nightly-linux-x86_64: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-linux-x86_64
+	$(rbm) build release --target nightly --target browser-linux-x86_64 --target torbrowser
 
 nightly-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-linux-x86_64-asan
+	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target torbrowser
 
 nightly-linux-i686: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-linux-i686
+	$(rbm) build release --target nightly --target browser-linux-i686 --target torbrowser
 
 nightly-windows-i686: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-windows-i686
+	$(rbm) build release --target nightly --target browser-windows-i686 --target torbrowser
 
 nightly-windows-x86_64: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-windows-x86_64
+	$(rbm) build release --target nightly --target browser-windows-x86_64 --target torbrowser
 
 nightly-osx-x86_64: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-osx-x86_64
+	$(rbm) build release --target nightly --target browser-osx-x86_64 --target torbrowser
 
 nightly-src: submodule-update
-	$(rbm) build release --target nightly --target torbrowser-src
+	$(rbm) build release --target nightly --target browser-src --target torbrowser
 
 testbuild: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-all
+	$(rbm) build release --target testbuild --target browser-all --target torbrowser
 
 testbuild-android: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-all-android
+	$(rbm) build release --target testbuild --target browser-all-android --target torbrowser
 
 testbuild-android-armv7: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-android-armv7
+	$(rbm) build release --target testbuild --target browser-android-armv7 --target torbrowser
 
 testbuild-android-x86: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-android-x86
+	$(rbm) build release --target testbuild --target browser-android-x86 --target torbrowser
 
 testbuild-android-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-android-x86_64
+	$(rbm) build release --target testbuild --target browser-android-x86_64 --target torbrowser
 
 testbuild-android-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-android-aarch64
+	$(rbm) build release --target testbuild --target browser-android-aarch64 --target torbrowser
 
 testbuild-desktop: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-all-desktop
+	$(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser
 
 testbuild-linux-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
+	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target torbrowser
 
 testbuild-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-linux-x86_64-asan
+	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target torbrowser
 
 testbuild-linux-i686: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-linux-i686
+	$(rbm) build release --target testbuild --target browser-linux-i686 --target torbrowser
 
 testbuild-windows-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-windows-x86_64
+	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target torbrowser
 
 testbuild-windows-i686: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-windows-i686
+	$(rbm) build release --target testbuild --target browser-windows-i686 --target torbrowser
 
 testbuild-osx-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-osx-x86_64
+	$(rbm) build release --target testbuild --target browser-osx-x86_64 --target torbrowser
 
 testbuild-src: submodule-update
-	$(rbm) build release --target testbuild --target torbrowser-src-testbuild
+	$(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser
 
 signtag-release: submodule-update
 	$(rbm) build release --step signtag --target release
diff --git a/projects/release/build b/projects/release/build
index c859828..96652b8 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -4,38 +4,42 @@
 [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
 destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"
 mkdir -p "$destdir"
-[% IF c("var/torbrowser-android-armv7") -%]
+[% IF c("var/browser-android-armv7") -%]
   mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/torbrowser-android-x86") -%]
+[% IF c("var/browser-android-x86") -%]
   mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/torbrowser-android-x86_64") -%]
+[% IF c("var/browser-android-x86_64") -%]
   mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/torbrowser-android-aarch64") -%]
+[% IF c("var/browser-android-aarch64") -%]
   mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/torbrowser-windows-i686") -%]
+[% IF c("var/browser-windows-i686") -%]
   mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
-  mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/
+  [% IF c("var/tor-browser") -%]
+    mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/
+  [% END -%]
 [% END -%]
-[% IF c("var/torbrowser-windows-x86_64") -%]
+[% IF c("var/browser-windows-x86_64") -%]
   mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/
-  mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/
+  [% IF c("var/tor-browser") -%]
+    mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/
+  [% END -%]
 [% END -%]
-[% IF c("var/torbrowser-osx-x86_64") -%]
+[% IF c("var/browser-osx-x86_64") -%]
   mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/torbrowser-linux-i686") -%]
+[% IF c("var/browser-linux-i686") -%]
   mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/torbrowser-linux-x86_64") -%]
+[% IF c("var/browser-linux-x86_64") -%]
   mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
 [% END -%]
 [% IF c("var/torbrowser-src") -%]
   mv  [% c('input_files_by_name/src-firefox') %]      \
-      [% c('input_files_by_name/src-tor-launcher') %] \
+      [% IF c("var/tor-browser"); GET c('input_files_by_name/src-tor-launcher'); END %] \
       "$destdir"/
 [% END -%]
 cd "$destdir"
diff --git a/projects/release/config b/projects/release/config
index 8c2974a..3f70e60 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -9,77 +9,85 @@ var:
   containers_target: with_containers
 
 targets:
-  torbrowser-all:
-    - torbrowser-linux-x86_64
-    - torbrowser-linux-i686
-    - torbrowser-windows-i686
-    - torbrowser-windows-x86_64
-    - torbrowser-osx-x86_64
-    - torbrowser-android-armv7
-    - torbrowser-android-x86
-    - torbrowser-android-x86_64
-    - torbrowser-android-aarch64
-    - torbrowser-src
-  torbrowser-all-desktop:
-    - torbrowser-linux-x86_64
-    - torbrowser-linux-i686
-    - torbrowser-windows-i686
-    - torbrowser-windows-x86_64
-    - torbrowser-osx-x86_64
-    - torbrowser-src
-  torbrowser-all-android:
-    - torbrowser-android-armv7
-    - torbrowser-android-x86
-    - torbrowser-android-x86_64
-    - torbrowser-android-aarch64
-  torbrowser-android-armv7:
-    var:
-      torbrowser-android-armv7: 1
-  torbrowser-android-x86:
-    var:
-      torbrowser-android-x86: 1
-  torbrowser-android-x86_64:
-    var:
-      torbrowser-android-x86_64: 1
-  torbrowser-android-aarch64:
-    var:
-      torbrowser-android-aarch64: 1
-  torbrowser-linux-x86_64:
-    var:
-      torbrowser-linux-x86_64: 1
-  torbrowser-linux-x86_64-asan:
-    var:
-      torbrowser-linux-x86_64: 1
+  browser-all:
+    - browser-linux-x86_64
+    - browser-linux-i686
+    - browser-windows-i686
+    - browser-windows-x86_64
+    - browser-osx-x86_64
+    - browser-android-armv7
+    - browser-android-x86
+    - browser-android-x86_64
+    - browser-android-aarch64
+    - browser-src
+  browser-all-desktop:
+    - browser-linux-x86_64
+    - browser-linux-i686
+    - browser-windows-i686
+    - browser-windows-x86_64
+    - browser-osx-x86_64
+    - browser-src
+  browser-all-android:
+    - browser-android-armv7
+    - browser-android-x86
+    - browser-android-x86_64
+    - browser-android-aarch64
+  browser-android-armv7:
+    var:
+      browser-android-armv7: 1
+  browser-android-x86:
+    var:
+      browser-android-x86: 1
+  browser-android-x86_64:
+    var:
+      browser-android-x86_64: 1
+  browser-android-aarch64:
+    var:
+      browser-android-aarch64: 1
+  browser-linux-x86_64:
+    var:
+      browser-linux-x86_64: 1
+  browser-linux-x86_64-asan:
+    var:
+      browser-linux-x86_64: 1
       asan-build: '-asan'
-  torbrowser-linux-i686:
+  browser-linux-i686:
     var:
-      torbrowser-linux-i686: 1
-  torbrowser-windows-i686:
+      browser-linux-i686: 1
+  browser-windows-i686:
     var:
-      torbrowser-windows-i686: 1
-  torbrowser-windows-x86_64:
+      browser-windows-i686: 1
+  browser-windows-x86_64:
     var:
-      torbrowser-windows-x86_64: 1
-  torbrowser-osx-x86_64:
+      browser-windows-x86_64: 1
+  browser-osx-x86_64:
     var:
-      torbrowser-osx-x86_64: 1
-  torbrowser-src:
+      browser-osx-x86_64: 1
+  browser-src:
     var:
-      torbrowser-src: '[% ! c("var/testbuild") %]'
-  torbrowser-src-testbuild:
+      browser-src: '[% ! c("var/testbuild") %]'
+  browser-src-testbuild:
     var:
-      torbrowser-src: 1
+      browser-src: 1
 
   notarget:
+    - torbrowser
     - release
-    - torbrowser-all
-    - torbrowser-all-android
-    - torbrowser-all-desktop
+    - browser-all
+    - browser-all-android
+    - browser-all-desktop
 
   noversiondir:
     var:
       publish_dir: ''
 
+  torbrowser:
+    var:
+      browser_type: torbrowser
+  basebrowser:
+    var:
+      browser_type: basebrowser
+
   release:
     var:
       build_target: release
@@ -99,7 +107,7 @@ targets:
     output_dir: 'testbuild'
     var:
       testbuild: 1
-      build_target: torbrowser-testbuild
+      build_target: '[% c("var/browser_type") %]-testbuild'
       publish_dir: ''
 
   no_containers:
@@ -119,102 +127,104 @@ input_files:
 # Release
  - name: android-armv7
    project: tor-browser
-   enable: '[% c("var/torbrowser-android-armv7") %]'
+   enable: '[% c("var/browser-android-armv7") %]'
    target:
      - '[% c("var/containers_target") %]'
      - '[% c("var/build_target") %]'
-     - torbrowser-android-armv7
+     - '[% c("var/browser_type") %]-android-armv7'
 
  - name: android-x86
    project: tor-browser
-   enable: '[% c("var/torbrowser-android-x86") %]'
+   enable: '[% c("var/browser-android-x86") %]'
    target:
      - '[% c("var/containers_target") %]'
      - '[% c("var/build_target") %]'
-     - torbrowser-android-x86
+     - '[% c("var/browser_type") %]-android-x86'
 
  - name: android-x86_64
    project: tor-browser
-   enable: '[% c("var/torbrowser-android-x86_64") %]'
+   enable: '[% c("var/browser-android-x86_64") %]'
    target:
      - '[% c("var/containers_target") %]'
      - '[% c("var/build_target") %]'
-     - torbrowser-android-x86_64
+     - '[% c("var/browser_type") %]-android-x86_64'
 
  - name: android-aarch64
    project: tor-browser
-   enable: '[% c("var/torbrowser-android-aarch64") %]'
+   enable: '[% c("var/browser-android-aarch64") %]'
    target:
      - '[% c("var/containers_target") %]'
      - '[% c("var/build_target") %]'
-     - torbrowser-android-aarch64
+     - '[% c("var/browser_type") %]-android-aarch64'
 
  - name: linux-x86_64
    project: tor-browser
-   enable: '[% c("var/torbrowser-linux-x86_64") %]'
+   enable: '[% c("var/browser-linux-x86_64") %]'
    target:
      - '[% c("var/build_target") %]'
-     - 'torbrowser-linux-x86_64[% c("var/asan-build") %]'
+     - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]'
 
  - name: linux-i686
    project: tor-browser
-   enable: '[% c("var/torbrowser-linux-i686") %]'
+   enable: '[% c("var/browser-linux-i686") %]'
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-linux-i686
+     - '[% c("var/browser_type") %]-linux-i686'
 
  - name: windows-i686
    project: tor-browser
-   enable: '[% c("var/torbrowser-windows-i686") %]'
+   enable: '[% c("var/browser-windows-i686") %]'
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-windows-i686
+     - '[% c("var/browser_type") %]-windows-i686'
 
  - name: windows-x86_64
    project: tor-browser
-   enable: '[% c("var/torbrowser-windows-x86_64") %]'
+   enable: '[% c("var/browser-windows-x86_64") %]'
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-windows-x86_64
+     - '[% c("var/browser_type") %]-windows-x86_64'
 
  - name: osx-x86_64
    project: tor-browser
-   enable: '[% c("var/torbrowser-osx-x86_64") %]'
+   enable: '[% c("var/browser-osx-x86_64") %]'
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-osx-x86_64
+     - '[% c("var/browser_type") %]-osx-x86_64'
 
  - name: windows-expert-bundle
    project: tor
-   enable: '[% c("var/torbrowser-windows-i686") %]'
+   enable: '[% c("var/browser-windows-i686") %]'
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-windows-i686
+     - '[% c("var/browser_type") %]-windows-i686'
      - expert-bundle
 
  - name: windows64-expert-bundle
    project: tor
-   enable: '[% c("var/torbrowser-windows-x86_64") %]'
+   enable: '[% c("var/browser-windows-x86_64") && c("var/tor-browser") %]'
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-windows-x86_64
+     - '[% c("var/browser_type") %]-windows-x86_64'
      - expert-bundle
 
  - name: src-firefox
    project: firefox
-   enable: '[% c("var/torbrowser-src") %]'
+   enable: '[% c("var/browser-src") %]'
    pkg_type: src-tarballs
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-src
+     - browser-src
+     - '[% c("var/browser_type") %]'
 
  - name: src-tor-launcher
    project: tor-launcher
-   enable: '[% c("var/torbrowser-src") %]'
+   enable: '[% c("var/browser-src") && c("var/tor-browser") %]'
    pkg_type: src-tarballs
    target:
      - '[% c("var/build_target") %]'
-     - torbrowser-src
+     - browser-src
+     - '[% c("var/browser_type") %]'
 
 steps:
   signtag:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the tbb-commits mailing list