Make generators to generate files only when necessary.

(cherry picked from commit 68d9c29)

Conflicts:

	project/GenTable.scala

Author: cheeseng

project/GenCompatibleClasses.scala

@@ -2,6 +2,8 @@ import java.io.{FileWriter, BufferedWriter, File}
 
 object GenCompatibleClasses {
 
+  val generatorSource = new File("GenCompatibleClasses.scala")
+
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     targetDir.mkdirs()
     val listCellRendererClass = Class.forName("javax.swing.ListCellRenderer")
@@ -16,55 +18,59 @@ object GenCompatibleClasses {
     val java6ClassesFiles =
       java6Classes.map { case (name, cls) =>
         val file = new File(targetDir, name + ".scala")
-        val bw = new BufferedWriter(new FileWriter(file))
-        try {
-          bw.write("package org.scalatest.tools\n")
-          bw.write("import javax.swing._\n")
-          if (isJava7)
-            bw.write(cls + "[EventHolder]")
-          else
-            bw.write(cls)
-        }
-        finally {
-          bw.flush()
-          bw.close()
+        if (!file.exists || generatorSource.lastModified > file.lastModified) {
+          val bw = new BufferedWriter(new FileWriter(file))
+          try {
+            bw.write("package org.scalatest.tools\n")
+            bw.write("import javax.swing._\n")
+            if (isJava7)
+              bw.write(cls + "[EventHolder]")
+            else
+              bw.write(cls)
+          }
+          finally {
+            bw.flush()
+            bw.close()
+          }
+          println("Generated " + file.getAbsolutePath)
         }
-        println("Generated " + file.getAbsolutePath)
         file
       }
 
     val file = new File(targetDir, "EventHolderListCellRenderer.scala")
-    val bw = new BufferedWriter(new FileWriter(file))
+    if (!file.exists || generatorSource.lastModified > file.lastModified) {
+      val bw = new BufferedWriter(new FileWriter(file))
 
-    try {
-      bw.write("package org.scalatest.tools\n")
-      bw.write("import java.awt.Component\n")
-      bw.write("import javax.swing._\n")
-      if (isJava7) { // workaround from http://www.scala-lang.org/old/node/10687
-        bw.write("private[tools] trait EventHolderListCellRenderer extends ListCellRenderer[EventHolder] {\n")
-        bw.write("  private val defaultRenderer: ListCellRenderer[EventHolder] = (new DefaultListCellRenderer()).asInstanceOf[ListCellRenderer[EventHolder]]\n")
-        bw.write("  protected def decorate(renderer: JLabel, value: Object, isSelected: Boolean): Component\n")
-        bw.write("  def getListCellRendererComponent(list: JList[_ <: EventHolder], value: EventHolder, index: Int, isSelected: Boolean, cellHasFocus: Boolean): Component = {\n")
-        bw.write("    val renderer: JLabel = defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus).asInstanceOf[JLabel]\n")
-        bw.write("    decorate(renderer, value, isSelected)\n")
-        bw.write("  }")
-        bw.write("}\n")
+      try {
+        bw.write("package org.scalatest.tools\n")
+        bw.write("import java.awt.Component\n")
+        bw.write("import javax.swing._\n")
+        if (isJava7) { // workaround from http://www.scala-lang.org/old/node/10687
+          bw.write("private[tools] trait EventHolderListCellRenderer extends ListCellRenderer[EventHolder] {\n")
+          bw.write("  private val defaultRenderer: ListCellRenderer[EventHolder] = (new DefaultListCellRenderer()).asInstanceOf[ListCellRenderer[EventHolder]]\n")
+          bw.write("  protected def decorate(renderer: JLabel, value: Object, isSelected: Boolean): Component\n")
+          bw.write("  def getListCellRendererComponent(list: JList[_ <: EventHolder], value: EventHolder, index: Int, isSelected: Boolean, cellHasFocus: Boolean): Component = {\n")
+          bw.write("    val renderer: JLabel = defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus).asInstanceOf[JLabel]\n")
+          bw.write("    decorate(renderer, value, isSelected)\n")
+          bw.write("  }")
+          bw.write("}\n")
+        }
+        else {
+          bw.write("private[tools] trait EventHolderListCellRenderer extends ListCellRenderer {\n")
+          bw.write("  private val defaultRenderer: DefaultListCellRenderer = new DefaultListCellRenderer()\n")
+          bw.write("  protected def decorate(renderer: JLabel, value: Object, isSelected: Boolean): Component\n")
+          bw.write("  def getListCellRendererComponent(list: JList, value: Object, index: Int, isSelected: Boolean, cellHasFocus: Boolean): Component = {\n")
+          bw.write("    val renderer: JLabel = defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus).asInstanceOf[JLabel]\n")
+          bw.write("    decorate(renderer, value, isSelected)\n")
+          bw.write("  }")
+          bw.write("}\n")
+        }
       }
-      else {
-        bw.write("private[tools] trait EventHolderListCellRenderer extends ListCellRenderer {\n")
-        bw.write("  private val defaultRenderer: DefaultListCellRenderer = new DefaultListCellRenderer()\n")
-        bw.write("  protected def decorate(renderer: JLabel, value: Object, isSelected: Boolean): Component\n")
-        bw.write("  def getListCellRendererComponent(list: JList, value: Object, index: Int, isSelected: Boolean, cellHasFocus: Boolean): Component = {\n")
-        bw.write("    val renderer: JLabel = defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus).asInstanceOf[JLabel]\n")
-        bw.write("    decorate(renderer, value, isSelected)\n")
-        bw.write("  }")
-        bw.write("}\n")
+      finally {
+        bw.flush()
+        bw.close()
       }
     }
-    finally {
-      bw.flush()
-      bw.close()
-    }
 
     java6ClassesFiles.toSeq ++ Seq(file)
   }

project/GenFactories.scala

@@ -21,6 +21,8 @@ import scala.collection.JavaConversions._
 
 object GenFactories {
 
+  val generatorSource = new File("GenFactories.scala")
+
   val topPart = """
 package org.scalatest.matchers
 
@@ -3061,70 +3063,71 @@ private[scalatest] class MatcherFactory$arity$Macro[-SC, $typeConstructors$] {
     }
 
     val targetFile = new File(targetDir, "MatcherFactory" + arity + ".scala")
-    val bw = new BufferedWriter(new FileWriter(targetFile))
- 
-    try {
-
-      val topSt = new org.antlr.stringtemplate.StringTemplate(topPart)
-      setCommonOnes(arity, topSt)
-      val nTypeclassInstances =
-        if (arity == 1) "one typeclass instance"
-        else {
-          val numStr =
-            arity match {
-              case 2 => "two"
-              case 3 => "three"
-              case 4 => "four"
-              case 5 => "five"
-              case 6 => "six"
-              case 7 => "seven"
-              case 8 => "eight"
-              case 9 => "nine"
-            }
-           numStr + " typeclass instances"
+    if (!targetFile.exists || generatorSource.lastModified > targetFile.lastModified) {
+      val bw = new BufferedWriter(new FileWriter(targetFile))
+
+      try {
+
+        val topSt = new org.antlr.stringtemplate.StringTemplate(topPart)
+        setCommonOnes(arity, topSt)
+        val nTypeclassInstances =
+          if (arity == 1) "one typeclass instance"
+          else {
+            val numStr =
+              arity match {
+                case 2 => "two"
+                case 3 => "three"
+                case 4 => "four"
+                case 5 => "five"
+                case 6 => "six"
+                case 7 => "seven"
+                case 8 => "eight"
+                case 9 => "nine"
+              }
+            numStr + " typeclass instances"
+          }
+        topSt.setAttribute("nTypeclassInstances", nTypeclassInstances)
+        bw.write(transform(topSt.toString))
+
+        // Now do the and/or methods that take matcher factories of various arities
+        for (passedArity <- 1 to MaxArity - arity) {
+          val resultArity = arity + passedArity
+          val middleSt = new org.antlr.stringtemplate.StringTemplate(middlePart)
+          setCommonOnes(arity, middleSt)
+          middleSt.setAttribute("passedArity", passedArity);
+          middleSt.setAttribute("resultArity", resultArity);
+          val resultColonSeparatedTCNs = (1 to resultArity).map("TC" + _).mkString(" : ")
+          middleSt.setAttribute("resultColonSeparatedTCNs", resultColonSeparatedTCNs);
+          val resultCommaSeparatedTCNs = (1 to resultArity).map("TC" + _).mkString(", ")
+          middleSt.setAttribute("resultCommaSeparatedTCNs", resultCommaSeparatedTCNs);
+          val passedTypeConstructors = (arity + 1 to resultArity).map("TC" + _ + "[_]").mkString(", ")
+          middleSt.setAttribute("passedTypeConstructors", passedTypeConstructors);
+          val passedCommaSeparatedTCNs = (arity + 1 to resultArity).map("TC" + _).mkString(", ")
+          middleSt.setAttribute("passedCommaSeparatedTCNs", passedCommaSeparatedTCNs);
+          bw.write(transform(middleSt.toString))
         }
-      topSt.setAttribute("nTypeclassInstances", nTypeclassInstances)
-      bw.write(transform(topSt.toString))
-
-      // Now do the and/or methods that take matcher factories of various arities
-      for (passedArity <- 1 to MaxArity - arity) {
-        val resultArity = arity + passedArity
-        val middleSt = new org.antlr.stringtemplate.StringTemplate(middlePart)
-        setCommonOnes(arity, middleSt)
-        middleSt.setAttribute("passedArity", passedArity);
-        middleSt.setAttribute("resultArity", resultArity);
-        val resultColonSeparatedTCNs = (1 to resultArity).map("TC" + _).mkString(" : ")
-        middleSt.setAttribute("resultColonSeparatedTCNs", resultColonSeparatedTCNs);
-        val resultCommaSeparatedTCNs = (1 to resultArity).map("TC" + _).mkString(", ")
-        middleSt.setAttribute("resultCommaSeparatedTCNs", resultCommaSeparatedTCNs);
-        val passedTypeConstructors = (arity + 1 to resultArity).map("TC" + _ + "[_]").mkString(", ")
-        middleSt.setAttribute("passedTypeConstructors", passedTypeConstructors);
-        val passedCommaSeparatedTCNs = (arity + 1 to resultArity).map("TC" + _).mkString(", ")
-        middleSt.setAttribute("passedCommaSeparatedTCNs", passedCommaSeparatedTCNs);
-        bw.write(transform(middleSt.toString))
-      }
 
-      // Just don't put the and/or DSL under MatcherFactory<MaxArity>, even though the ones that could
-      // return another MatcherFactory<MaxArity> could be implemented. That would mean only *some* of the
-      // DSL is implemented under MatcherFactory<MaxArity>. I'd rather just say none of it is.
-      if (arity < MaxArity) {
-        def doABottomHalf(bottomSt: org.antlr.stringtemplate.StringTemplate) {
-          setCommonOnes(arity, bottomSt)
-          bottomSt.setAttribute("arityPlusOne", arity + 1);
-          bw.write(transform(bottomSt.toString))
+        // Just don't put the and/or DSL under MatcherFactory<MaxArity>, even though the ones that could
+        // return another MatcherFactory<MaxArity> could be implemented. That would mean only *some* of the
+        // DSL is implemented under MatcherFactory<MaxArity>. I'd rather just say none of it is.
+        if (arity < MaxArity) {
+          def doABottomHalf(bottomSt: org.antlr.stringtemplate.StringTemplate) {
+            setCommonOnes(arity, bottomSt)
+            bottomSt.setAttribute("arityPlusOne", arity + 1);
+            bw.write(transform(bottomSt.toString))
+          }
+          doABottomHalf(new org.antlr.stringtemplate.StringTemplate(bottomPart1)) // Do in two halves, because hitting class file max string size limit
+          doABottomHalf(new org.antlr.stringtemplate.StringTemplate(bottomPart2))
+        }
+        else {
+          bw.write("}\n")
         }
-        doABottomHalf(new org.antlr.stringtemplate.StringTemplate(bottomPart1)) // Do in two halves, because hitting class file max string size limit
-        doABottomHalf(new org.antlr.stringtemplate.StringTemplate(bottomPart2))
       }
-      else {
-        bw.write("}\n")
+      finally {
+        bw.close()
       }
-
-      targetFile
-    }
-    finally {
-      bw.close()
     }
+    targetFile
   }
 }