Merge pull request #23 from retronym/merge/2.10.x-to-master

Merge/2.10.x to master

Author: retronym

Diff for: README.md

@@ -12,15 +12,19 @@ For now, it's still mostly manual.   What you need to do:
 2. Update the highlights notes in `hand-written.md`.
 3. run `sbt -Dfile.encoding=UTF-8 console`, and then the following if you want .html output:
 
-    scala> MakeReleaseNotes(new java.io.File("~/git/scala"), "v2.9.2", "v2.9.3")
-    
-  and the following if you want .md as output:
-  
-    scala> MakeReleaseNotes(new java.io.File("~/git/scala"), "v2.9.2", "v2.9.3")(MarkDown)
+```
+scala> MakeReleaseNotes(new java.io.File("~/git/scala"), "v2.9.2", "v2.9.3")
+scala> MakeReleaseNotes(new java.io.File("~/git/scala"), "v2.9.2", "v2.9.3")(MarkDown) // markdown for scala-lang.org
+```
 
 where the two strings are the tags to compare.
 
+To make the download page:
+
+```
+scala> new MakeDownloadPage("2.10.3-RC2").write()
+```
 
 ## Contributing
 
-Feel free to improve.   Make sure to sign the Scala CLA.
+Feel free to improve.   Make sure to sign the Scala CLA.

Diff for: src/main/scala/GitInfo.scala

@@ -1,5 +1,6 @@
 
 case class Commit(sha: String, author: String, header: String, body: String) {
+  def trimmedHeader = header.take(80)
   override def toString = " * " + sha + " (" + author + ") " + header + " - " + body.take(5) + " ..."
 }
 
@@ -75,7 +76,7 @@ class GitInfo(gitDir: java.io.File, val previousTag: String, val currentTag: Str
     sb append header4("Complete commit list!")
     sb append targetLanguage.tableHeader("sha", "Title")
     for (commit <- commits)
-      sb append targetLanguage.tableRow(commitShaLink(commit.sha), commit.header)
+      sb append targetLanguage.tableRow(commitShaLink(commit.sha), commit.trimmedHeader)
     sb append targetLanguage.tableEnd
     sb.toString
   }
