Call merge-rulesets during makecrx.sh to generate default.rulesets

FauxFaux · FauxFaux · commit 0b7a64072f42 · 2012-04-21T00:30:43.000+01:00
diff --git a/makecrx.sh b/makecrx.sh
@@ -67,18 +67,19 @@ sed -e "s/VERSION/$VERSION/g" chromium/updates-master.xml > chromium/updates.xml
 
 [ -d pkg ] || mkdir -p pkg
 [ -e pkg/crx ] && rm -rf pkg/crx
-mkdir -p pkg/crx
+mkdir -p pkg/crx/rules
 cd pkg/crx
 ln -sf ../../chromium/* .
 do_not_ship="*.py *.xml icon.jpg"
 rm -f $do_not_ship
 cd ../..
-cp -r src/chrome/content/rules pkg/crx/
-# TODO: switch the chrome version over to using default.rulesets too
-# For now, don't ship it!
-[ -f pkg/crx/rules/default.rulesets ] && rm -f pkg/crx/rules/default.rulesets
+
+. merge-rulesets.sh
+
+cp src/$RULESETS pkg/crx/rules/default.rulesets
+
 echo 'var rule_list = [' > pkg/crx/rule_list.js
-for i in $(ls pkg/crx/rules/*.xml)
+for i in $(ls pkg/crx/rules/*.xml pkg/crx/rules/*.rulesets)
 do
     echo "\"rules/$(basename $i)\"," >> pkg/crx/rule_list.js
 done
diff --git a/makexpi.sh b/makexpi.sh
@@ -81,7 +81,9 @@ if [ -e "$GIT_OBJECT_FILE" ]; then
 	GIT_COMMIT_ID=$(cat "$GIT_OBJECT_FILE")
 fi
 
+
 . merge-rulesets.sh
+cd src
 
 # Build the XPI!
 rm -f "../$XPI_NAME"
diff --git a/merge-rulesets.sh b/merge-rulesets.sh
@@ -29,3 +29,5 @@ echo "Crushed $CRUSH bytes of rulesets into `rulesize`"
 # We make default.rulesets at build time, but it shouldn't have a variable
 # timestamp
 touch -r chrome/content/rules $RULESETS
+
+cd ..
