Michael[tm] Smith avatar Michael[tm] Smith committed c718b52

revert misguided build changes for bug 705
http://bugzilla.validator.nu/show_bug.cgi?id=705

Comments (0)

Files changed (1)

   buildSchemaDriverXhtml5html(schemaDir)
   buildSchemaDriverXhtml5xhtml(schemaDir)
   buildSchemaDriverXhtml5Aria(schemaDir)
-  buildDataRnc(schemaDir)
-  buildEmbedRnc(schemaDir)
-  buildMediaRnc(schemaDir)
-  buildMetaRnc(schemaDir)
-  buildMicrodataRnc(schemaDir)
   removeIfExists(os.path.join(schemaDir, "legacy.rnc"))
   shutil.copy(legacyRnc, schemaDir)
 
 include "block.rnc"
 include "sectional.rnc"
 include "revision.rnc"
-include "embed-vnu.rnc"
+include "embed.rnc"
 include "core-scripting.rnc"
 '''
 schemaDriverHtml5 = '''\
 include "structural.rnc"
 include "ruby.rnc"
-include "media-vnu.rnc"
+include "media.rnc"
 include "tables.rnc"
 include "form-datatypes.rnc"
 include "web-forms.rnc"
 include "applications.rnc"
 include "data.rnc"
 include "legacy.rnc"
-include "microdata-vnu.rnc"
-include "meta-vnu.rnc" {
+include "microdata.rnc"
+include "meta.rnc" {
 		html.inner =
 			(	head.elem
 			,	(	body.elem
 default namespace = "http://www.w3.org/1999/xhtml"
 '''
 schemaDriverMeta = '''\
-include "meta-vnu.rnc"
+include "meta.rnc"
 '''
 schemaDriverToggle_HtmlCore = '''\
 include "common.rnc" {
   f = open(os.path.join(schemaDir, driverName),"a")
   return f
 
-def prepareCopy(schemaDir, copyName, sourceName):
-  fin = open(os.path.join(schemaDir, sourceName))
-  removeIfExists(os.path.join(schemaDir, copyName))
-  fout = open(os.path.join(schemaDir, copyName), "wt")
-  for line in fin:
-    if line.isspace():
-      fout.write("#######################################################################\n")
-      fout.write("# WARNING: This file is generated by the validator.nu build.\n")
-      fout.write("# To change it, instead edit the "+ sourceName + " file and re-run the build.\n")
-      fout.write("#######################################################################\n\n")
-      break
-    else:
-      fout.write(line)
-  return [fin, fout]
-
 ################################
 # HTML schema drivers
 ################################
   f.write(schemaDriverHtml5Aria)
   f.close()
 
-def buildDataRnc(schemaDir):
-  files = prepareCopy(schemaDir, "data-vnu.rnc", "data.rnc")
-  for line in files[0]:
-    line = line.replace("&\tmeter.attrs.value", "&\tmeter.attrs.value?")
-    files[1].write(line)
-  files[1].close()
-  files[0].close()
-
-def buildEmbedRnc(schemaDir):
-  files = prepareCopy(schemaDir, "embed-vnu.rnc", "embed.rnc")
-  for line in files[0]:
-    line = line.replace("&\timg.attrs.src", "&\timg.attrs.src?")
-    line = line.replace("(\tobject.attrs.data", "(\tobject.attrs.data?")
-    line = line.replace("&\tobject.attrs.type?", "&\tempty")
-    line = line.replace("|\tobject.attrs.type", "&\tobject.attrs.type?")
-    line = line.replace("&\tparam.attrs.name", "&\tparam.attrs.name?")
-    line = line.replace("&\tparam.attrs.value", "&\tparam.attrs.value?")
-    line = line.replace("&\tmap.attrs.name", "&\tmap.attrs.name?")
-    files[1].write(line)
-  files[1].close()
-  files[0].close()
-
-def buildMetaRnc(schemaDir):
-  files = prepareCopy(schemaDir, "meta-vnu.rnc", "meta.rnc")
-  for line in files[0]:
-    if line.endswith("&\tshared-hyperlink.attrs.href\n"):
-      line = line.replace("&\tshared-hyperlink.attrs.href", "&\tshared-hyperlink.attrs.href?")
-    line = line.replace("&\tshared-hyperlink.attrs.rel", "&\tshared-hyperlink.attrs.rel?")
-    files[1].write(line)
-  files[1].close()
-  files[0].close()
-
-def buildMicrodataRnc(schemaDir):
-  files = prepareCopy(schemaDir, "microdata-vnu.rnc", "microdata.rnc")
-  for line in files[0]:
-    if line.endswith("&\tshared-hyperlink.attrs.href\n"):
-      line = line.replace("&\tshared-hyperlink.attrs.href", "&\tshared-hyperlink.attrs.href?")
-    line = line.replace("&\tshared-hyperlink.attrs.rel", "&\tshared-hyperlink.attrs.rel?")
-    files[1].write(line)
-  files[1].close()
-  files[0].close()
-
-def buildMediaRnc(schemaDir):
-  files = prepareCopy(schemaDir, "media-vnu.rnc", "media.rnc")
-  for line in files[0]:
-    line = line.replace("&\tsource.attrs.src", "&\tsource.attrs.src?")
-    files[1].write(line)
-  files[1].close()
-  files[0].close()
 #################################################################
 # end of data and functions for building schema drivers
 #################################################################
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.