raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #1251 from akka/wip-3144-genjavadoc-0.4-∂π

Browse source 
update to genjavadoc 0.4 and fix path concat in Unidoc, see #3144
This commit is contained in:
Björn Antonsson 2013-03-15 04:19:58 -07:00
commit 5ad0aaa2bc
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/AkkaBuild.scala
View file

@ -879,7 +879,7 @@ object Dependencies {
val sigar = "org.fusesource" % "sigar" % "1.6.4" // ApacheV2 val sigar = "org.fusesource" % "sigar" % "1.6.4" // ApacheV2
// Compiler plugins // Compiler plugins
val genjavadoc = compilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.3" cross CrossVersion.full) // ApacheV2 val genjavadoc = compilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.4" cross CrossVersion.full) // ApacheV2
// Test // Test

2
project/Unidoc.scala
View file

@ -21,7 +21,7 @@ object Unidoc {
artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar") artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar")
) ++ (if (GenJavaDocEnabled) Seq( ) ++ (if (GenJavaDocEnabled) Seq(
libraryDependencies += Dependencies.Compile.genjavadoc, libraryDependencies += Dependencies.Compile.genjavadoc,
scalacOptions <+= target map (t => "-P:genjavadoc:out=" + t + "/java") scalacOptions <+= target map (t => "-P:genjavadoc:out=" + (t / "java"))
) else Nil) ) else Nil)
val unidocDirectory = SettingKey[File]("unidoc-directory") val unidocDirectory = SettingKey[File]("unidoc-directory")