@@ -86,7 +87,7 @@ class GitInfo(gitDir: java.io.File, val previousTag: String, val currentTag: Str
     sb append header4(s"Commits and the issues they fixed since ${previousTag}")
     sb append targetLanguage.tableHeader("Issue(s)", "Commit", "Message")
     for (commit <- fixCommits)
-      sb append targetLanguage.tableRow(fixLinks(commit), commitShaLink(commit.sha), commit.header)
+      sb append targetLanguage.tableRow(fixLinks(commit), commitShaLink(commit.sha), commit.trimmedHeader)
     sb append targetLanguage.tableEnd
     sb append blankLine()
     sb.toString

Diff for: src/main/scala/IO.scala

@@ -0,0 +1,9 @@
+import java.io.File
+
+object IO {
+  def write(f: java.io.File, contents: String) {
+  	val buf = new java.io.BufferedWriter(new java.io.FileWriter(f))
+    try buf.write(contents)
+    finally buf.close()
+  }
+}

Diff for: src/main/scala/MakeDownloadPage.scala

@@ -0,0 +1,69 @@
+import java.util.Date
+import java.text._
+
+class MakeDownloadPage(version: String, releaseDate: Date = new Date()) {
+  def write() = {
+    require(!version.startsWith("v"), "version should *not* start with 'v'")
+    val fileName = s"${format("yyyy-MM-dd")}-$version.md"
+    IO.write(new java.io.File(fileName), page)
+    println("generated " + fileName)
+  }
+
+  def humanSize(url: String) = {
+    import scala.sys.process._
+    println(url)
+    val tmpFile = java.io.File.createTempFile("download", ".tmp")
+    val res = s"curl --fail --silent --output ${tmpFile.getAbsolutePath} $url".!
+    val dfOutput = s"du -h ${tmpFile.getAbsolutePath}".!!
+    val output = dfOutput.trim.split("\t").head
+    if (output == "0B") {
+      println(s"warning: could not fetch $url")
+      ""
+    } else output
+  }
+
+  def resourceArchive(cls: String, name: String, ext: String, desc: String) = {
+    val fileName = s"$name-$version.$ext"
+    val relUrl = s"/files/archive/$fileName"
+    val fullUrl = s"http://www.scala-lang.org$relUrl"
+    resource(cls, fileName, desc, relUrl, fullUrl)
+  }
+
+  def resource(cls: String, fileName: String, desc: String, relUrl: String, fullUrl: String) = {
+    s"""[$cls, "$fileName", "$relUrl", "$desc", "${humanSize(fullUrl)}"]"""
+  }
+
+  def defaultClass = "-non-main-sys"
+
+  def format(fmt: String) = new SimpleDateFormat(fmt).format(releaseDate)
+
+  def ghSourceUrl = s"https://github.com/scala/scala/archive/v$version.tar.gz"
+
+  def page: String = {
+
+s"""
+---
+title: Scala $version
+start: ${format("dd MMMM yyyy")}
+layout: downloadpage
+release_version: $version
+release_date: "${format("MMMM dd, yyyy")}"
+show_resources: "true"
+permalink: /download/$version.html
+requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires the Java runtime version 1.6 or later, which can be downloaded <a href='http://www.java.com/'>here</a>."
+resources: [
+  ${resourceArchive("-main-unixsys", "scala",               "tgz",  "Max OS X, Unix, Cygwin"   )}
+  ${resourceArchive("-main-windows", "scala",               "msi",  "Windows (msi installer)"  )},
+  ${resourceArchive(defaultClass,    "scala",               "zip",  "Windows"                  )},
+  ${resourceArchive(defaultClass,    "scala-docs",          "txz",  "API docs"                 )},
+  ${resourceArchive(defaultClass,    "scala-docs",          "zip",  "API docs"                 )},
+  ${resource       (defaultClass,    s"scala-sources-$version.zip", "sources", ghSourceUrl, ghSourceUrl)},
+  ${resourceArchive(defaultClass,    "scala-tool-support",  "tgz",  "Scala Tool Support (tgz)")},
+  ${resourceArchive(defaultClass,    "scala-tool-support",  "zip",  "Scala Tool Support (zip)")}
+]
+---
+
+
+"""
+  }
+}

Diff for: src/main/scala/MakeReleaseNotes.scala

@@ -9,9 +9,8 @@ object MakeReleaseNotes {
       case Html => new java.io.File("release-notes.html")
       case MarkDown => new java.io.File(s"release-notes-${currentTag}.md")
     }
-    val buf = new java.io.BufferedWriter(new java.io.FileWriter(out))
-    try buf.write(makeReleaseNotes(scalaDir, previousTag, currentTag))
-    finally buf.close()
+
+    IO.write(out, makeReleaseNotes(scalaDir, previousTag, currentTag))
   }
 
   def parseHandWrittenNotes(file: java.io.File = new java.io.File("hand-written.md")): String = {
@@ -34,12 +33,14 @@ object MakeReleaseNotes {
   }
 
   def makeReleaseNotes(scalaDir: java.io.File, previousTag: String, currentTag: String)(implicit targetLanguage: TargetLanguage): String = {
-    def rawHandWrittenNotes(file: java.io.File = new java.io.File(s"history/hand-written-${currentTag drop 1}.md")): String = {
-      val src = Source.fromFile(file)
-      val lines = src.getLines
+    def rawHandWrittenNotes(file: java.io.File = new java.io.File(s"hand-written.md")): String = {
+      val lines: List[String] = if (file.exists) {
+        val src = Source.fromFile(file)
+        src.getLines.toList
+      } else Nil
       // if you don't have the next line, sub-bullets would be screwed!
       // please take this case into account and comment out 2 next lines and uncomment the line after!
-      val newLines = lines.map(x => if (x.startsWith("    *")) "\n" + x else x)
+      val newLines = lines.map(x => if (x.startsWith("    *")) "\n" + x.stripPrefix("  ") else x)
       newLines.mkString("\n")
       //      lines.mkString("\n")
     }

Diff for: src/main/scala/TargetLanguage.scala

@@ -10,7 +10,7 @@ sealed trait TargetLanguage {
 }
 case object MarkDown extends TargetLanguage {
   def createHyperLink(link: String, content: String): String =
-    s"[$link]($content)"
+    s"[$content]($link)"
   def blankLine(): String = "\n"
   def header4(msg: String): String = s"#### $msg\n"
   def tableHeader(firstColumn: String, secondColumn: String): String =