Commits

Michael[tm] Smith committed 19b2c08

make the build actually (re)build the generated PageEmitter.java and FormEmitter.java source files (b=719)
http://bugzilla.validator.nu/show_bug.cgi?id=719

Comments (0)

Files changed (1)

 deploymentTarget = None
 noSelfUpdate = 0
 useLocalCopies = 0
-pageTemplate = None
-formTemplate = None
+pageTemplate = os.path.join("validator", "xml-src", "PageEmitter.xml")
+formTemplate = os.path.join("validator", "xml-src", "FormEmitter.xml")
 connectionTimeoutSeconds = 5
 socketTimeoutSeconds = 5
 
   os.chdir("..")
 
 def buildValidator():
-  if pageTemplate:
-    ioJar  = os.path.join("util", "dist", "io-xml-util.jar")
-    pageEmitter = os.path.join("validator", "src", "nu", "validator", "servlet", "PageEmitter.java")
-    runCmd('"%s" -classpath %s nu.validator.tools.SaxCompiler %s %s' % (javaCmd, ioJar, pageTemplate, pageEmitter))
-  if formTemplate:
-    ioJar  = os.path.join("util", "dist", "io-xml-util.jar")
-    formEmitter = os.path.join("validator", "src", "nu", "validator", "servlet", "FormEmitter.java")
-    runCmd('"%s" -classpath %s nu.validator.tools.SaxCompiler %s %s' % (javaCmd, ioJar, formTemplate, formEmitter))
+  ioJar  = os.path.join("util", "dist", "io-xml-util.jar")
+  pageEmitter = os.path.join("validator", "src", "nu", "validator", "servlet", "PageEmitter.java")
+  formEmitter = os.path.join("validator", "src", "nu", "validator", "servlet", "FormEmitter.java")
+  runCmd('"%s" -classpath %s nu.validator.tools.SaxCompiler %s %s' % (javaCmd, ioJar, pageTemplate, pageEmitter))
+  runCmd('"%s" -classpath %s nu.validator.tools.SaxCompiler %s %s' % (javaCmd, ioJar, formTemplate, formEmitter))
   classPath = os.pathsep.join(dependencyJarPaths() 
                               + jarNamesToPaths(["non-schema", 
                                                 "io-xml-util",