Fix rules test by copying rulesets.json in extension make scripts rather than in validate.sh

Hainish · Hainish · commit 04cf8a8933f5 · 2016-09-19T19:12:24.000-07:00
diff --git a/makecrx.sh b/makecrx.sh
@@ -49,7 +49,7 @@ needs_update() {
 }
 if [ ! -f "$RULESETS_JSON" ] || needs_update ; then
   echo "Generating ruleset DB"
-  python2.7 ./utils/make-json.py && bash utils/validate.sh
+  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
diff --git a/makexpi.sh b/makexpi.sh
@@ -84,6 +84,7 @@ die() {
 }
 
 bash utils/validate.sh
+cp pkg/rulesets.json src/chrome/content/rulesets.json
 
 # 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`"
diff --git a/utils/validate.sh b/utils/validate.sh
@@ -47,5 +47,3 @@ else
   fi
   die "Validation of rulesets against $GRAMMAR failed."
 fi
-
-cp "../pkg/rulesets.json" ../src/chrome/content/rulesets.json

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ needs_update() {`
`49`	`49`	`}`
`50`	`50`	`if [ ! -f "$RULESETS_JSON" ] \|\| needs_update ; then`
`51`	`51`	`echo "Generating ruleset DB"`
`52`		`- python2.7 ./utils/make-json.py && bash utils/validate.sh`
	`52`	`+ python2.7 ./utils/make-json.py && bash utils/validate.sh && cp pkg/rulesets.json src/chrome/content/rulesets.json`
`53`	`53`	`fi`
`54`	`54`
`55`	`55`	`sed -e "s/VERSION/$VERSION/g" chromium/updates-master.xml > chromium/updates.xml`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ die() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`bash utils/validate.sh`
	`87`	`+cp pkg/rulesets.json src/chrome/content/rulesets.json`
`87`	`88`
`88`	`89`	`# The name/version of the XPI we're building comes from src/install.rdf`
`89`	`90`	XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf \| sed -e 's/[<>]/ /g' \| cut -f3`"