Fix #2184: Hyper Bootstrap! Integrate the backend as a git submodule #2260
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
smarter
changed the title
felixmulder
approved these changes
Apr 13, 2017
docs/docs/contributing/backend.md
Outdated
|
|
||
| ``` shell | ||
| git submodule update | ||
| ``` |
There was a problem hiding this comment.
We could make sbt do this so that we never miss it - also helps beginners.
There was a problem hiding this comment.
I'm not a fan of doing more weird stuff with sbt, let's not do that for now.
| scalaCompiler % Test, | ||
| "com.storm-enroute" %% "scalameter" % "0.6" % Test | ||
| ), | ||
| libraryDependencies += "com.storm-enroute" %% "scalameter" % "0.6" % Test, |
There was a problem hiding this comment.
What is this needed for?
There was a problem hiding this comment.
It was already here before, no idea.
There was a problem hiding this comment.
If we can we should kill it with 🔥
There was a problem hiding this comment.
Sure, but removing/updating the bench project is a separate issue.
| @@ -1187,7 +1187,7 @@ object TreeTransforms { | |||
| case NonFatal(ex) => | |||
| if (tree ne crashingTree) { | |||
| crashingTree = tree | |||
| println(i"exception while transforming $tree of class ${tree.getClass} # ${tree.uniqueId}") | |||
| // println(i"exception while transforming $tree of class ${tree.getClass} # ${tree.uniqueId}") | |||
smarter
force-pushed
the
backend-submodule
branch
from
b93daa0 to
5f1852b
Compare
…dule The backend lives in the scalac fork at https://github.com/lampepfl/scala/tree/sharing-backend. Before this commit, the scala-compiler built from this fork was a dependency of Scala just to get this backend. This made it much more cumbersome to test changes to the backend and also forced us to depend on Scala 2.11.5 since that is the version of scalac that the forked backend is based on. This commit changes this by adding a git submodule in the `scala-backend` directory that points to the scalac fork. We do not compile the whole submodule, instead we add the subset of files we need to the dotty-compiler project in the sbt build. See backend.md for more information (online at http://dotty.epfl.ch/docs/contributing/backend.html) once this commit is merged. The most important thing to note is that whenever you clone dotty you should do `git clone --recursive` to also clone the submodule. If you already have a cloned dotty you'll need to do: git submodule update --init You will need to repeat this command anytime you update dotty and the backend has been updated, otherwise the content of `scala-backend` will be stale.
smarter
force-pushed
the
backend-submodule
branch
from
5f1852b to
4767786
Compare
|
@odersky @nicolasstucki @liufengyun @OlivierBlanvillain The backend is in! Don''t forget to do: git submodule update --initAfter pulling these changes. See https://github.com/lampepfl/dotty/blob/master/docs/docs/contributing/backend.md (soon rendered at http://dotty.epfl.ch/docs/contributing/backend.html) for more information. |
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Apr 23, 2017
Now that scala#2260 has been merged, nothing is holding us back from upgrading.
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.
The backend lives in the scalac fork at
https://github.com/lampepfl/scala/tree/sharing-backend. Before this
commit, the scala-compiler built from this fork was a dependency of
Scala just to get this backend. This made it much more cumbersome to
test changes to the backend and also forced us to depend on Scala 2.11.5
since that is the version of scalac that the forked backend is based on.
This commit changes this by adding a git submodule in the
scala-backenddirectory that points to the scalac fork. We do notcompile the whole submodule, instead we add the subset of files we need
to the dotty-compiler project in the sbt build. See backend.md for more
information (online at
http://dotty.epfl.ch/docs/contributing/backend.html) once this commit is
merged.
The most important thing to note is that whenever you clone dotty you
should do
git clone --recursiveto also clone the submodule. If youalready have a cloned dotty you'll need to do:
You will need to repeat this command anytime you update dotty and the backend has been updated, otherwise the content of
scala-backendwill be stale.