Delete make-json.py (EFForg#12738)

koops76 · Hainish · commit 809238db2230 · 2017-10-20T17:43:01.000-07:00
diff --git a/makecrx.sh b/makecrx.sh
@@ -19,7 +19,6 @@
 # releases signed by EFF :/.  We should find a more elegant arrangement.
 
 cd $(dirname $0)
-RULESETS_JSON=pkg/rulesets.json
 
 if [ -n "$1" ]; then
   BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
@@ -41,17 +40,6 @@ echo "Building chrome version" $VERSION
 # Clean up obsolete ruleset databases, just in case they still exist.
 rm -f src/chrome/content/rules/default.rulesets src/defaults/rulesets.sqlite
 
-# Only generate the ruleset database if any rulesets have changed. Tried
-# implementing this with make, but make is very slow with 15k+ input files.
-needs_update() {
-  find src/chrome/content/rules/ -newer $RULESETS_JSON |\
-    grep -q .
-}
-if [ ! -f "$RULESETS_JSON" ] || needs_update ; then
-  echo "Generating ruleset DB"
-  python2.7 ./utils/make-json.py && bash utils/validate.sh && cp pkg/rulesets.json src/chrome/content/rulesets.json
-fi
-
 sed -e "s/VERSION/$VERSION/g" chromium/updates-master.xml > chromium/updates.xml
 
 mkdir -p pkg/crx/rules
diff --git a/makexpi.sh b/makexpi.sh
@@ -16,7 +16,6 @@ APP_NAME=https-everywhere
 #  ./makexpi.sh 0.2.3.development.2
 
 cd "`dirname $0`"
-RULESETS_JSON=pkg/rulesets.json
 ANDROID_APP_ID=org.mozilla.firefox
 VERSION=`echo $1 | cut -d "-" -f 2`
 
@@ -57,24 +56,6 @@ fi
 # Clean up obsolete ruleset databases, just in case they still exist.
 rm -f src/chrome/content/rules/default.rulesets src/defaults/rulesets.sqlite
 
-# Only generate the ruleset database if any rulesets have changed. Tried
-# implementing this with make, but make is very slow with 15k+ input files.
-needs_update() {
-  find src/chrome/content/rules/ -newer $RULESETS_JSON |\
-    grep -q .
-}
-if [ ! -f "$RULESETS_JSON" ] || needs_update ; then
-  # This is an optimization to get the OS reading the rulesets into RAM ASAP;
-  # it's useful on machines with slow disk seek times; doing several of these
-  # at once allows the IO subsystem to seek more efficiently.
-  for firstchar in `echo {a..z} {A..Z} {0..9}` ; do
-    # Those cover everything but it wouldn't matter if they didn't
-    nohup cat src/chrome/content/rules/"$firstchar"*.xml >/dev/null 2>/dev/null &
-  done
-  echo "Generating ruleset DB"
-  python2.7 ./utils/make-json.py
-fi
-
 # =============== BEGIN VALIDATION ================
 # Unless we're in a hurry, validate the ruleset library & locales
 
diff --git a/utils/make-json.py b/utils/make-json.py
