Fix - use resourcesDir in package command #519
Merged
Conversation
This file contains 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
lwronski
force-pushed
the
package-resource-dir
branch
3 times, most recently
from
192b8c4 to
2c0a2de
Compare
lwronski
force-pushed
the
package-resource-dir
branch
from
2c0a2de to
0ee8267
Compare
| if (os.exists(path)) | ||
| Right(path) | ||
| else | ||
| Left(new NoResourcePathFoundError(path)) |
There was a problem hiding this comment.
For later: maybe this could be reported as a warning instead.
...ild/src/main/scala/scala/build/preprocessing/directives/UsingResourcesDirectiveHandler.scala
Outdated
Show resolved
Hide resolved
...ild/src/main/scala/scala/build/preprocessing/directives/UsingResourcesDirectiveHandler.scala
Outdated
Show resolved
Hide resolved
| path | ||
| else { | ||
| System.err.println(s"Provided resource directory path doesn't exist: $path") | ||
| sys.exit(1) |
There was a problem hiding this comment.
Do we really want to do that? This should be reported as an error later on by the NoResourcePathFoundError above, right?
There was a problem hiding this comment.
It will not be reported as the error handling above only applies to directives.
modules/integration/src/test/scala/scala/cli/integration/PackageTestDefinitions.scala
Outdated
Show resolved
Hide resolved
lwronski
force-pushed
the
package-resource-dir
branch
from
64a7fb5 to
dbbc24a
Compare
lwronski
commented
Dec 29, 2021
| .sequence | ||
| .map(_.flatten) | ||
| } | ||
| val mainClassOpt = preprocessedSources.flatMap(_.mainClassOpt.toSeq).headOption |
There was a problem hiding this comment.
It wasn't' necessary to run directive processing for mainClass because it was done before in preprocessedSources.
I had a problem that the warning logging for the main class was printed twice.
lwronski
force-pushed
the
package-resource-dir
branch
from
dbbc24a to
4473860
Compare
lwronski
requested review from
alexarchambault
and removed request for
alexarchambault
lwronski
force-pushed
the
package-resource-dir
branch
2 times, most recently
from
059e03e to
a4e2044
Compare
lwronski
force-pushed
the
package-resource-dir
branch
from
a4e2044 to
e217336
Compare
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.
Due to a bug in the bloop #1631, scala-cli have to copy resources to
classesDir.I also added exporting resources as
unmanagedResourceDirectoriesin Sbt.