Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Commit

Permalink
Fix rules test by copying rulesets.json in extension make scripts rat…
Browse files Browse the repository at this point in the history
…her than in validate.sh
  • Loading branch information
Hainish committed Sep 20, 2016
1 parent bb6aa1d commit 04cf8a8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion makecrx.sh
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions makexpi.sh
Expand Up @@ -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`"
Expand Down
2 changes: 0 additions & 2 deletions utils/validate.sh
Expand Up @@ -47,5 +47,3 @@ else
fi
die "Validation of rulesets against $GRAMMAR failed."
fi

cp "../pkg/rulesets.json" ../src/chrome/content/rulesets.json

0 comments on commit 04cf8a8

Please sign in to comment.