Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove requirement of uAssets presence to build a package 

Related discussion:
- https://github.com/cliqz-oss/adblocker/pull/2075#discussion_r678654293
This commit is contained in:
Raymond Hill 2021-07-28 19:40:11 -04:00
parent e1222d1643
commit 09db8803c5
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/make-assets.sh
View File

@ -4,26 +4,35 @@
DES=$1/assets
printf "*** Packaging assets in $DES... "
if [ -n "${TRAVIS_TAG}" ]; then
pushd .. > /dev/null
git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git
popd > /dev/null
fi
echo "*** Packaging assets in $DES... "
rm -rf $DES
cp -R ./assets $DES/
mkdir $DES/thirdparties
cp -R ../uAssets/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/publicsuffix.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/urlhaus-filter $DES/thirdparties/
# Use existing uAssets, or git-clone a temporary one
if [ -d "../uAssets" ]; then
UASSETS=../uAssets
else
echo "*** ../uAssets not present, git-cloning..."
TMPDIR=$(mktemp -d)
UASSETS=$TMPDIR/uAssets
git clone --depth=1 https://github.com/uBlockOrigin/uAssets.git $UASSETS
fi
cp -R $UASSETS/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/
cp -R $UASSETS/thirdparties/pgl.yoyo.org $DES/thirdparties/
cp -R $UASSETS/thirdparties/publicsuffix.org $DES/thirdparties/
cp -R $UASSETS/thirdparties/urlhaus-filter $DES/thirdparties/
mkdir $DES/ublock
cp -R ../uAssets/filters/* $DES/ublock/
cp -R $UASSETS/filters/* $DES/ublock/
# Optional filter lists: do not include in package
rm $DES/ublock/annoyances.txt
echo "done."
# Remove temporary git-clone uAssets
if [ -n "$TMPDIR" ]; then
echo "*** Removing temporary $TMPDIR"
rm -rf $TMPDIR
fi

34
tools/make-nodejs.sh
View File

@ -21,17 +21,47 @@ cp -R src/lib/punycode.js $DES/lib/
cp -R src/lib/publicsuffixlist $DES/lib/
cp -R src/lib/regexanalyzer $DES/lib/
# Use existing uAssets, or git-clone a temporary one
if [ -d "../uAssets" ]; then
UASSETS=../uAssets
else
echo "*** ../uAssets not present, git-cloning..."
TMPDIR=$(mktemp -d)
UASSETS=$TMPDIR/uAssets
git clone --depth=1 https://github.com/uBlockOrigin/uAssets.git $UASSETS
fi
# https://github.com/uBlockOrigin/uBlock-issues/issues/1664#issuecomment-888332409
THIRDPARTY=../uAssets/thirdparties/publicsuffix.org
THIRDPARTY=$UASSETS/thirdparties/publicsuffix.org
mkdir -p $DES/data
node -pe "JSON.stringify(fs.readFileSync('$THIRDPARTY/list/effective_tld_names.dat', 'utf8'))" \
> $DES/data/effective_tld_names.json
THIRDPARTY=../uAssets/thirdparties/easylist-downloads.adblockplus.org
THIRDPARTY=$UASSETS/thirdparties/easylist-downloads.adblockplus.org
node -pe "JSON.stringify(fs.readFileSync('$THIRDPARTY/easylist.txt', 'utf8'))" \
> $DES/data/easylist.json
node -pe "JSON.stringify(fs.readFileSync('$THIRDPARTY/easyprivacy.txt', 'utf8'))" \
> $DES/data/easyprivacy.json
# Remove temporary git-clone uAssets
if [ -n "$TMPDIR" ]; then
echo "*** Removing temporary $TMPDIR"
rm -rf $TMPDIR
fi
cp platform/nodejs/*.js $DES/
cp platform/nodejs/*.json $DES/
cp LICENSE.txt $DES/
if [ "$1" = all ]; then
echo "*** uBlock0.nodejs: Creating plain package..."
pushd $(dirname $DES/) > /dev/null
zip uBlock0.nodejs.zip -qr $(basename $DES/)/*
popd > /dev/null
elif [ -n "$1" ]; then
echo "*** uBlock0.nodejs: Creating versioned package..."
pushd $(dirname $DES/) > /dev/null
zip uBlock0_"$1".nodejs.zip -qr $(basename $DES/)/*
popd > /dev/null
fi
echo "*** uBlock0.nodejs: Package done."