diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-24 15:21:08 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-05 16:00:29 -0700 |
commit | 1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662 (patch) | |
tree | 14755f21d0b6eeac18c3fe3c29ef361a391204ab /build.xml | |
parent | 46a4635d3acc0a18869131879e6cde862d6b9776 (diff) | |
download | scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.tar.gz scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.tar.bz2 scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.zip |
Unfork jline: use vanilla jline 2.11 as a dependency.
Notes:
- no longer specifying terminal by class name in scripts (using 'unix')
- jline doesn't need a separate jansi dependency;
it includes its own version according to:
http://mvnrepository.com/artifact/jline/jline/2.11
Diffstat (limited to 'build.xml')
-rwxr-xr-x | build.xml | 39 |
1 files changed, 24 insertions, 15 deletions
@@ -123,7 +123,6 @@ TODO: <property name="library.starr.jar" value="${lib.dir}/scala-library.jar"/> <property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/> <property name="compiler.starr.jar" value="${lib.dir}/scala-compiler.jar"/> - <property name="jline.jar" value="${lib.dir}/jline.jar"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/> @@ -153,6 +152,8 @@ TODO: <property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/> <property name="partest.version.number" value="0.9.3"/> + <property name="jline.version" value="2.11"/> + <!-- These are NOT the flags used to run SuperSabbus, but the ones written into the script runners created with scala.tools.ant.ScalaTool --> <property name="java.flags" value="-Xmx256M -Xms32M"/> @@ -238,6 +239,10 @@ TODO: <dependency groupId="org.scala-tools.testing" artifactId="test-interface" version="0.5" /> </artifact:dependencies> + <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.deps.fileset" versionsId="repl.deps.versions"> + <dependency groupId="jline" artifactId="jline" version="${jline.version}"/> + </artifact:dependencies> + <!-- BND support --> <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" /> @@ -529,7 +534,7 @@ TODO: <path id="quick.repl.build.path"> <path refid="quick.compiler.build.path"/> <pathelement location="${build-quick.dir}/classes/repl"/> - <pathelement location="${jline.jar}"/> + <path refid="repl.deps.classpath"/> </path> <path id="quick.xml.build.path"> @@ -610,7 +615,7 @@ TODO: <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> <pathelement location="${build-pack.dir}/lib/scalap.jar"/> - <pathelement location="${build-pack.dir}/lib/jline.jar"/> + <path refid="repl.deps.classpath"/> <path refid="aux.libs"/> </path> @@ -740,7 +745,7 @@ TODO: <pathelement location="${build-palo.dir}/lib/scala-library.jar"/> <pathelement location="${build-palo.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-palo.dir}/lib/scala-compiler.jar"/> - <pathelement location="${build-palo.dir}/lib/jline.jar"/> + <path refid="repl.deps.classpath"/> </path> <path id="test.positions.sub.build.path" path="${build-quick.dir}/classes/library"/> @@ -1265,7 +1270,10 @@ TODO: <target name="pack.comp" depends="quick.comp, quick.scaladoc, quick.interactive, quick.repl, asm.done"> <staged-pack project="compiler" manifest="${build-pack.dir}/META-INF/MANIFEST.MF"> <pre> <!-- TODO the files copied here do not influence actuality of this target (nor does the manifest) --> - <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/> + <copy todir="${build-pack.dir}/lib"> + <resources refid="repl.deps.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${repl.deps.versions}" to="flatten"/> + </copy> <copy todir="${build-pack.dir}/lib"> <fileset dir="${lib-extra.dir}"> <include name="**/*.jar"/> @@ -1340,7 +1348,10 @@ TODO: <fileset dir="${build-locker.dir}/classes/compiler"/> <fileset dir="${asm-classes}"/> </jar> - <copy file="${jline.jar}" toDir="${build-palo.dir}/lib"/> + <copy todir="${build-palo.dir}/lib"> + <resources refid="repl.deps.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${repl.deps.versions}" to="flatten"/> + </copy> </target> <target name="palo.bin" depends="palo.done"> <staged-bin stage="palo"/></target> @@ -1738,13 +1749,6 @@ TODO: </staged-docs> </target> - <target name="docs.jline" depends="docs.start"> - <staged-docs project="jline" dir="jline/src/main/java" title="Scala JLine"> - <include name="**/*.scala"/> - <include name="**/*.java"/> - </staged-docs> - </target> - <target name="docs.scalap" depends="docs.start"> <staged-docs project="scalap" title="Scalap"> <include name="**/*.scala"/> @@ -1800,7 +1804,7 @@ TODO: </staged-uptodate> </target> - <target name="docs.done" depends="docs.jline, docs.comp, docs.man, docs.lib, docs.xml, docs.parser-combinators, docs.scalap, docs.partest, docs.continuations-plugin"/> + <target name="docs.done" depends="docs.comp, docs.man, docs.lib, docs.xml, docs.parser-combinators, docs.scalap, docs.partest, docs.continuations-plugin"/> <!-- =========================================================================== DISTRIBUTION @@ -1828,7 +1832,6 @@ TODO: <mkdir dir="${dist.dir}/lib"/> <copy toDir="${dist.dir}/lib"> <fileset dir="${build-pack.dir}/lib"> - <include name="jline.jar"/> <include name="scalacheck.jar"/> <include name="scala-partest.jar"/> <include name="scalap.jar"/> @@ -1841,6 +1844,12 @@ TODO: from="${partest.extras.versions}" to="flatten"/> </copy> + <copy todir="${dist.dir}/lib"> + <resources refid="repl.deps.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" + from="${repl.deps.versions}" to="flatten"/> + </copy> + <mkdir dir="${dist.dir}/bin"/> <!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. --> <copy-bundle name="scala-library"/> |