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

Merge pull request #147 from indrajitr/0.10 

Hava scaladocOptions in GlobalScope for consistency
This commit is contained in:
Mark Harrah 2011-08-10 17:36:10 -07:00
parent db14184d86 b57e8cd17a
commit 30aafe5070
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/Defaults.scala
View File

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