[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-browser] 44/74: Bug 41089: Add tor-browser build scripts + Makefile to tor-browser

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-browser] 44/74: Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
From: gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>
Date: Thu, 27 Oct 2022 21:21:49 +0000
Auto-submitted: auto-generated
Cc: gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 27 Oct 2022 17:25:23 -0400
In-reply-to: <166690566590.3210.17939313805552400828@cupani.torproject.org>
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
References: <166690566590.3210.17939313805552400828@cupani.torproject.org>
Reply-to: Richard Pospesel <richard@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>
Thread-index: AQAAEjRWJfv5MWquQ2icT0O9crJ3Yg==

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

richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2
in repository tor-browser.

commit 624577713b1103ed45d5346300aac88455998a32
Author: Richard Pospesel <richard@xxxxxxxxxxxxxx>
AuthorDate: Mon Aug 1 17:56:45 2022 +0000

    Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
---
 .gitignore                  |  3 ++
 tools/torbrowser/Makefile   | 47 +++++++++++++++++++++++++++
 tools/torbrowser/bridges.js | 77 +++++++++++++++++++++++++++++++++++++++++++++
 tools/torbrowser/build.sh   |  7 +++++
 tools/torbrowser/clobber.sh |  6 ++++
 tools/torbrowser/config.sh  |  6 ++++
 tools/torbrowser/deploy.sh  | 23 ++++++++++++++
 tools/torbrowser/fataar.sh  | 34 ++++++++++++++++++++
 tools/torbrowser/fetch.sh   | 30 ++++++++++++++++++
 tools/torbrowser/ide.sh     |  7 +++++
 tools/torbrowser/jslint.sh  |  7 +++++
 11 files changed, 247 insertions(+)

diff --git a/.gitignore b/.gitignore
index b409ec583766..b2b8b720c178 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,3 +193,6 @@ config/external/icu4x
 # Ignore Storybook generated files
 browser/components/storybook/node_modules/
 browser/components/storybook/storybook-static/
