From a7753fd356ca7ab2bbc1094f4d151bc2a792eb73 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Sat, 25 Aug 2018 12:05:55 -0400 Subject: [PATCH] rename "webext" target to "firefox" --- .travis.yml | 2 +- dist/firefox/publish-signed-beta.py | 18 ++++----- dist/firefox/updates.template.json | 2 +- platform/{webext => firefox}/manifest.json | 0 platform/{webext => firefox}/polyfill.js | 0 .../{webext => firefox}/vapi-cachestorage.js | 0 ...ke-webext-meta.py => make-firefox-meta.py} | 0 tools/make-firefox.sh | 38 +++++++++++++++++++ tools/make-webext.sh | 38 ------------------- 9 files changed, 49 insertions(+), 49 deletions(-) rename platform/{webext => firefox}/manifest.json (100%) rename platform/{webext => firefox}/polyfill.js (100%) rename platform/{webext => firefox}/vapi-cachestorage.js (100%) rename tools/{make-webext-meta.py => make-firefox-meta.py} (100%) create mode 100755 tools/make-firefox.sh delete mode 100755 tools/make-webext.sh diff --git a/.travis.yml b/.travis.yml index 20d67e1..2545f23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false env: matrix: - BROWSER=chromium EXT=zip - - BROWSER=webext EXT=xpi + - BROWSER=firefox EXT=xpi script: ./tools/make-${BROWSER}.sh all deploy: provider: releases diff --git a/dist/firefox/publish-signed-beta.py b/dist/firefox/publish-signed-beta.py index 8714179..50f5aaf 100755 --- a/dist/firefox/publish-signed-beta.py +++ b/dist/firefox/publish-signed-beta.py @@ -16,19 +16,19 @@ import zipfile from distutils.version import LooseVersion from string import Template -# - Download target (raw) uMatrix.webext.xpi from GitHub +# - Download target (raw) uMatrix.firefox.xpi from GitHub # - This is referred to as "raw" package # - This will fail if not a dev build # - Modify raw package to make it self-hosted # - This is referred to as "unsigned" package -# - Ask AMO to sign uMatrix.webext.xpi +# - Ask AMO to sign uMatrix.firefox.xpi # - Generate JWT to be used for communication with server # - Upload unsigned package to AMO # - Wait for a valid download URL for signed package -# - Download signed package as uMatrix.webext.signed.xpi +# - Download signed package as uMatrix.firefox.signed.xpi # - This is referred to as "signed" package -# - Upload uMatrix.webext.signed.xpi to GitHub -# - Remove uMatrix.webext.xpi from GitHub +# - Upload uMatrix.firefox.signed.xpi to GitHub +# - Remove uMatrix.firefox.xpi from GitHub # - Modify updates.json to point to new version # - Commit changes to repo @@ -44,10 +44,10 @@ if not os.path.isfile(version_filepath): extension_id = 'uMatrix@raymondhill.net' tmpdir = tempfile.TemporaryDirectory() -raw_xpi_filename = 'uMatrix.webext.xpi' +raw_xpi_filename = 'uMatrix.firefox.xpi' raw_xpi_filepath = os.path.join(tmpdir.name, raw_xpi_filename) -unsigned_xpi_filepath = os.path.join(tmpdir.name, 'uMatrix.webext.unsigned.xpi') -signed_xpi_filename = 'uMatrix.webext.signed.xpi' +unsigned_xpi_filepath = os.path.join(tmpdir.name, 'uMatrix.firefox.unsigned.xpi') +signed_xpi_filename = 'uMatrix.firefox.signed.xpi' signed_xpi_filepath = os.path.join(tmpdir.name, signed_xpi_filename) github_owner = 'gorhill' github_repo = 'uMatrix' @@ -111,7 +111,7 @@ release_info = response.json() # Extract URL to raw package from metadata # -# Find url for uMatrix.webext.xpi +# Find url for uMatrix.firefox.xpi raw_xpi_url = '' for asset in release_info['assets']: if asset['name'] == signed_xpi_filename: diff --git a/dist/firefox/updates.template.json b/dist/firefox/updates.template.json index d783b72..828efc4 100644 --- a/dist/firefox/updates.template.json +++ b/dist/firefox/updates.template.json @@ -6,7 +6,7 @@ "version": "$version", "applications": { "gecko": { "strict_min_version": "56" } }, "update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/$version", - "update_link": "https://github.com/gorhill/uMatrix/releases/download/$version/uMatrix.webext.signed.xpi" + "update_link": "https://github.com/gorhill/uMatrix/releases/download/$version/uMatrix.firefox.signed.xpi" } ] } diff --git a/platform/webext/manifest.json b/platform/firefox/manifest.json similarity index 100% rename from platform/webext/manifest.json rename to platform/firefox/manifest.json diff --git a/platform/webext/polyfill.js b/platform/firefox/polyfill.js similarity index 100% rename from platform/webext/polyfill.js rename to platform/firefox/polyfill.js diff --git a/platform/webext/vapi-cachestorage.js b/platform/firefox/vapi-cachestorage.js similarity index 100% rename from platform/webext/vapi-cachestorage.js rename to platform/firefox/vapi-cachestorage.js diff --git a/tools/make-webext-meta.py b/tools/make-firefox-meta.py similarity index 100% rename from tools/make-webext-meta.py rename to tools/make-firefox-meta.py diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh new file mode 100755 index 0000000..dd2233d --- /dev/null +++ b/tools/make-firefox.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +# +# This script assumes a linux environment + +echo "*** uMatrix.firefox: Creating web store package" +echo "*** uMatrix.firefox: Copying files" + +DES=dist/build/uMatrix.firefox +rm -rf $DES +mkdir -p $DES + +bash ./tools/make-assets.sh $DES + +cp -R ./src/* $DES/ +cp platform/chromium/*.html $DES/ +cp platform/chromium/*.js $DES/js/ +cp -R platform/chromium/img/* $DES/img/ +cp LICENSE.txt $DES/ + +cp platform/firefox/polyfill.js $DES/js/ +cp platform/firefox/vapi-cachestorage.js $DES/js/ +cp platform/firefox/manifest.json $DES/ + +# firefox-specific +rm $DES/options_ui.html +rm $DES/js/options_ui.js + +echo "*** uMatrix.firefox: Generating meta..." +python tools/make-firefox-meta.py $DES/ + +if [ "$1" = all ]; then + echo "*** uMatrix.firefox: Creating package..." + pushd $DES > /dev/null + zip ../$(basename $DES).xpi -qr * + popd > /dev/null +fi + +echo "*** uMatrix.firefox: Package done." diff --git a/tools/make-webext.sh b/tools/make-webext.sh deleted file mode 100755 index 9109544..0000000 --- a/tools/make-webext.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -# -# This script assumes a linux environment - -echo "*** uMatrix.webext: Creating web store package" -echo "*** uMatrix.webext: Copying files" - -DES=dist/build/uMatrix.webext -rm -rf $DES -mkdir -p $DES - -bash ./tools/make-assets.sh $DES - -cp -R ./src/* $DES/ -cp platform/chromium/*.html $DES/ -cp platform/chromium/*.js $DES/js/ -cp -R platform/chromium/img/* $DES/img/ -cp LICENSE.txt $DES/ - -cp platform/webext/polyfill.js $DES/js/ -cp platform/webext/vapi-cachestorage.js $DES/js/ -cp platform/webext/manifest.json $DES/ - -# webext-specific -rm $DES/options_ui.html -rm $DES/js/options_ui.js - -echo "*** uMatrix.webext: Generating meta..." -python tools/make-webext-meta.py $DES/ - -if [ "$1" = all ]; then - echo "*** uMatrix.webext: Creating package..." - pushd $DES > /dev/null - zip ../$(basename $DES).xpi -qr * - popd > /dev/null -fi - -echo "*** uMatrix.webext: Package done."