Skip to content
Snippets Groups Projects
Commit c70345ba authored by Richard Pospesel's avatar Richard Pospesel Committed by Pier Angelo Vendrame
Browse files

Bug 41089: Add tor-browser build scripts + Makefile to tor-browser

parent ca83592b
Branches
Tags
1 merge request!941Bug 42449: Rebase Tor Browser alpha onto Firefox 115.9.0esr
Show whitespace changes
Inline Side-by-side
Showing
with 357 additions and 0 deletions
.eslintignore
+ 1
− 0
View file @ c70345ba
......@@ -270,3 +270,4 @@ toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/
toolkit/components/uniffi-bindgen-gecko-js/components/generated/*
browser/app/profile/001-base-profile.js
tools/torbrowser/bridges.js
.gitignore
+ 3
− 0
View file @ c70345ba
......@@ -212,3 +212,6 @@ tools/esmify/package-lock.json
# Ignore automatically generated mots documentation
docs/mots/index.rst
# Ignore binary base of tor browser
.binaries
tools/torbrowser/Makefile 0 → 100644
+ 66
− 0
View file @ c70345ba
.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"
ARCHITECTURE = "$(shell uname -m)"
# Correct the architecture naming for ARM to match what mozilla has
ifeq ($(ARCHITECTURE), "arm64")
ARCHITECTURE = "aarch64"
endif
# Define build output path based on the platform.
ifeq ("$(shell uname)", "Darwin")
BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-apple-darwin$(shell uname -r)"
else
BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-pc-linux-gnu"
endif
# Define the run command based on the platform.
ifeq ("$(shell uname)", "Darwin")
RUN_CMD := cd "$(BINARIES)/Tor Browser.app/Contents/MacOS/" && ./firefox
else
RUN_CMD := "$(BINARIES)/dev/Browser/start-tor-browser" -v $(ARGS)
endif
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.py $(DEV_ROOT) $(ARCHS)
all: build deploy
run:
$(RUN_CMD)
jslint:
./jslint.sh $(DEV_ROOT) $(JS)
clobber:
./clobber.sh $(DEV_ROOT)
clean:
rm -rf $(BUILD_OUTPUT)
tools/torbrowser/browser-self-sign-macos.sh 0 → 100755
+ 110
− 0
View file @ c70345ba
#!/bin/bash
CERTNAME=my-codesign-cert-tor
BROWSERPATH=.
if [ $# -ge 1 ]
then
BROWSERPATH=$1
fi
security find-certificate -c $CERTNAME > /dev/null
if [ $? -ne 0 ]
then
echo ""
echo "ERROR: Self Signing Certificate not found, please create:"
echo " 1. In the Keychain Access app on your Mac, choose Keychain Access > Certificate Assistant > Create a Certificate."
echo " 2. Enter the name '$CERTNAME' for the certificate"
echo " 3. Choose an identity type: Self Signed Root"
echo " 4. Certificate Type > Code Signing"
echo " 5. Check 'Let me override defaults' & click Continue."
echo " 6. Enter a unique Serial Number. (123 is fine)"
echo " 7. Enter a big Validity Period (days), like 3560 & click Continue."
echo " 8. Fill in your personal information & click Continue."
echo " 9. Accept defaults for the rest of the dialog boxes. (Continue several times)"
echo " 10. Certificate Created! Click Done."
echo ""
echo "For additional help see:"
echo " https://support.apple.com/en-ca/guide/keychain-access/kyca8916/mac"
echo " https://stackoverflow.com/questions/58356844/what-are-the-ways-or-technologies-to-sign-an-executable-application-file-in-mac"
echo ""
read -n 1 -r -s -p $'Press enter to launch "Keychain Access"...\n'
open /System/Applications/Utilities/Keychain\ Access.app
exit -1
fi
echo "Found $CERTNAME, looking for browser to sign..."
if [ ! -f "$BROWSERPATH/XUL" ]
then
TESTPATH="$BROWSERPATH/Contents/MacOS"
if [ -f "$TESTPATH/XUL" ]
then
BROWSERPATH=$TESTPATH
else
echo "Error: browser files not detected in $BROWSERPATH!"
echo " This script needs to be run in the 'Contents/MacOS' directory of a SomeBrowser.app directory"
exit -1
fi
fi
echo "Mozilla based browser found, signing..."
echo ' Will be asked for password to certificate for all the things that need to be signed. Click "Always Allow" to automate'
cd "$BROWSERPATH"
codesign -s $CERTNAME *.dylib
codesign -s $CERTNAME plugin-container.app
if [ -d Tor ]
then
codesign -s $CERTNAME Tor/PluggableTransports/*
codesign -s $CERTNAME Tor/libevent-2.1.7.dylib
if [ -f Tor/tor.real ]
then
codesign -s $CERTNAME Tor/tor.real
fi
if [ -f Tor/tor ]
then
codesign -s $CERTNAME Tor/tor
fi
fi
codesign -s $CERTNAME XUL
if [ -d updater.app ]
then
codesign -s $CERTNAME updater.app
fi
# mullvadbrowser
if [ -f mullvadbrowser ]
then
codesign -s $CERTNAME mullvadbrowser
fi
# BB or TB
if [ -f firefox ]
then
codesign -s $CERTNAME firefox
fi
echo ""
echo "Browser signing step done!"
echo ""
echo "App still needs one more override to be easily opened with double click in Finder"
echo "Alternatively you can right click it, select 'Open' and then select 'Open' from the override popup"
echo "Or to enable it to be double clicked to open perform the following"
echo ""
echo "Double click the app and select either 'Ok' or 'Cancel' from the warning popup depending on which you get (Do Not 'Move to Trash')"
echo 'Go to Preferences -> Security & Privacy and click on padlock to allow changes. '
echo ' Then in "Allow appications downloaded from" select either:'
echo ' - App Store and identified developers'
echo ' - Anywhere'
echo ' Below that may be a notice about your specific app saying it was blocked because it was not from an identified developer. Click "Open Anyways" and "Open"'
tools/torbrowser/build.sh 0 → 100755
+ 15
− 0
View file @ c70345ba
#!/bin/bash
set -e
DEV_ROOT=$1
cd $DEV_ROOT
./mach build
if [ -z "$LOCALES" ]; then
./mach build stage-package
else
export MOZ_CHROME_MULTILOCALE=$LOCALES
# No quotes on purpose
./mach package-multi-locale --locales en-US $MOZ_CHROME_MULTILOCALE
AB_CD=multi ./mach build stage-package
fi
tools/torbrowser/clobber.sh 0 → 100755
+ 6
− 0
View file @ c70345ba
#!/bin/bash
set -e
DEV_ROOT=$1
cd $DEV_ROOT
./mach clobber
tools/torbrowser/config.sh 0 → 100755
+ 6
− 0
View file @ c70345ba
#!/bin/bash
set -e
DEV_ROOT=$1
cd $DEV_ROOT
./mach configure
tools/torbrowser/deploy.sh 0 → 100755
+ 43
− 0
View file @ c70345ba
#!/bin/bash
set -e
BINARIES="$1"
BUILD_OUTPUT="$2"
SCRIPT_DIR="$(realpath "$(dirname "$0")")"
RESDIR="$BUILD_OUTPUT/dist/firefox"
if [ "$(uname)" = "Darwin" ]; then
RESDIR="$RESDIR/Tor Browser.app/Contents/Resources"
fi
# 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 $RESDIR/browser/omni.ja chrome/browser/content/browser/manual
# rm -rf $BUILD_OUTPUT/_omni
if [ "$(uname)" = "Darwin" ]; then
# copy binaries
cp -r "$BUILD_OUTPUT/dist/firefox/Tor Browser.app/Contents/"* "$BINARIES/Tor Browser.app/Contents/"
rm -rf "$BINARIES/TorBrowser-Data/Browser/Caches/*.default/startupCache"
# Self sign the Binaries
cd "$BINARIES/Tor Browser.app/Contents/MacOS"
"$SCRIPT_DIR/browser-self-sign-macos.sh"
else
# backup the startup script
mv "$BINARIES/dev/Browser/firefox" "$BINARIES/dev/Browser/firefox.bak"
# copy binaries
cp -r "$RESDIR/"* "$BINARIES/dev/Browser"
rm -rf "$BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache"
# shuffle firefox bin around and restore script to match a real deployment
mv "$BINARIES/dev/Browser/firefox" "$BINARIES/dev/Browser/firefox.real"
mv "$BINARIES/dev/Browser/firefox.bak" "$BINARIES/dev/Browser/firefox"
fi
tools/torbrowser/fataar.py 0 → 100755
+ 53
− 0
View file @ c70345ba
#!/usr/bin/env python3
import os
import re
import subprocess
import sys
dev_root = sys.argv[1]
archs_in = re.split("\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else []
archs_out = []
env = dict(os.environ)
env["MOZCONFIG"] = "mozconfig-android-all"
if "armv7" in archs_in:
env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = (
dev_root
+ "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar"
)
archs_out.append("armeabi-v7a")
if "aarch64" in archs_in:
env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = (
dev_root
+ "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar"
)
archs_out.append("arm64-v8a")
if "x86" in archs_in or "i686" in archs_in:
env["MOZ_ANDROID_FAT_AAR_X86"] = (
dev_root
+ "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar"
)
archs_out.append("x86")
if "x86_64" in archs_in or "x86-64" in archs_in:
env["MOZ_ANDROID_FAT_AAR_X86_64"] = (
dev_root
+ "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar"
)
archs_out.append("x86_64")
env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out)
if not archs_out:
print(
"The architectures have not specified or are not valid.",
file=sys.stderr,
)
print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr)
print(
"Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.",
file=sys.stderr,
)
sys.exit(1)
subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True)
subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True)
tools/torbrowser/fetch.sh 0 → 100755
+ 40
− 0
View file @ c70345ba
#!/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 package
TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+")
if [ "$(uname)" = "Darwin" ]; then
TOR_BROWSER_PACKAGE="tor-browser-macos-${TOR_BROWSER_VERSION}.dmg"
else
TOR_BROWSER_PACKAGE="tor-browser-linux-x86_64-${TOR_BROWSER_VERSION}.tar.xz"
fi
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}"
rm -f "${TOR_BROWSER_PACKAGE}"
# download
wget "${TOR_BROWSER_PACKAGE_URL}"
mkdir -p "${BINARIES_DIR}"
# and extract
if [ "$(uname)" = "Darwin" ]
then
hdiutil attach "${TOR_BROWSER_PACKAGE}"
cp -R "/Volumes/Tor Browser/Tor Browser.app" "${BINARIES_DIR}"
hdiutil detach "/Volumes/Tor Browser"
else
tar -xf "${TOR_BROWSER_PACKAGE}" -C "${BINARIES_DIR}"
mv "${BINARIES_DIR}/tor-browser" "${BINARIES_DIR}/dev"
fi
# Final cleanup
rm -f "${TOR_BROWSER_PACKAGE}"
tools/torbrowser/ide.sh 0 → 100755
+ 7
− 0
View file @ c70345ba
#!/bin/bash
set -e
IDE=$1
DEV_ROOT=$2
cd $DEV_ROOT
./mach ide $IDE
tools/torbrowser/jslint.sh 0 → 100755
+ 7
− 0
View file @ c70345ba
#!/bin/bash
set -e
DEV_ROOT=$1
JS_FILE=$2
cd $DEV_ROOT
./mach lint -l eslint --fix $JS_FILE
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment