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

remove deprecated command strings

This commit is contained in:
Mark Harrah 2013-02-19 14:33:22 -05:00
parent 824f10aa9a
commit 2047849b50
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
main/src/main/scala/sbt/CommandStrings.scala
View File

@ -5,12 +5,6 @@ package sbt
object CommandStrings
{
@deprecated("Use the `log` member of a State instance directly.", "0.12.0")
def logger(s: State) = s.log
@deprecated("Use the `globalLogging` member of a State instance directly.", "0.12.0")
def globalLogging(s: State) = s.globalLogging
/** The prefix used to identify a request to execute the remaining input on source changes.*/
val AboutCommand = "about"
val TasksCommand = "tasks"
@ -20,15 +14,6 @@ object CommandStrings
val ShowCommand = "show"
val BootCommand = "boot"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
val ContinuousExecutePrefix = BasicCommandStrings.ContinuousExecutePrefix
@deprecated("Moved to BasicCommandStrings", "0.12.0")
val Exit = BasicCommandStrings.Exit
@deprecated("Moved to BasicCommandStrings", "0.12.0")
val Quit = BasicCommandStrings.Quit
val EvalCommand = "eval"
val evalBrief = (EvalCommand + " <expression>", "Evaluates a Scala expression and prints the result and type.")
val evalDetailed =
@ -130,10 +115,6 @@ SetCommand + """ [every] <setting-expression>
def SessionCommand = "session"
def sessionBrief = (SessionCommand, "Manipulates session settings. For details, run 'help " + SessionCommand + "'.")
/** The command name to terminate the program.*/
@deprecated("Moved to BasicCommandStrings", "0.12.0")
val TerminateAction: String = BasicCommandStrings.TerminateAction
def settingsPreamble = commonPreamble("settings")
def tasksPreamble = commonPreamble("tasks") + """
Tasks produce values. Use the 'show' command to run the task and print the resulting value."""
@ -218,22 +199,10 @@ ProjectsCommand + """
def sbtrc = ".sbtrc"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def ReadCommand = BasicCommandStrings.ReadCommand
def DefaultsCommand = "add-default-commands"
def DefaultsBrief = (DefaultsCommand, DefaultsDetailed)
def DefaultsDetailed = "Registers default built-in commands"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def RebootCommand = "reboot"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def Multi = ";"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def AppendCommand = "append"
def Load = "load"
def LoadLabel = "a project"
def LoadCommand = "load-commands"
@ -246,21 +215,6 @@ ProjectsCommand + """
def LoadProjectBrief = (LoadProject, LoadProjectDetailed)
def LoadProjectDetailed = "(Re)loads the project in the current directory"
@deprecated("Moved to State", "0.12.0")
val FailureWall = State.FailureWall
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def Shell = BasicCommandStrings.Shell
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def ClearOnFailure = "--"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def OnFailure = "-"
@deprecated("Moved to BasicCommandStrings", "0.12.0")
def IfLast = "iflast"
def InitCommand = "initialize"
def InitBrief = (InitCommand, "Initializes command processing.")
def InitDetailed =

3
main/src/main/scala/sbt/Main.scala
View File

@ -64,6 +64,7 @@ object StandardMain
import DefaultParsers._
import CommandStrings._
import BasicCommandStrings._
import BasicCommands._
import CommandUtil._
@ -408,7 +409,7 @@ object BuiltinCommands
}
}
def loadProjectCommands(arg: String) = (OnFailure + " " + LoadFailed) :: (LoadProjectImpl + " " + arg).trim :: ClearOnFailure :: FailureWall :: Nil
def loadProjectCommands(arg: String) = (OnFailure + " " + LoadFailed) :: (LoadProjectImpl + " " + arg).trim :: ClearOnFailure :: State.FailureWall :: Nil
def loadProject = Command(LoadProject, LoadProjectBrief, LoadProjectDetailed)(_ => matched(Project.loadActionParser)) { (s,arg) => loadProjectCommands(arg) ::: s }
def loadProjectImpl = Command(LoadProjectImpl)(_ => Project.loadActionParser)( doLoadProject )