luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test for separate configuration of doc sources

This commit is contained in:
Mark Harrah 2011-08-23 19:51:51 -04:00
parent fcdcdb4eaa
commit 9ebf809259
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Defaults.scala
View File

@ -187,7 +187,7 @@ object Defaults extends BuildCommon
run <<= runTask(fullClasspath, mainClass in run, runner in run), run <<= runTask(fullClasspath, mainClass in run, runner in run),
runMain <<= runMainTask(fullClasspath, runner in run), runMain <<= runMainTask(fullClasspath, runner in run),
scaladocOptions in GlobalScope :== Nil, scaladocOptions in GlobalScope :== Nil,
scaladocOptions <<= scaladocOptions or scalacOptions.identity, scaladocOptions in doc <<= scaladocOptions in doc or scalacOptions.identity,
copyResources <<= copyResourcesTask copyResources <<= copyResourcesTask
) )

6
sbt/src/sbt-test/actions/doc/A.scala Normal file
View File

@ -0,0 +1,6 @@
object A {
/**
* @param i An argument
*/
def x(i: Int) = 3
}

6
sbt/src/sbt-test/actions/doc/B.scala Normal file
View File

@ -0,0 +1,6 @@
object B {
/**
* @notparam i An argument
*/
def x(i: Int) = 3
}

7
sbt/src/sbt-test/actions/doc/test Normal file
View File

@ -0,0 +1,7 @@
> 'set scaladocOptions in doc += "-Xfatal-warnings"'
-> doc
> 'set sources in (Compile, doc) <<= sources in Compile map { _.filter(_.getName contains "A") }'
> doc