Skip to content

Commit ee05b74

Browse files
authored
Merge pull request #5143 from dotty-staging/revive-scalajs
Revive the Scala.js backend.
2 parents fb771fb + e6979ec commit ee05b74

21 files changed

+677
-722
lines changed

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pipeline:
3434
image: lampepfl/dotty:2018-10-01
3535
commands:
3636
- cp -R . /tmp/2/ && cd /tmp/2/
37-
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
37+
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run"
3838
- ./project/scripts/bootstrapCmdTests
3939

4040
test_sbt:

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ val scalap = Build.scalap
2121
val dist = Build.dist
2222
val `dist-bootstrapped` = Build.`dist-bootstrapped`
2323

24+
val sjsSandbox = Build.sjsSandbox
25+
2426
val `sbt-dotty` = Build.`sbt-dotty`
2527
val `vscode-dotty` = Build.`vscode-dotty`
2628

compiler/sjs/backend/sjs/JSPrimitives.scala

Lines changed: 0 additions & 118 deletions
This file was deleted.

compiler/sjs/backend/sjs/GenSJSIR.scala renamed to compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class GenSJSIR extends Phase {
99
def phaseName: String = "genSJSIR"
1010

1111
def run(implicit ctx: Context): Unit = {
12-
new JSCodeGen().run()
12+
if (ctx.settings.scalajs.value)
13+
new JSCodeGen().run()
1314
}
1415
}

0 commit comments

Comments
 (0)