summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2013-09-14 22:11:46 -0700
committerSom Snytt <som.snytt@gmail.com>2013-09-14 22:11:46 -0700
commitb4671f0103faf079b2c197c8875b484318bc6062 (patch)
tree470ab0bd109ed1a22e0c58e464c0cf58507438e4 /build.xml
parent12bca51027e753763748f8456317fa03aaad6162 (diff)
downloadscala-b4671f0103faf079b2c197c8875b484318bc6062.tar.gz
scala-b4671f0103faf079b2c197c8875b484318bc6062.tar.bz2
scala-b4671f0103faf079b2c197c8875b484318bc6062.zip
SI-7843 Restore JSR 223 service entry
The 2.10 fix to remove the ScriptEngine service entry was inadvertently forwarded to 2.11. This commit reverts and adds a test. This situation was entirely foreseen by retronym, proving beyond doubt that he is in fact a time traveler, as hinted by his name. He brings bugs forward into the future and returns into the past with fixes and other alien technology like scalaz.
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index c8256a4a24..bd0642be33 100755
--- a/build.xml
+++ b/build.xml
@@ -1358,11 +1358,10 @@ TODO:
<attribute name="Class-Path" value="scala-reflect.jar scala-library.jar"/>
</manifest>
</pre>
- <!-- script api is 2.11-only so far
+ <!-- JSR-223 support introduced in 2.11 -->
<jar-opts>
<service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/>
</jar-opts>
- -->
</staged-pack>
</target>