Merge remote-tracking branch 'origin/2.10.x'

retronym · retronym · commit 1b7c449b34c3 · 2013-09-27T17:37:53.000+02:00
Conflicts:
	.gitignore
	hand-written.md
	release-notes.html
	src/main/scala/MakeReleaseNotes.scala
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-target
+target
+release-notes*.md
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "scala-release-note-generator"
 
-scalaVersion := "2.10.0-RC3"
+scalaVersion := "2.10.2"
 
 libraryDependencies += "org.pegdown" % "pegdown" % "1.2.0"
 
@@ -9,4 +9,4 @@ libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.1"
 {
   require(sys.props("file.encoding") == "UTF-8", "Please rerun with -Dfile.encoding=UTF-8")
   Nil
-}
+}
diff --git a/hand-written.md b/hand-written.md
@@ -1,7 +1,10 @@
 We are pleased to announce the next milestone release of Scala 2.11.0!
 
 This is a pre-release software. You can see our plans for upcoming Scala releases
-on our [Roadmap](https://issues.scala-lang.org/browse/SI#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel). For production use, we recommend the latest stable release, 2.10.1.
+on our [Roadmap](https://issues.scala-lang.org/browse/SI#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel). For production use, we recommend the latest stable release, 2.10.3.
+
+<!-- Substitute both version numbers here! -->
+The release is available for download from [scala-lang.org](http://scala-lang.org/download/2.10.3.html) or from [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.scala-lang%22%20AND%20v%3A%222.10.3%22).
 
 The Scala team and contributors [fixed 108 issues](https://issues.scala-lang.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+SI+AND+%28fixVersion+%3D+%22Scala+2.11.0-M1%22+OR+fixVersion+%3D+%22Scala+2.11.0-M2%22+OR+fixVersion+%3D+%22Scala+2.11.0-M3%22%29+AND+status+%3D+closed+ORDER+BY+priority+DESC), in addition to [those fixed in the upcoming 2.10.2](https://issues.scala-lang.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+SI+AND+%28fixVersion+%3D+%22Scala+2.10.2-RC1%22%29+AND+status+%3D+closed+ORDER+BY+priority+DESC), which are also included in this release.
 
@@ -19,9 +22,9 @@ This will be fixed in the next milestone.
 <!--break-->
 
 ### Scala IDE for Eclipse
-The Scala IDE with Scala 2.11.0-M3 built right in is available through one of the following update-sites:
+The Scala IDE with this release built right in is available through one of the following update-sites:
 
-* [for Eclipse 3.7 (Indigo)](http://download.scala-ide.org/ecosystem/e37/scala211/dev/site/)
+* [for Eclipse 4.2/4.3 (Juno/Kepler)](http://download.scala-ide.org/sdk/e38/scala211/dev/site/)
 
 Have a look at the [getting started guide](http://scala-ide.org/docs/user/gettingstarted.html) for more info.
 
diff --git a/release-notes.html b/release-notes.html
diff --git a/src/main/scala/MakeReleaseNotes.scala b/src/main/scala/MakeReleaseNotes.scala
@@ -3,14 +3,16 @@
 import java.io.BufferedReader
 import scala.io.Source
 object MakeReleaseNotes {
-
-  def apply(scalaDir: java.io.File, previousTag: String, currentTag: String)(implicit targetLanguage: TargetLanguage = Html): Unit = {
+  def apply(scalaDir: String, previousTag: String, currentTag: String) {
+    Seq(Html, MarkDown).foreach(fmt => apply(new java.io.File(scalaDir), previousTag, currentTag, fmt))
+  }
+  def apply(scalaDir: java.io.File, previousTag: String, currentTag: String, targetLanguage: TargetLanguage = Html): Unit = {
     val out = targetLanguage match {
       case Html => new java.io.File("release-notes.html")
       case MarkDown => new java.io.File(s"release-notes-${currentTag}.md")
     }
-
-    IO.write(out, makeReleaseNotes(scalaDir, previousTag, currentTag))
+    IO.write(out, makeReleaseNotes(scalaDir, previousTag, currentTag)(targetLanguage))
+    println("Generated: " + out)
   }
 
   def parseHandWrittenNotes(file: java.io.File = new java.io.File("hand-written.md")): String = {
@@ -55,14 +57,17 @@ object MakeReleaseNotes {
       <head>
         <meta charset="UTF-8">
         <title>${currentTag} - Release notes</title>
+        <link rel="stylesheet" type="text/css" href="http://www.scala-lang.org/resources/css/bootstrap.css"/>
       </head>
       <body>
-        <h3>Scala ${currentTag drop 1} is now available!</h3>
-        ${parseHandWrittenNotes()}
-        <br/><br/>
-        ${renderCommitterList}
-        ${renderFixedIssues}
-        ${renderCommitList}
+        <div class="container"/>
+          <h3>Scala ${currentTag drop 1} is now available!</h3>
+          ${parseHandWrittenNotes()}
+          <br/><br/>
+          ${renderCommitterList}
+          ${renderFixedIssues}
+          ${renderCommitList}
+        </div>
       </body>
     </html>"""
       case MarkDown => s"""---
@@ -79,4 +84,4 @@ ${renderCommitList}
     }
 
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-target`
	`1`	`+target`
	`2`	`+release-notes*.md`