Skip to content

Navigation Menu

Sign in
Appearance settings
Sign in
Sign up
Appearance settings

Commit 22a9ea3

Browse filesBrowse the repository at this point in the historyBrowse files
kfranqueirosvgeesus
kfranqueiro
authored and
svgeesus
committed
Convert Makefiles and shell scripts to use spec-generator URLs
1 parent abdb55d commit 22a9ea3
Copy full SHA for 22a9ea3

17 files changed

+84-102Lines changed: 84 additions & 102 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎bin/bikeshed-curl‎

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
curl http://api.csswg.org/bikeshed/ -F file=@Overview.bs -F output=err
2-
curl http://api.csswg.org/bikeshed/ -F file=@Overview.bs -F force=1 > Overview.html
1+
curl https://www.w3.org/publications/spec-generator/ -F file=@Overview.bs -F type=bikeshed-spec -F output=messages
2+
curl https://www.w3.org/publications/spec-generator/ -F file=@Overview.bs -F type=bikeshed-spec -F die-on=nothing > Overview.html
Collapse file

‎css-backgrounds-3/Makefile‎

Copy file name to clipboardExpand all lines: css-backgrounds-3/Makefile
+5-8Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
88
# Or set that URL to [VERSION] and call Make as: make status=CR
99
#
10-
#
11-
# Possible other options to add to the curl command below:
12-
# -F ids=on
13-
# -F omitdchtml=on
14-
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
10+
# Additional options may be specified via opts, e.g.:
11+
# make opts='-F md-prepare-for-tr=yes'
1512

1613
cdate =
1714
status =
@@ -43,11 +40,11 @@ opts =
4340

4441
all: check Overview.html
4542

46-
# egrep will exit with a zero exit code if there is anything left
43+
# fgrep will exit with a zero exit code if there is anything left
4744
check: Overview.err
4845
@cat $<
49-
@if egrep -v '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
50-
then false; else true; fi
46+
@if fgrep -q '"messageType":"success"' $<;\
47+
then true; else false; fi
5148

5249

5350
# A handy shortcut:
Collapse file

‎css-box-3/Makefile‎

Copy file name to clipboardExpand all lines: css-box-3/Makefile
+7-13Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@
99
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
1010
# Or set that URL to [VERSION] and call Make as: make status=CR
1111
#
12-
#
13-
# Possible other options to add to the curl command below:
14-
# -F ids=on
15-
# -F omitdchtml=on
16-
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
12+
# Additional options may be specified via opts, e.g.:
13+
# make opts='-F md-prepare-for-tr=yes'
1714

1815
date ?=
1916
status ?= ED
2017
group ?= CSS
2118
opts ?=
2219
target ?= Overview
23-
markup ?= html
2420
cdate ?= $(date)
2521

2622

@@ -37,14 +33,13 @@ cdate ?= $(date)
3733
%.html: %.bs
3834
@echo "- Calling Bikeshed to generate $@..."
3935
@curl -o $@ -s -L -F file=@$< -F md-date=$(cdate) -F md-status=$(status) \
40-
-F output=html -F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/
36+
-F type=bikeshed-spec -F output=html $(opts) https://www.w3.org/publications/spec-generator/
4137
%.err: %.bs
4238
@echo "- Calling Bikeshed to check $<..."
4339
@rm -f $@
4440
@touch $@
4541
@curl -o $@ -s -L -F file=@$< -F md-date=$(cdate) -F md-status=$(status) \
46-
-F output=err -F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/
47-
@sed -i 's/\\033\[[0-9;]*m//g' $@
42+
-F type=bikeshed-spec -F output=messages $(opts) https://www.w3.org/publications/spec-generator/
4843

4944
# For Dispositions of Comments in css3-background:
5045
%.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
@@ -61,13 +56,12 @@ cdate ?= $(date)
6156

6257
all: check $(target).html
6358

