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

Remove support for deprecated alternative to project/ directory name.

This commit is contained in:
Mark Harrah 2013-01-29 17:47:29 -05:00
parent 125727ba83
commit 6c5cafb55b
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/src/main/scala/sbt/BuildPaths.scala
View File

@ -46,18 +46,11 @@ object BuildPaths
def outputDirectory(base: File) = base / DefaultTargetName
def projectStandard(base: File) = base / "project"
def projectHidden(base: File) = base / ConfigDirectoryName
def selectProjectDir(base: File, log: Logger) =
{
val a = projectHidden(base)
val b = projectStandard(base)
if(a.exists)
{
log.warn("Alternative project directory " + ConfigDirectoryName + " (" + a + ") has been deprecated since sbt 0.12.0.\n Please use the standard location: " + b)
a
}
else b
}
@deprecated("Use projectStandard. The alternative project directory location has been removed.", "0.13.0")
def projectHidden(base: File) = projectStandard(base)
@deprecated("Use projectStandard. The alternative project directory location has been removed.", "0.13.0")
def selectProjectDir(base: File, log: Logger) = projectStandard(base)
final val PluginsDirectoryName = "plugins"
final val DefaultTargetName = "target"

2
main/src/main/scala/sbt/Load.scala
View File

@ -392,7 +392,7 @@ object Load
def loadUnit(uri: URI, localBase: File, s: State, config: LoadBuildConfiguration): BuildUnit =
{
val normBase = localBase.getCanonicalFile
val defDir = selectProjectDir(normBase, config.log)
val defDir = projectStandard(normBase)
val plugs = plugins(defDir, s, config)
val defNames = analyzed(plugs.fullClasspath) flatMap findDefinitions