Add make-sqlite to make{xpi,crx} before validation.

jsha · jsha · commit ba9db3fc1ddd · 2014-08-16T09:49:41.000-04:00
diff --git a/makecrx.sh b/makecrx.sh
@@ -36,6 +36,13 @@ VERSION=`python -c "import json ; print(json.loads(open('chromium/manifest.json'
 
 echo "Building chrome version" $VERSION
 
+# Build the SQLite DB even though we don't yet use it in the Chrome extension,
+# because trivial-validate.py depends on it.
+if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
+  echo "Generating sqlite DB"
+  python2.7 ./utils/make-sqlite.py src/chrome/content/rules
+fi
+
 if [ -f utils/trivial-validate.py ]; then
 	VALIDATE="./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
 elif [ -x utils/trivial-validate ] ; then
diff --git a/makexpi.sh b/makexpi.sh
@@ -58,6 +58,11 @@ fi
 nohup cat src/chrome/content/rules/*.xml >/dev/null 2>/dev/null &
 
 
+if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
+  echo "Generating sqlite DB"
+  python2.7 ./utils/make-sqlite.py src/chrome/content/rules
+fi
+
 # =============== BEGIN VALIDATION ================
 # Unless we're in a hurry, validate the ruleset library & locales
 
@@ -108,11 +113,6 @@ if [ "$1" != "--fast" ] ; then
 fi
 # =============== END VALIDATION ================
 
-if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
-  echo "Generating sqlite DB"
-  python2.7 ./utils/make-sqlite.py src/chrome/content/rules
-fi
-
 # The name/version of the XPI we're building comes from src/install.rdf
 XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/	/g' | cut -f3`"
 if [ "$1" ] && [ "$1" != "--fast" ] ; then
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -194,7 +194,6 @@ def nomes_all(where=sys.argv[1:]):
 xpath_from = etree.XPath("/ruleset/rule/@from")
 xpath_to = etree.XPath("/ruleset/rule/@to")
 
-print args.db
 conn = sqlite3.connect(args.db)
 c = conn.cursor()
 for row in c.execute('''SELECT contents from rulesets'''):