64-
# egrep will exit with a zero exit code if there is anything left
59+
# fgrep will exit with a zero exit code if there is anything left
6560
check: $(target).err
6661
@cat $<
6762
@echo
68-
@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $< &&\
69-
! egrep -q '[^A-Z]* Successfully generated' $<;\
70-
then false; else true; fi
63+
@if fgrep -q '"messageType":"success"' $<;\
64+
then true; else false; fi
7165

7266

7367
# A handy shortcut:
Collapse file

‎css-inline-3/Makefile‎

Copy file name to clipboardExpand all lines: css-inline-3/Makefile
+9-13Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@
77
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
88
# Or set that URL to [VERSION] and call Make as: make status=CR
99
#
10-
#
11-
# Possible other options to add to the curl command below:
12-
# -F ids=on
13-
# -F omitdchtml=on
14-
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
10+
# Additional options may be specified via opts, e.g.:
11+
# make opts='-F md-prepare-for-tr=yes'
1512

1613
cdate ?=
1714
status ?=
1815
group ?= CSS
1916
opts ?=
2017
target ?= Overview
21-
markup ?= html
2218

2319
%.html: %.src.html
2420
@echo "Calling post-processor to generate $@..."
@@ -31,11 +27,11 @@ markup ?= html
3127
-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
3228
$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
3329
%.html: %.bs
34-
curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
35-
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
30+
curl -s -L -F file=@$< -F md-date=$(cdate) -F output=html \
31+
-F type=bikeshed-spec $(opts) -o $@ https://www.w3.org/publications/spec-generator/
3632
%.err: %.bs
37-
curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
38-
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
33+
curl -s -L -F file=@$< -F md-date=$(cdate) -F output=messages \
34+
-F type=bikeshed-spec $(opts) -o $@ https://www.w3.org/publications/spec-generator/
3935

4036
# For Dispositions of Comments in css3-background:
4137
%.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
@@ -52,11 +48,11 @@ markup ?= html
5248

5349
all: check $(target).html
5450

55-
# egrep will exit with a zero exit code if there is anything left
51+
# fgrep will exit with a zero exit code if there is anything left
5652
check: $(target).err
5753
@cat $<
58-
@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
59-
then false; else true; fi
54+
@if fgrep -q '"messageType":"success"' $<;\
55+
then true; else false; fi
6056

6157

6258
# A handy shortcut:
Collapse file

‎css-mobile/Makefile‎

Copy file name to clipboardExpand all lines: css-mobile/Makefile
+7-13Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@
99
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
1010
# Or set that URL to [VERSION] and call Make as: make status=CR
1111
#
12-
#
13-
# Possible other options to add to the curl command below:
14-
# -F ids=on
15-
# -F omitdchtml=on
16-
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
12+
# Additional options may be specified via opts, e.g.:
13+
# make opts='-F md-prepare-for-tr=yes'
1714

1815
date ?=
1916
status ?= ED
2017
group ?= CSS
2118
opts ?=
2219
target ?= Overview
23-
markup ?= html
2420
cdate ?= $(date)
2521

2622

@@ -37,14 +33,13 @@ cdate ?= $(date)
3733
%.html: %.bs
3834
@echo "- Calling Bikeshed to generate $@..."
3935
@curl -o $@ -s -L -F file=@$< -F md-date=$(cdate) -F md-status=$(status) \
40-
-F output=html -F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/
36+
-F output=html -F type=bikeshed-spec $(opts) https://www.w3.org/publications/spec-generator/
4137
%.err: %.bs
4238
@echo "- Calling Bikeshed to check $<..."
4339
@rm -f $@
4440
@touch $@
4541
@curl -o $@ -s -L -F file=@$< -F md-date=$(cdate) -F md-status=$(status) \
46-
-F output=err -F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/
47-
@sed -i 's/\\033\[[0-9;]*m//g' $@
42+
-F output=messages -F type=bikeshed-spec $(opts) https://www.w3.org/publications/spec-generator/
4843

4944
# For Dispositions of Comments in css3-background:
5045
%.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
@@ -61,13 +56,12 @@ cdate ?= $(date)
6156

