diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-28 16:44:34 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-29 16:47:03 -0700 |
commit | 024cdd4136214cec474ec477f04940fcab8ea9c0 (patch) | |
tree | 6e743fb1e7114010ff01d037b31711fc46db0f68 | |
parent | ba21f36282af29c74e53e5e36b14c613b7bd6866 (diff) | |
download | scala-024cdd4136214cec474ec477f04940fcab8ea9c0.tar.gz scala-024cdd4136214cec474ec477f04940fcab8ea9c0.tar.bz2 scala-024cdd4136214cec474ec477f04940fcab8ea9c0.zip |
Strip version suffix from diffutils.
-rw-r--r-- | build.xml | 20 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/PathSettings.scala | 2 | ||||
-rwxr-xr-x | test/partest | 2 |
3 files changed, 13 insertions, 11 deletions
@@ -197,18 +197,13 @@ targets exercised: <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/> </artifact:dependencies> - <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset"> + <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions"> <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/> </artifact:dependencies> <!-- BND support --> <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" /> - <!--<dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/>--> - <union id="dependency.fileset"> - <resources refid="partest.extras.fileset"/> - </union> - <!-- Download STARR via maven if `starr.version` is specified. Want to slow down STARR changes, using only released versions. --> <if><isset property="starr.version"/><then> @@ -1159,10 +1154,11 @@ targets exercised: <!-- depend on quick.done so quick.bin is run when pack.done is --> <target name="pack.done" depends="quick.done, pack.bin"> - <!-- copy maven dependencies --> + <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks --> <copy todir="${build-pack.dir}/lib"> - <resources refid="dependency.fileset" /> - <mapper type="flatten" /> + <resources refid="partest.extras.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" + from="${partest.extras.versions}" to="flatten"/> </copy> <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/> @@ -1694,8 +1690,14 @@ targets exercised: <include name="scala-partest.jar"/> <include name="scalap.jar"/> </fileset> + </copy> + + <copy todir="${dist.dir}/lib"> <resources refid="partest.extras.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" + from="${partest.extras.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"/> diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala index dfa1187691..0ba34777a0 100644 --- a/src/partest/scala/tools/partest/nest/PathSettings.scala +++ b/src/partest/scala/tools/partest/nest/PathSettings.scala @@ -74,7 +74,7 @@ object PathSettings { } lazy val diffUtils: File = - findJar(buildPackLibDir.files, "diffutils-1.3.0") getOrElse sys.error(s"No diffutils-1.3.0.jar found in '$buildPackLibDir'.") + findJar(buildPackLibDir.files, "diffutils") getOrElse sys.error(s"No diffutils.jar found in '$buildPackLibDir'.") } class PathSettings() { diff --git a/test/partest b/test/partest index 57ca24a7a0..842d2903b7 100755 --- a/test/partest +++ b/test/partest @@ -53,7 +53,7 @@ if [ -z "$EXT_CLASSPATH" ] ; then fi done elif [ -f "$SCALA_HOME/build/pack/lib/scala-partest.jar" ] ; then - for lib in `echo "scala-partest scala-library scala-reflect scala-compiler diffutils-1.3.0"`; do + for lib in `echo "scala-partest scala-library scala-reflect scala-compiler diffutils"`; do ext="$SCALA_HOME/build/pack/lib/$lib.jar" if [ -z "$EXT_CLASSPATH" ] ; then EXT_CLASSPATH="$ext" |