diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-12 01:47:57 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-12 11:56:25 -0400 |
commit | 244f86a9cdf19904169456c234a2752f125dd427 (patch) | |
tree | 51e1f79100cc3651dfce66d4a284584d6bef3997 /stage1/Stage1Lib.scala | |
parent | 4eb753e4d4ef5be7443b99832892bac697b10b50 (diff) | |
download | cbt-244f86a9cdf19904169456c234a2752f125dd427.tar.gz cbt-244f86a9cdf19904169456c234a2752f125dd427.tar.bz2 cbt-244f86a9cdf19904169456c234a2752f125dd427.zip |
revamp loop feature
now CBT and builds pass their file names to the current build
via the context. The build then simply blocks until any file changes.
Then it returns with a special exit code, which the bash script picks
up and restarts CBT. Thats works well for looping over project files.
It works less well for looping over builds and CBT itself. For this
a build has to success once, so that the .cbt-loop.tmp file exists.
Then looping works for cbt and builds, but the file list is not
updated in case of compile errors, etc.
Fixes
- https://github.com/cvogt/cbt/issues/406
- https://github.com/cvogt/cbt/issues/405
- https://github.com/cvogt/cbt/issues/202
- https://github.com/cvogt/cbt/issues/50
- https://github.com/cvogt/cbt/issues/22
We should improve for 1.0 in https://github.com/cvogt/cbt/issues/419
to handle looping over build files and cbt itself smarter.
Diffstat (limited to 'stage1/Stage1Lib.scala')
-rw-r--r-- | stage1/Stage1Lib.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index 01115d4..f701c72 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -349,20 +349,22 @@ ${sourceFiles.sorted.mkString(" \\\n")} res } - def trapExitCode( code: => ExitCode ): ExitCode = { + def trapExitCodeOrValue[T]( result: => T ): Either[ExitCode,T] = { val trapExitCodeBefore = TrapSecurityManager.trapExitCode().get try{ TrapSecurityManager.trapExitCode().set(true) - code + Right( result ) } catch { case CatchTrappedExitCode(exitCode) => logger.stage1(s"caught exit code $exitCode") - exitCode + Left( exitCode ) } finally { TrapSecurityManager.trapExitCode().set(trapExitCodeBefore) } } + def trapExitCode( code: => ExitCode ): ExitCode = trapExitCodeOrValue(code).merge + def ScalaDependency( groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none, scalaMajorVersion: String, verifyHash: Boolean = true |