Merge branch 'no_amo'

This commit is contained in:
Oliver Blanthorn 2019-09-23 07:06:10 +01:00
commit f8bf5d10e4
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
4 changed files with 37 additions and 0 deletions

View file

@ -248,6 +248,10 @@ yarn run build
If you want to build a signed copy (e.g. for the non-developer release), you can do that with `web-ext sign`. You'll need some keys for AMO and to edit the application id in `src/manifest.json`. There's a helper script in `scripts/sign` that's used by our build bot and for manual releases. If you want to build a signed copy (e.g. for the non-developer release), you can do that with `web-ext sign`. You'll need some keys for AMO and to edit the application id in `src/manifest.json`. There's a helper script in `scripts/sign` that's used by our build bot and for manual releases.
You can build unsigned copies with `scripts/sign nosign{stable,beta}`. NB: The `stable` versus `beta` part of the argument tells our build process which extension ID to use (and therefore which settings to use). If you want a stable build, make sure you are on the latest tag, i.e. `git checkout $(git tag | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -1)`.
If you are on a distribution which builds Firefox with `--with-unsigned-addon-scopes=` set to `app` and/or `system` (which is most of them by users: Arch, Debian, Ubuntu), you can install your unsigned copy of Tridactyl with `scripts/install.sh [directory]`. If you're on Arch, the correct directory is probably selected by default; on other distributions you might have to go hunting, but it probably looks like `/usr/lib/firefox/browser/extensions`.
### Building on Windows ### Building on Windows
- Install [Git for Windows][win-git] - Install [Git for Windows][win-git]

4
scripts/get_id_from_xpi.sh Executable file
View file

@ -0,0 +1,4 @@
#!/usr/bin/env bash
temp=$(mktemp -d)
unzip -qq $1 -d $temp
jq '.applications.gecko.id' $temp/manifest.json | tr -d '"'

4
scripts/install.sh Executable file
View file

@ -0,0 +1,4 @@
#!/usr/bin/env bash
installdir=${1:-/usr/lib/firefox/browser/extensions}
xpi=web-ext-artifacts/$(ls -t web-ext-artifacts/ | head -n1)
install -Dm644 $xpi $installdir/$(scripts/get_id_from_xpi.sh $xpi).xpi

View file

@ -25,6 +25,29 @@ publish_beta() {
sign_and_submit sign_and_submit
} }
build_no_sign_beta(){
yarn run clean
yarn run build
scripts/version.js beta
sed 's/"name": "Tridactyl"/"name": "Tridactyl: Beta"/' -i build/manifest.json
mkdir -p web-ext-artifacts
$(yarn bin)/web-ext build --source-dir ./build --overwrite-dest
for f in web-ext-artifacts/*.zip; do
mv $f ${f%.zip}.xpi
done
}
build_no_sign_stable(){
yarn run clean
yarn run build
sed 's/tridactyl.vim.betas@cmcaine/tridactyl.vim@cmcaine/' -i build/manifest.json
mkdir -p web-ext-artifacts
$(yarn bin)/web-ext build --source-dir ./build --overwrite-dest
for f in web-ext-artifacts/*.zip; do
mv $f ${f%.zip}.xpi
done
}
publish_stable() { publish_stable() {
yarn run clean yarn run clean
yarn run build yarn run build
@ -35,6 +58,8 @@ publish_stable() {
case $1 in case $1 in
stable) publish_stable;; stable) publish_stable;;
nosignstable) build_no_sign_stable;;
nosignbeta) build_no_sign_beta;;
nonewtab) publish_beta_nonewtab;; nonewtab) publish_beta_nonewtab;;
*|beta) publish_beta;; *|beta) publish_beta;;
esac esac