6257
all: check $(target).html
6358

64-
# egrep will exit with a zero exit code if there is anything left
59+
# fgrep will exit with a zero exit code if there is anything left
6560
check: $(target).err
6661
@cat $<
6762
@echo
68-
@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $< &&\
69-
! egrep -q '[^A-Z]* Successfully generated' $<;\
70-
then false; else true; fi
63+
@if fgrep -q '"messageType":"success"' $<;\
64+
then true; else false; fi
7165

7266

7367
# A handy shortcut:
Collapse file

‎css-print/Makefile‎

Copy file name to clipboardExpand all lines: css-print/Makefile
+7-13Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@
99
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
1010
# Or set that URL to [VERSION] and call Make as: make status=CR
1111
#
12-
#
13-
# Possible other options to add to the curl command below:
14-
# -F ids=on
15-
# -F omitdchtml=on
16-
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
12+
# Additional options may be specified via opts, e.g.:
13+
# make opts='-F md-prepare-for-tr=yes'
1714

1815
date ?=
1916
status ?= ED
2017
group ?= CSS
2118
opts ?=
2219
target ?= Overview
23-
markup ?= html
2420
cdate ?= $(date)
2521

2622

@@ -37,14 +33,13 @@ cdate ?= $(date)
3733
%.html: %.bs
3834
@echo "- Calling Bikeshed to generate $@..."
3935
@curl -o $@ -s -L -F file=@$< -F md-date=$(cdate) -F md-status=$(status) \
40-
-F output=html -F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/
36+
-F output=html -F type=bikeshed-spec $(opts) https://www.w3.org/publications/spec-generator/
4137
%.err: %.bs
4238
@echo "- Calling Bikeshed to check $<..."
4339
@rm -f $@
4440
@touch $@
4541
@curl -o $@ -s -L -F file=@$< -F md-date=$(cdate) -F md-status=$(status) \
46-
-F output=err -F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/
47-
@sed -i 's/\\033\[[0-9;]*m//g' $@
42+
-F output=messages -F type=bikeshed-spec $(opts) https://www.w3.org/publications/spec-generator/
4843

4944
# For Dispositions of Comments in css3-background:
5045
%.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
@@ -61,13 +56,12 @@ cdate ?= $(date)
6156

6257
all: check $(target).html
6358

64-
# egrep will exit with a zero exit code if there is anything left
59+
# fgrep will exit with a zero exit code if there is anything left
6560
check: $(target).err
6661
@cat $<
6762
@echo
68-
@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $< &&\
69-
! egrep -q '[^A-Z]* Successfully generated' $<;\
70-
then false; else true; fi
63+
@if fgrep -q '"messageType":"success"' $<;\
64+
then true; else false; fi
7165

7266

7367
# A handy shortcut:
Collapse file

‎css-regions-1/Makefile‎

Copy file name to clipboard
+18-10Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
1-
# use this command line now, or a local bikeshed
1+
# Use this command with local bikeshed:
2+
# bikeshed spec Overview.bs Overview.html
23

3-
# curl http://api.csswg.org/bikeshed/ -F file=@Overview.src.html > Overview.html
4+
# spec-generator can be used, but sending only Overview.bs will lose img width/height generation
5+
# curl https://www.w3.org/publications/spec-generator/ -F type=bikeshed-spec -F file=@Overview.bs > Overview.html
46

5-
%.html: %.src.html
6-
curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
7-
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
8-
%.err: %.src.html
9-
curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
10-
-F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/ >$@
7+
target ?= Overview
8+
9+
%.html: %.bs
10+
curl -s -L -F file=@$< -F md-date=$(cdate) -F output=html \
11+
-F type=bikeshed-spec $(opts) -o $@ https://www.w3.org/publications/spec-generator/
12+
%.err: %.bs
13+
curl -s -L -F file=@$< -F md-date=$(cdate) -F output=messages \
14+
-F type=bikeshed-spec $(opts) https://www.w3.org/publications/spec-generator/ >$@
1115

