html5/markup Makefile,1.72,1.73 schema.html,1.110,1.111

Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv31880

Modified Files:
	Makefile schema.html 
Log Message:
makefile changes to speed things up


Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- schema.html	29 Jul 2009 01:57:06 -0000	1.110
+++ schema.html	29 Jul 2009 08:44:43 -0000	1.111
@@ -81,6530 +81,15 @@
 <body>
 <div id='schema'>
 <!-- 
-
-<div class='datatypes'>datatypes d =
-  "http://whattf.org/datatype-draft"</div> -->
-<div class='chunk'>
+ -->
 <div class='chunk'>
-<div class='define' id='replaceable-character-data-define'>
-<span class='comment'># #####################################################################</span>
[...6500 lines suppressed...]
-  <span class='pattern' id='meter.attrs.optimum'><span class='type'>attribute </span>
-  <span class='name'>optimum</span>
-   {<span class='model'>
-      <a class='ref' href='#common.data.float'>common.data.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>
-<span class='comment'># Cannot enforce textContent format here</span>
-
-</div>
-</div>
-</div>
-<div class='datatypes'>datatypes d =
-  "http://whattf.org/datatype-draft"</div>
 </div>
 
 </body>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Makefile	14 Jul 2009 16:30:15 -0000	1.72
+++ Makefile	29 Jul 2009 08:44:43 -0000	1.73
@@ -19,7 +19,7 @@
 PATCHFLAGS=-N -p0
 
 #INCELIM_BASE_URL=http://ftp.davidashen.net/incelim/
-INCELIM_BASE_URL=http://dev.w3.org/buildtools/rng/deps/
+#INCELIM_BASE_URL=http://dev.w3.org/buildtools/rng/deps/
 INCELIM_DIR=rng-incelim-1.2
 WHATTF_BASE_URL=http://svn.versiondude.net/whattf/syntax/trunk/relaxng/
 HTML_RNC=html.rnc
@@ -35,7 +35,7 @@
 # output an RNC schema formatted as HTML, with hyperlinks, etc.
 # Modified trang sources: http://dev.w3.org/cvsweb/buildtools/rng/
 # CGI script source: http://dev.w3.org/cvsweb/buildtools/rng/trang-cgi/
-TRANG_HTML_CGI=http://people.w3.org/cgi-bin/trang-html
+#TRANG_HTML_CGI=http://people.w3.org/cgi-bin/trang-html
 TRANG_HTML_SPEC_CGI=http://people.w3.org/cgi-bin/trang-html-spec
 
 all: Overview.html spec.html
@@ -51,14 +51,7 @@
 $(HTML_RNG): $(HTML_RNC_SOURCE)
 	$(TRANG) $(TRANGFLAGS) $(HTML_RNC) $(HTML_RNG)
 
-$(INCELIM_DIR).zip:
-	$(CURL) $(CURLFLAGS) $(INCELIM_BASE_URL)$(INCELIM_DIR).zip -o $@
-
-$(INCELIM_DIR): $(INCELIM_DIR).zip
-	$(UNZIP) $(UNZIP_FLAGS) $<
-	touch $@
-
-$(HTML_COMPILED_RNG): $(HTML_RNG) $(INCELIM_DIR)
+$(HTML_COMPILED_RNG): $(HTML_RNG)
 	INCELIM=$(realpath $(INCELIM_DIR)) sh $(INCELIM_DIR)/$(INCELIM) $(INCELIMFLAGS) $<
 
 $(HTML_COMPILED_RNG).combined: $(HTML_COMPILED_RNG) tools/combine.xsl
@@ -93,8 +86,8 @@
 html.css.xml: html.css tools/css2xml
 	./tools/css2xml $< > $@
 
-schema.html: $(HTML_COMPILED_RNG).combined
-	$(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_CGI) -o $@
+#schema.html: $(HTML_COMPILED_RNG).combined
+#	$(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_CGI) -o $@
 
 $(HTML_COMPILED_RNG).combined.spec: $(HTML_COMPILED_RNG).combined tools/strip-comments.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl $< > $@
@@ -118,7 +111,7 @@
 
 html.spec.src.html: $(HTML_COMPILED_RNG) html.rnc.spec.html \
   tools/generate-spec-source.xsl $(HTML_RNC_SOURCE)/assertions.sch \
-  schema.html html.rnc.xml src/head.html src/header.src.html src/intro-scope.html \
+  html.rnc.xml src/head.html src/header.src.html src/intro-scope.html \
   src/conformance.html src/structure.html src/terms.html src/syntax.html src/documents.html \
   $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \
   schema/LICENSE.xml html.css.xml html.css.LICENSE.xml
@@ -139,8 +132,6 @@
 	  > $@
 
 clean:
-	$(RM) $(INCELIM_DIR).zip
-	$(RM) -r $(INCELIM_DIR)
 	$(RM) -r $(HTML_RNC_SOURCE)
 	$(RM) schema.rnc.tmp
 	$(RM) html.rnc.xml

Received on Wednesday, 29 July 2009 08:44:55 UTC