Browse Source

Update tools to nuTensor and use nuAssets

xofe-minor-fixes-3
Ian Parker 4 years ago
parent
commit
e9274d6e30
  1. 18
      tools/make-assets.sh
  2. 16
      tools/make-firefox.sh

18
tools/make-assets.sh

@ -13,19 +13,19 @@ cp ./assets/assets.json $DES/
if [ -n "${TRAVIS_TAG}" ]; then if [ -n "${TRAVIS_TAG}" ]; then
pushd .. > /dev/null pushd .. > /dev/null
git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git
git clone --depth 1 https://github.com/geekprojects/nuAssets.git
popd > /dev/null popd > /dev/null
fi fi
mkdir $DES/thirdparties mkdir $DES/thirdparties
cp -R ../uAssets/thirdparties/hosts-file.net $DES/thirdparties/
cp -R ../uAssets/thirdparties/mirror1.malwaredomains.com $DES/thirdparties/
cp -R ../uAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/publicsuffix.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/someonewhocares.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/winhelp2002.mvps.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/www.malwaredomainlist.com $DES/thirdparties/
cp -R ../nuAssets/thirdparties/hosts-file.net $DES/thirdparties/
cp -R ../nuAssets/thirdparties/mirror1.malwaredomains.com $DES/thirdparties/
cp -R ../nuAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/
cp -R ../nuAssets/thirdparties/publicsuffix.org $DES/thirdparties/
cp -R ../nuAssets/thirdparties/someonewhocares.org $DES/thirdparties/
cp -R ../nuAssets/thirdparties/winhelp2002.mvps.org $DES/thirdparties/
cp -R ../nuAssets/thirdparties/www.malwaredomainlist.com $DES/thirdparties/
mkdir $DES/umatrix mkdir $DES/umatrix
cp -R ../uAssets/recipes/* $DES/umatrix/
cp -R ../nuAssets/recipes/* $DES/umatrix/
echo "done." echo "done."

16
tools/make-firefox.sh

@ -2,11 +2,11 @@
# #
# This script assumes a linux environment # This script assumes a linux environment
echo "*** uMatrix.firefox: Creating web store package"
echo "*** uMatrix.firefox: Copying files"
echo "*** nuTensor.firefox: Creating web store package"
echo "*** nuTensor.firefox: Copying files"
BLDIR=dist/build BLDIR=dist/build
DES="$BLDIR"/uMatrix.firefox
DES="$BLDIR"/nuTensor.firefox
rm -rf $DES rm -rf $DES
mkdir -p $DES mkdir -p $DES
@ -20,20 +20,20 @@ cp LICENSE.txt $DES/
cp platform/firefox/*.js $DES/js/ cp platform/firefox/*.js $DES/js/
cp platform/firefox/manifest.json $DES/ cp platform/firefox/manifest.json $DES/
echo "*** uMatrix.firefox: Generating meta..."
echo "*** nuTensor.firefox: Generating meta..."
python tools/make-firefox-meta.py $DES/ python tools/make-firefox-meta.py $DES/
if [ "$1" = all ]; then if [ "$1" = all ]; then
echo "*** uMatrix.firefox: Creating package..."
echo "*** nuTensor.firefox: Creating package..."
pushd $DES > /dev/null pushd $DES > /dev/null
zip ../$(basename $DES).xpi -qr * zip ../$(basename $DES).xpi -qr *
popd > /dev/null popd > /dev/null
elif [ -n "$1" ]; then elif [ -n "$1" ]; then
echo "*** uMatrix.firefox: Creating versioned package..."
echo "*** nuTensor.firefox: Creating versioned package..."
pushd $DES > /dev/null pushd $DES > /dev/null
zip ../$(basename $DES).xpi -qr * zip ../$(basename $DES).xpi -qr *
popd > /dev/null popd > /dev/null
mv "$BLDIR"/uMatrix.firefox.xpi "$BLDIR"/uMatrix_"$1".firefox.xpi
mv "$BLDIR"/nuTensor.firefox.xpi "$BLDIR"/nuTensor"$1".firefox.xpi
fi fi
echo "*** uMatrix.firefox: Package done."
echo "*** nuTensor.firefox: Package done."
Loading…
Cancel
Save