1216
all: check Overview.html
1317

14-
check: Overview.err
15-
@if test -s $<; then false; else true; fi
18+
check: $(target).err
1619
@cat $<
20+
@if fgrep -q '"messageType":"success"' $<;\
21+
then true; else false; fi
22+
23+
clean:
24+
rm -f $(target).html $(target).err
Collapse file

‎css-shapes-1/Makefile‎

Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
# use this command line now, or a local bikeshed
1+
# Use this command with local bikeshed:
2+
# bikeshed spec Overview.bs Overview.html
23

3-
# curl http://api.csswg.org/bikeshed/ -F file=@Overview.src.html > Overview.html
4+
# spec-generator can be used, but sending only Overview.bs will lose img width/height generation
5+
# curl https://www.w3.org/publications/spec-generator/ -F type=bikeshed-spec -F file=@Overview.bs > Overview.html
Collapse file

‎css-template-1/Makefile‎

Copy file name to clipboardExpand all lines: css-template-1/Makefile
+9-13Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,14 @@
1111
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
1212
# Or set that URL to [VERSION] and call Make as: make status=CR
1313
#
14-
#
15-
# Possible other options to add to the curl command below:
16-
# -F ids=on
17-
# -F omitdchtml=on
18-
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
14+
# Additional options may be specified via opts, e.g.:
15+
# make opts='-F md-prepare-for-tr=yes'
1916

2017
date ?=
2118
status ?=
2219
group ?= CSS
2320
opts ?=
2421
target ?= Overview
25-
markup ?= html
2622
cdate ?= $(date)
2723

2824
%.html: %.src.html $(MAKEFILE_LIST) %.options
@@ -36,13 +32,13 @@ cdate ?= $(date)
3632
-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
3733
$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
3834
%.html: %.tmp
39-
curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
40-
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
35+
curl -s -L -F file=@$< -F md-date=$(cdate) -F output=html \
36+
-F type=bikeshed-spec $(opts) -o $@ https://www.w3.org/publications/spec-generator/
4137
%.err: %.tmp
4238
rm -f $@
4339
touch $@
44-
curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
45-
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
40+
curl -s -L -F file=@$< -F md-date=$(cdate) -F output=messages \
41+
-F type=bikeshed-spec $(opts) -o $@ https://www.w3.org/publications/spec-generator/
4642

4743
%.tmp: %.bs $(MAKEFILE_LIST) %.options
4844
cp $< $@
@@ -84,11 +80,11 @@ cdate ?= $(date)
8480

8581
all: check $(target).html
8682

87-
# egrep will exit with a zero exit code if there is anything left
83+
# fgrep will exit with a zero exit code if there is anything left
8884
check: $(target).err
8985
@cat $<
90-
@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
91-
then false; else true; fi
86+
@if fgrep -q '"messageType":"success"' $<;\
87+
then true; else false; fi
9288

9389

9490
# A handy shortcut:
Collapse file

‎css-transforms-1/Makefile‎

Copy file name to clipboardExpand all lines: css-transforms-1/Makefile
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
SOURCEFILE=Overview.bs
66
OUTPUTFILE=Overview.html
77
PREPROCESSOR=bikeshed.py
8-
REMOTE_PREPROCESSOR_URL=https://api.csswg.org/bikeshed/
8+
REMOTE_PREPROCESSOR_URL=https://www.w3.org/publications/spec-generator/
99

1010
all: $(OUTPUTFILE)
1111

1212
$(OUTPUTFILE): $(SOURCEFILE)
1313
ifneq (,$(REMOTE))
14-
curl $(REMOTE_PREPROCESSOR_URL) -F file=@$(SOURCEFILE) > "$@"
14+
curl $(REMOTE_PREPROCESSOR_URL) -F file=@$(SOURCEFILE) -F type=bikeshed-spec > "$@"
1515
else
1616
$(PREPROCESSOR) -f spec "$<" "$@"
1717
endif

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.