[css-inline] Some extra rules in the Makefile

Author: bert-github

css-inline/Makefile

@@ -1,39 +1,79 @@
 # Calling the post-processor with file-upload. Assumes the username
-# and password are in ~/.curl-w3.org
+# and password are in ~/.curl-w3.org (user = USER:PASS)
 #
-# Possible other options:
-# -F date=YYYY-MM-DD
+# To set a date other than today, use: make cdate=YYYYMMDD
+#
+# To set the status, modify one of the "this version" URLs:
+# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
+# Or set that URL to [VERSION] and call Make as: make status=CR
+#
+#
+# Possible other options to add to the curl command below:
 # -F ids=on
+# -F omitdchtml=on
+# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
+
+cdate ?=
+status ?=
+group ?= CSS
+opts ?=
+target ?= Overview
+markup ?= html
 
 %.html: %.src.html
 	@echo "Calling post-processor to generate $@..."
-	@curl -F file=@$< -F group=CSS -F output=html -F method=file -s -K ~/.curl-w3.org https://www.w3.org/Style/Group/process.cgi >$@
+	@curl -K ~/.curl-w3.org -s -S -F output=html -F file=@$< \
+	-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
+	$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
 %.err: %.src.html
 	@echo "Calling post-processor to check $<..."
-	@curl -F file=@$< -F group=CSS -F output=err -F method=file -s -K ~/.curl-w3.org https://www.w3.org/Style/Group/process.cgi >$@
+	@curl -K ~/.curl-w3.org -s -S -F output=err -F file=@$< \
+	-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
+	$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
+%.html: %.bs
+	curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
+	-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
+%.err: %.bs
+	curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
+	-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
 
+# For Dispositions of Comments in css3-background:
+%.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
 
+# Rule to create PNG from FIG
+%.png: %.fig; fig2dev -L png -m 0.8 -S 4 $< $@
 
-all: check Overview.html
-	@echo Done.
+# Rule to create EPS from FIG
+%.eps: %.fig; fig2dev -m 0.8 -L eps -F -c $< $@
+
+# Rule to create PNG from EPS
+%.png: %.eps; convert -density 96x96 $< $@
 
-check: Overview.err
-	@cat $<
-	@grep -q '^No errors$$' $< # Force a non-zero exit code if errors
 
+all: check $(target).html
+
+# egrep will exit with a zero exit code if there is anything left
+check: $(target).err
+	@cat $<
+	@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
+	 then false; else true; fi
 
 
 # A handy shortcut:
 
-commit: update clean all
-	cvs commit -m 'Generated. Do not edit!' Overview.html
+commit: update all
+	hg commit -m 'Generated. Do not edit!' $(target).html || true
+	hg push
 
 update:
-	cvs update
+	hg pull
+	hg update
 
 clean:
-	rm Overview.html
+	rm -f $(target).html $(target).err
 
 
 
 .PHONY: check commit update clean
+.DELETE_ON_ERROR:
+.PRECIOUS: %.png