update packaging scripts for https://github.com/uBlockOrigin/uAssets …

…repo
diophung · Apr 3, 2016 · cad3c5f · cad3c5f
1 parent ebcafc8
commit cad3c5f
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 15 deletions.
diff --git a/src/js/assets.js b/src/js/assets.js
@@ -295,6 +295,13 @@ var toRepoURL = function(path) {
         return projectRepositoryRoot + path;
     }
 
+    if ( path.startsWith('assets/checksums.txt') ) {
+        return path.replace(
+            /^assets\/checksums.txt/,
+            assetsRepositoryRoot + 'checksums/ublock0.txt'
+        );
+    }
+
     if ( path.startsWith('assets/thirdparties/') ) {
         return path.replace(
             /^assets\/thirdparties\//,

diff --git a/tools/make-assets.sh b/tools/make-assets.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# This script assumes a linux environment
+
+DES=$1/assets
+
+echo "*** uBlock0.chromium: packaging assets in $DES"
+
+rm -rf $DES
+mkdir $DES
+
+mkdir $DES/thirdparties
+cp -R ../uAssets/thirdparties/easylist-downloads.adblockplus.org $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/www.malwaredomainlist.com          $DES/thirdparties/
+
+mkdir $DES/ublock
+cp -R ../uAssets/filters/*                                       $DES/ublock/
+cp -R ./assets/ublock/filter-lists.json                          $DES/ublock/
+
+cp ../uAssets/checksums/ublock0.txt                              $DES/checksums.txt
+
+echo "*** uBlock0.chromium: packaging assets: done."
diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
@@ -9,20 +9,20 @@ DES=dist/build/uBlock0.chromium
 rm -rf $DES
 mkdir -p $DES
 
-cp -R assets $DES/
-rm $DES/assets/*.sh
-cp -R src/css $DES/
-cp -R src/img $DES/
-cp -R src/js $DES/
-cp -R src/lib $DES/
-cp -R src/_locales $DES/
-cp -R $DES/_locales/nb $DES/_locales/no
-cp src/*.html $DES/
-cp platform/chromium/*.js $DES/js/
+./tools/make-assets.sh $DES
+
+cp -R src/css               $DES/
+cp -R src/img               $DES/
+cp -R src/js                $DES/
+cp -R src/lib               $DES/
+cp -R src/_locales          $DES/
+cp -R $DES/_locales/nb      $DES/_locales/no
+cp src/*.html               $DES/
+cp platform/chromium/*.js   $DES/js/
 cp -R platform/chromium/img $DES/
 cp platform/chromium/*.html $DES/
 cp platform/chromium/*.json $DES/
-cp LICENSE.txt $DES/
+cp LICENSE.txt              $DES/
 
 if [ "$1" = all ]; then
     echo "*** uBlock0.chromium: Creating package..."

diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
@@ -8,8 +8,8 @@ DES=dist/build/uBlock0.firefox
 rm -rf $DES
 mkdir -p $DES
 
-cp -R assets                            $DES/
-rm    $DES/assets/*.sh
+./tools/make-assets.sh $DES
+
 cp -R src/css                           $DES/
 cp -R src/img                           $DES/
 cp -R src/js                            $DES/

diff --git a/tools/make-opera.sh b/tools/make-opera.sh
@@ -9,8 +9,8 @@ DES=dist/build/uBlock0.opera
 rm -r $DES
 mkdir -p $DES
 
-cp -R assets $DES/
-rm $DES/assets/*.sh
+./tools/make-assets.sh $DES
+
 cp -R src/css $DES/
 cp -R src/img $DES/
 cp -R src/js $DES/