Skip to content

Commit db96a79

Browse files
committed
(1) integrate idl makefile into main makefile;
(2) correct handling of extended attrs on typedefs; (3) add build info to readme; (4) remove old, unused python files; (5) fix redundant status statement in status section; --HG-- rename : cssom/idl/cssom.js => cssom/cssom-generate-json.js rename : cssom/idl/cssom.idl => cssom/cssom.idl
1 parent a8848ab commit db96a79

12 files changed

Lines changed: 76 additions & 5011 deletions

cssom/Makefile

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,37 @@
11

2-
ANOLIS = anolis
3-
PYTHON = python
4-
NODE = node
5-
6-
XREFS = data/xrefs/css/cssom.json
7-
EDFILE = Overview.html
8-
TRFILE = TR/Overview.html
2+
ANOLIS = anolis
3+
NODE = node
4+
5+
IDLDRIVER = cssom.idl
6+
IDLFRAGS = idl/CSSFontFaceRule.idl \
7+
idl/CSSImportRule.idl \
8+
idl/CSSMediaRule.idl \
9+
idl/CSSNamespaceRule.idl \
10+
idl/CSSPageRule.idl \
11+
idl/CSSRule.idl \
12+
idl/CSSRuleList.idl \
13+
idl/CSSStyleDeclaration.idl \
14+
idl/CSSStyleRule.idl \
15+
idl/CSSStyleSheet.idl \
16+
idl/Document.idl \
17+
idl/ElementCSSInlineStyle.idl \
18+
idl/LinkStyle.idl \
19+
idl/MediaList.idl \
20+
idl/ProcessingInstruction.idl \
21+
idl/StyleSheet.idl \
22+
idl/StyleSheetList.idl \
23+
idl/Window.idl
24+
JSONFILE = cssom.json
25+
XREFS = data/xrefs/css/cssom.json
26+
EDFILE = Overview.html
27+
TRFILE = TR/Overview.html
928

1029
all: $(EDFILE)
1130

12-
Overview.src.html: cssom-generate.js idl/cssom.json cssom-source
31+
$(JSONFILE): cssom-generate-json.js $(IDLDRIVER) $(IDLFRAGS)
32+
gcc -E -x c -P -Iidl -C $(IDLDRIVER) | node cssom-generate-json.js > $@
33+
34+
Overview.src.html: cssom-generate.js $(JSONFILE) cssom-source
1335
$(NODE) cssom-generate.js > $@
1436

1537
$(XREFS): Overview.src.html Makefile
@@ -32,6 +54,7 @@ publish: $(TRFILE)
3254
clean::
3355
$(RM) $(EDFILE)
3456
$(RM) Overview.src.html
57+
$(RM) $(JSONFILE)
3558
echo '{ "definitions": {}, "url": "http://dvcs.w3.org/hg/csswg/raw-file/tip/cssom/Overview.html#" }' > $(XREFS)
3659

3760

cssom/Overview.html

Lines changed: 5 additions & 2437 deletions
Large diffs are not rendered by default.

cssom/Overview.src.html

Lines changed: 5 additions & 2354 deletions
Large diffs are not rendered by default.

cssom/README

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,42 @@ and syntax usage) are expected before concluding the above transition.
1717

1818
NOTES FOR EDITORS
1919

20-
1. At the current time, the pre-processor tool requires a modified version of
21-
WebIDL.js in order to support (1) string valued extended attributes and (2)
22-
extended attributes on typedefs and other extended attributes, e.g.,
23-
Constructor.
20+
1. The primary editor is using MacOSX 10.7.X (Lion) and tools provided via
21+
MacOSX, e.g., gcc, and MacPorts, e.g., py27-{lxml,html5lib} (used by anolis),
22+
so if you aren't using this platform or something close to it, you will have
23+
to account for any differences.
2424

25-
2. At the current time, due to use of the C pre-processor to aggregate IDL
25+
2. At the current time, the pre-processor tool requires a customized version
26+
of WebIDL.js in order to support (1) string valued extended attributes and
27+
(2) extended attributes on typedefs and other extended attributes, e.g.,
28+
Constructor. See http://github.com/skynavga/webidl.js to obtain this
29+
customized version.
30+
31+
3. At the current time, due to use of the C pre-processor to aggregate IDL
2632
file definitions, the value of 'Documentation' extended attributes must not
2733
contain an unescaped NEWLINE, meaning that values composed of multiple lines
2834
must use C pre-processor style continuation lines, i.e., end in a backslash
2935
character. This requirement is temporary and expected to go away in the
3036
near future.
3137

38+
BUILDING
39+
40+
1. Satisfy all build dependencies (see next section below).
41+
2. Run make (no arguments).
42+
3. Open the resulting output file Overview.html.
43+
44+
BUILD DEPENDENCIES
45+
46+
In order to build the CSSOM related specification, you must install and
47+
configure the following:
48+
49+
* node.js (http://nodejs.org)
50+
* webidl.js [customized] (http://github.com/skynavga/webidl.js)
51+
- must be loadable from node via require()
52+
* html5.js (http://github.com/aredridel/html5)
53+
- must be loadable from node via require()
54+
* anolis (http://wiki.whatwg.org/wiki/Anolis)
55+
3256
TO DO
3357

3458
1. IDL Pre-Processor Related
@@ -47,10 +71,3 @@ TO DO
4771
* Reorganize content sections, reordering aggregating/dividing as needed.
4872
* Fill in implicit TBDs.
4973
* Address outstanding bugs.
50-
51-
3. Miscellaneous
52-
53-
* Push WebIDL.js patch to DAP; push editor's working version to github.
54-
* Ensure any necessary changes to HTML5 parser or ANOLIS are posted.
55-
* Document custom build tools/process.
56-
* Integrate child (IDL) and parent (Overview.html) makefiles.

cssom/cssattrs.py

Lines changed: 0 additions & 124 deletions
This file was deleted.

cssom/cssom-generate.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

cssom/cssom-source

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,12 @@
8383
can be found in the
8484
<a href="http://www.w3.org/TR/">W3C technical reports index at http://www.w3.org/TR/.</a></em>
8585

86-
<p>This is the [DATE: 3 August 2002] [LONGSTATUS] of CSSOM. Please send
87-
comments to
86+
<p class="dontpublish">This is the [DATE: 3 August 2002] [LONGSTATUS] of CSSOM. Please send comments to
8887
<a href="mailto:www-style@w3.org?subject=%5Bcssom%5D%20">www-style@w3.org</a>
8988
(<a href="http://lists.w3.org/Archives/Public/www-style/">archived</a>)
9089
with <samp>[cssom]</samp> at the start of the subject line.
9190

92-
<p>This is the [DATE] First Public Working Draft of CSSOM, produced by the
91+
<p class="publish">This is the [DATE] First Public Working Draft of CSSOM, produced by the
9392
<a href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> (part
9493
of the <a href="http://www.w3.org/Style/">Style Activity</a>).
9594
<!--XXX remove "First Public" after initial publication -->
File renamed without changes.

cssom/idl/CSSRuleList.idl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
typedef
12
[Documentation=
23
"<p>The {@name} sequence represents an ordered collection of CSS style rules.</p>"
34
]
4-
typedef sequence<CSSRule> CSSRuleList;
5+
sequence<CSSRule> CSSRuleList;

0 commit comments

Comments
 (0)