summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-09-06 09:28:18 -0700
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-09-06 09:28:18 -0700
commit6dd565ff9b73a3ebc8f702e01d46eca78b423dd9 (patch)
treebdda2261c651610125465d3b7d859e08bf56d41c /build.xml
parentce98bb437b0f2743c08a654df4110f940458af54 (diff)
parent46335e4d7433bfb8e275b4afb3694c7c6d07b767 (diff)
downloadscala-6dd565ff9b73a3ebc8f702e01d46eca78b423dd9.tar.gz
scala-6dd565ff9b73a3ebc8f702e01d46eca78b423dd9.tar.bz2
scala-6dd565ff9b73a3ebc8f702e01d46eca78b423dd9.zip
Merge pull request #2914 from gkossakowski/merge-2.10.x
Merge 2.10.x into master
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 4a2456eebf..13533303f9 100755
--- a/build.xml
+++ b/build.xml
@@ -1326,9 +1326,11 @@ TODO:
<attribute name="Class-Path" value="scala-reflect.jar scala-library.jar"/>
</manifest>
</pre>
+ <!-- script api is 2.11-only so far
<jar-opts>
<service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/>
</jar-opts>
+ -->
</staged-pack>
</target>