Simplify output directory handling #4744
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
allanrenucci
approved these changes
Jun 29, 2018
| @@ -37,7 +37,7 @@ private[repl] class Rendering(compiler: ReplCompiler, | |||
| new java.net.URLClassLoader(compilerClasspath.toArray, classOf[ReplDriver].getClassLoader) | |||
| } | |||
|
|
|||
| myClassLoader = new AbstractFileClassLoader(compiler.directory, parent) | |||
There was a problem hiding this comment.
compiler is now unused
| @@ -42,12 +42,8 @@ class GenBCode extends Phase { | |||
| private[this] var myOutput: AbstractFile = _ | |||
|
|
|||
| protected def outputDir(implicit ctx: Context): AbstractFile = { | |||
There was a problem hiding this comment.
Can this be private now?
| if (!isJar && !path.isDirectory) | ||
| fail(s"'$arg' does not exist or is not a directory or .jar file", args) | ||
| else { | ||
| val output = if (isJar) JarArchive.create(path) else new PlainDirectory(path) |
There was a problem hiding this comment.
We will now hold on to an open jar during the whole compiler run instead of just backend. We didn't even open the jar before if we stopped before backend
There was a problem hiding this comment.
It's an empty open jar, so not a big deal I think (it cannot be deleted on Windows while it's open, but who cares?)
smarter
force-pushed
the
directory-setting
branch
3 times, most recently
from
d092765 to
8949f6c
Compare
Store the outputDir setting as an AbstractFile instead of a String, this way we can use a virtual output directory just by changing the setting instead of having to subclass GenBCode.
smarter
force-pushed
the
directory-setting
branch
from
8949f6c to
818dbbd
Compare
Also stop extending DottyTest because I don't understand the weird way it handles context. We'll need to clean up all that stuff some day.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Store the outputDir setting as an AbstractFile instead of a String, this
way we can use a virtual output directory in the REPL just by changing
the setting instead of having to subclass GenBCode.