+
+# Ignore binary base of tor browser
+.binaries
diff --git a/tools/torbrowser/Makefile b/tools/torbrowser/Makefile
new file mode 100644
index 000000000000..be6f44c52ce6
--- /dev/null
+++ b/tools/torbrowser/Makefile
@@ -0,0 +1,47 @@
+.DEFAULT_GOAL := all
+
+# https://stackoverflow.com/questions/18136918/how-to-get-current-relative-directory-of-your-makefile
+mkfile_path := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
+DEV_ROOT = $(mkfile_path)/../..
+BINARIES = $(DEV_ROOT)/.binaries
+BUILD_OUTPUT = $(DEV_ROOT)/obj-x86_64-pc-linux-gnu
+
+config:
+	./config.sh $(DEV_ROOT)
+
+ide-vscode:
+	./ide.sh vscode $(DEV_ROOT)
+
+ide-eclipse:
+	./ide.sh eclipse $(DEV_ROOT)
+
+ide-visualstudio:
+	./ide.sh visualstudio $(DEV_ROOT)
+
+fetch:
+	./fetch.sh $(BINARIES)
+
+build:
+	./build.sh $(DEV_ROOT)
+
+deploy:
+	./deploy.sh $(BINARIES) $(BUILD_OUTPUT)
+
+fat-aar:
+	./fataar.sh $(DEV_ROOT) $(ARCHS)
+
+all: build deploy
+
+run:
+	$(BINARIES)/dev/Browser/start-tor-browser -v
+
+jslint:
+	./jslint.sh $(DEV_ROOT) $(JS)
+
+clobber:
+	./clobber.sh $(DEV_ROOT)
+
+clean:
+	rm -rf $(BUILD_OUTPUT)
+
diff --git a/tools/torbrowser/bridges.js b/tools/torbrowser/bridges.js
new file mode 100644
index 000000000000..e8f11a36c401
--- /dev/null
+++ b/tools/torbrowser/bridges.js
@@ -0,0 +1,77 @@
+pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
+
+// Default bridges.
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.1",
+  "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.2",
+  "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.3",
+  "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.4",
+  "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.5",
+  "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.6",
+  "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.7",
+  "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.8",
+  "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.9",
+  "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.10",
+  "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.11",
+  "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.12",
+  "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.13",
+  "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.14",
+  "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.15",
+  "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"
+);
+pref(
+  "extensions.torlauncher.default_bridge.obfs4.16",
+  "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2"
+);
+
+pref(
+  "extensions.torlauncher.default_bridge.meek-azure.1",
+  "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"
+);
+
+pref(
+  "extensions.torlauncher.default_bridge.snowflake.1",
+  "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72"
+);
diff --git a/tools/torbrowser/build.sh b/tools/torbrowser/build.sh
new file mode 100755
index 000000000000..e53dbc5000bc
--- /dev/null
+++ b/tools/torbrowser/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+DEV_ROOT=$1
+
+cd $DEV_ROOT
+./mach build
+./mach build stage-package
diff --git a/tools/torbrowser/clobber.sh b/tools/torbrowser/clobber.sh
new file mode 100755
index 000000000000..5073454b23c1
--- /dev/null
+++ b/tools/torbrowser/clobber.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+DEV_ROOT=$1
+
+cd $DEV_ROOT
+./mach clobber
diff --git a/tools/torbrowser/config.sh b/tools/torbrowser/config.sh
new file mode 100755
index 000000000000..d35311961379
--- /dev/null
+++ b/tools/torbrowser/config.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+DEV_ROOT=$1
+
+cd $DEV_ROOT
+./mach configure
diff --git a/tools/torbrowser/deploy.sh b/tools/torbrowser/deploy.sh
new file mode 100755
index 000000000000..9f2ebd58cbe3
--- /dev/null
+++ b/tools/torbrowser/deploy.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+BINARIES=$1
+BUILD_OUTPUT=$2
+
+SCRIPT_DIR=$(realpath "$(dirname "$0")")
+
+# Add built-in bridges
+mkdir -p $BUILD_OUTPUT/_omni/defaults/preferences
+cat $BUILD_OUTPUT/dist/bin/browser/defaults/preferences/000-tor-browser.js $SCRIPT_DIR/bridges.js >> $BUILD_OUTPUT/_omni/defaults/preferences/000-tor-browser.js
+cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja defaults/preferences/000-tor-browser.js
+rm -rf $BUILD_OUTPUT/_omni
+
+# Repackage the manual
+# rm -rf $BUILD_OUTPUT/_omni
+# mkdir $BUILD_OUTPUT/_omni
+# unzip $BINARIES/dev/Browser/browser/omni.ja -d $BUILD_OUTPUT/_omni
+# cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja chrome/browser/content/browser/manual
+# rm -rf $BUILD_OUTPUT/_omni
+
+# copy binaries
+cp -r $BUILD_OUTPUT/dist/firefox/* $BINARIES/dev/Browser
+rm -rf $BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache
diff --git a/tools/torbrowser/fataar.sh b/tools/torbrowser/fataar.sh
new file mode 100755
index 000000000000..6ebb13cd0e7b
--- /dev/null
+++ b/tools/torbrowser/fataar.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+DEV_ROOT=$1
+ARCHS=$2
+
+cd $DEV_ROOT
+
+glue=""
+if [[ "$ARCHS" == *"armv7"* ]]; then
+	export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$DEV_ROOT/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar
+	glue="$glue,armeabi-v7a"
+fi
+if [[ "$ARCHS" == *"aarch64"* ]]; then
+	export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$DEV_ROOT/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar
+	glue="$glue,arm64-v8a"
+fi
+if [[ "$ARCHS" == *"x86"* ]]; then
+	export MOZ_ANDROID_FAT_AAR_X86=$DEV_ROOT/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar
+	glue="$glue,x86"
+fi
+if [[ "$ARCHS" == *"x86_64"* ]]; then
+	export MOZ_ANDROID_FAT_AAR_X86_64=$DEV_ROOT/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar
+	glue="$glue,x86_64"
+fi
+if [ -z "$glue" ]; then
+	echo "The architectures have not specified or are not valid."
+	echo "Usage: make fat-aar ARCHS=\"\$archs\""
+	echo "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space."
+	exit 1
+fi
+export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=${glue:1}
+
+MOZCONFIG=mozconfig-android-all ./mach configure
+MOZCONFIG=mozconfig-android-all ./mach build
diff --git a/tools/torbrowser/fetch.sh b/tools/torbrowser/fetch.sh
new file mode 100755
index 000000000000..5b5c627c0c34
--- /dev/null
+++ b/tools/torbrowser/fetch.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+BINARIES_DIR=$1
+
+# download the current downloads.json
+wget https://aus1.torproject.org/torbrowser/update_3/alpha/downloads.json
+# get url for latest alpha linux en_US package
+TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+")
+TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_en-US.tar.xz"
+TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER_PACKAGE}";
+
+# remove download manifest
+rm downloads.json
+
+# clear out previous tor-browser and previous package
+rm -rf "${BINARIES_DIR}/dev"
+rm -f "${TOR_BROWSER_PACKAGE}"
+
+# download
+rm -f "${TOR_BROWSER_PACKAGE}"
+wget "${TOR_BROWSER_PACKAGE_URL}"
+mkdir -p "${BINARIES_DIR}"
+
+# and extract
+tar -xf ${TOR_BROWSER_PACKAGE} -C "${BINARIES_DIR}"
+mv "${BINARIES_DIR}/tor-browser_en-US" "${BINARIES_DIR}/dev"
+
+# cleanup
+rm -f "${TOR_BROWSER_PACKAGE}"
diff --git a/tools/torbrowser/ide.sh b/tools/torbrowser/ide.sh
new file mode 100755
index 000000000000..5da0c670d8c5
--- /dev/null
+++ b/tools/torbrowser/ide.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+IDE=$1
+DEV_ROOT=$2
+
+cd $DEV_ROOT
+./mach ide $IDE
diff --git a/tools/torbrowser/jslint.sh b/tools/torbrowser/jslint.sh
new file mode 100755
index 000000000000..be1016275c28
--- /dev/null
+++ b/tools/torbrowser/jslint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+DEV_ROOT=$1
+JS_FILE=$2
+
+cd $DEV_ROOT
+./mach lint -l eslint --fix $JS_FILE

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

References:
- [tor-commits] [tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (df868fe98ed5 -> 9098c1823e51)
  - From: gitolite role via tor-commits

Prev by Author: [tor-commits] [torbutton] branch maint-11.5 updated: Bug 41364: Amend YEC 2022 styling
Next by Author: [tor-commits] [pluggable-transports/snowflake-webext] tag list created (now a8b7508)
Previous by thread: [tor-commits] [tor-browser] 46/74: Bring back old Firefox onboarding
Next by thread: [tor-commits] [tor-browser] 49/74: Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
Index(es):
- Author
- Thread