- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 03 Sep 2009 02:30:12 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup In directory hutz:/tmp/cvs-serv17542 Modified Files: Makefile .cvsignore Added Files: schema.html Log Message: build tweaks Index: .cvsignore =================================================================== RCS file: /sources/public/html5/markup/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- .cvsignore 29 Jul 2009 10:01:29 -0000 1.18 +++ .cvsignore 3 Sep 2009 02:30:09 -0000 1.19 @@ -1,17 +1,10 @@ -schema *.rng *.combined -combine.xsl html.rnc.xml assertions.sch.xml -schema.rnc.tmp html.rnc.spec.html -html-compiled.rng.combined.spec html.spec.src.html -html.css html.css.xml webapps.html -named.html -writing.html html.css.LICENSE.xml LICENSE.xml Index: Makefile =================================================================== RCS file: /sources/public/html5/markup/Makefile,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- Makefile 30 Aug 2009 04:30:36 -0000 1.80 +++ Makefile 3 Sep 2009 02:30:09 -0000 1.81 @@ -33,7 +33,10 @@ all: Overview.html spec.html -html.rng: $(SCHEMA_FILES) patch-schema +patch-schema: $(SCHEMA_FILES) + $(SVN) $(SVNFLAGS) diff --depth files schema > $@ + +html.rng: $(SCHEMA_FILES) $(TRANG) $(TRANGFLAGS) html.rnc $@ html-compiled.rng: html.rng @@ -43,7 +46,7 @@ $(XSLTPROC) $(XSLTPROCFLAGS) tools/combine.xsl $< \ | $(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl - > $@ -html.rnc.spec.html: html-compiled.rng.combined +schema.html: html-compiled.rng.combined $(JAVA) $(JAVAFLAGS) -jar tools/trang.jar -I rng -O rnc $< $@ # $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@ $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<a[^<]+<\/a> notAllowed//g' $@ @@ -64,7 +67,7 @@ elements/h2.html elements/h3.html elements/h4.html elements/h5.html elements/h6.html: elements/h1.html cp $< $@ -html.spec.src.html: html-compiled.rng html.rnc.spec.html \ +html.spec.src.html: html-compiled.rng schema.html \ tools/generate-spec-source.xsl schema/assertions.sch \ src/head.html src/header.src.html src/intro-scope.html \ src/terms.html src/syntax.html src/documents.html \ @@ -98,11 +101,11 @@ $(XSLTPROC) $(XSLTPROCFLAGS) tools/combine.xsl $< \ | $(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl - > $@ -aria/html.rnc.spec.html: aria/html-compiled.rng.combined - $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@ +aria/schema.html: aria/html-compiled.rng.combined + $(JAVA) $(JAVAFLAGS) -jar tools/trang.jar -I rng -O rnc $< $@ $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<a[^<]+<\/a> notAllowed//g' $@ -aria/html.spec.src.html: aria/html-compiled.rng aria/html.rnc.spec.html \ +aria/html.spec.src.html: aria/html-compiled.rng aria/schema.html \ tools/generate-spec-source.xsl schema/assertions.sch \ src/head.html src/header.src.html src/intro-scope.html \ src/terms.html src/syntax.html src/documents.html \ @@ -110,7 +113,7 @@ LICENSE.xml html.css.xml html.css.LICENSE.xml $(XSLTPROC) $(XSLTPROCFLAGS) \ --param aria 1 \ - --stringparam rnc-html "../aria/html.rnc.spec.html" \ + --stringparam rnc-html "../aria/schema.html" \ --stringparam head "../aria/head.src.html" \ --stringparam header "../aria/header.src.html" \ tools/generate-spec-source.xsl $< > $@ @@ -148,23 +151,8 @@ | $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/ xmlns=""//g' \ > $@ -#schema.rnc: html-compiled.rng.combined -# $(TRANG) $(TRANGFLAGS) -I rng -O rnc $< $@.tmp -# # do correction for trang problem that creates undesirable -# # newlines before annotations -# $(PERL) $(PERLFLAGS) -p -e 'undef $$/; s/#\n\s*\n(\s*)#/#\n$$1#/g' $@.tmp > $@ - -#html.rnc.xml: schema.rnc -# echo "<schema>" > $@ -# $(PERL) $(PERLFLAGS) -p -e "s/&/&/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</</g" >> $@ -# echo "</schema>" >> $@ - -#schema.html: html-compiled.rng.combined -# $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_CGI) -o $@ - clean: $(RM) html.rng - $(RM) html.rnc.spec.html $(RM) LICENSE.xml $(RM) html.css.LICENSE.xml $(RM) html.css.xml @@ -176,7 +164,6 @@ $(RM) html-compiled.rng $(RM) html-compiled.rng.combined $(RM) aria/html.rng - $(RM) aria/html.rnc.spec.html $(RM) aria/html.spec.src.html ifneq ($(ARIA_OTHER_RNG),) $(RM) $(ARIA_OTHER_RNG) @@ -186,12 +173,14 @@ distclean: clean ifneq ($(WHATTF_SCHEMA),) - $(RM) -r schema/*.rnc - $(RM) -r schema/*.sch - $(RM) -r schema/LICENSE - cp -pR $(WHATTF_SCHEMA)/*.rnc schema - cp -pR $(WHATTF_SCHEMA)/*.sch schema - cp -pR $(WHATTF_SCHEMA)/LICENSE schema + $(RM) schema/*.rnc + $(RM) schema/*.sch + $(RM) schema/LICENSE + $(RM) -r schema/.svn + cp -p $(WHATTF_SCHEMA)/*.rnc schema + cp -p $(WHATTF_SCHEMA)/*.sch schema + cp -p $(WHATTF_SCHEMA)/LICENSE schema + cp -pR $(WHATTF_SCHEMA)/.svn schema -$(PATCH) $(PATCHFLAGS) < patch-schema endif $(CURL) $(CURLFLAGS) -o html.css http://svn.webkit.org/repository/webkit/trunk/WebCore/css/html.css --- NEW FILE: schema.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html xmlns='http://www.w3.org/1999/xhtml'> <head> <title>HTML5 schema</title> <style> body { background-color: #eee; } .comment { display: block; } #schema > .chunk { background-color: lightyellow; margin-top: 20px; margin-left: 20px; margin-bottom: 20px; } #schema > .define { background-color: lightyellow; [...6397 lines suppressed...] <span class='name'>optimum</span> {<span class='model'> <a class='ref' href='#common.data.float' title='common.data.float'>float</a> </span>} </span> </div> <div class='define' id='meter.inner-define'> <div class='patternname' id='the-meter.inner'><a href='#the-meter.inner'>meter.inner</a> =</div> <span class='pattern' id='meter.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span> </div> </div> </div>default namespace = "http://www.w3.org/1999/xhtml" <div class='datatypes'>datatypes d = "http://whattf.org/datatype-draft"</div> </div> </body> </html>
Received on Thursday, 3 September 2009 02:30:21 UTC