diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-11 23:57:54 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-11 23:58:45 -0800 |
commit | beed16825e53077c40ff38b035bfaafb3a4e39d5 (patch) | |
tree | 9c3b7a680ee0e994fa9f4bfa89147133910fb95c /build.xml | |
parent | d2cee3a5e1d26ba27fd7912d48b1e7af0beb844a (diff) | |
download | scala-beed16825e53077c40ff38b035bfaafb3a4e39d5.tar.gz scala-beed16825e53077c40ff38b035bfaafb3a4e39d5.tar.bz2 scala-beed16825e53077c40ff38b035bfaafb3a4e39d5.zip |
Filter dependencies from partest and scalacheck.
I previously messed this up in a24e7fa, which caused
partest classpath again to include multiple version
of scala-library and friends.
We should really automate enforcing uniqueness of packages.
Diffstat (limited to 'build.xml')
-rwxr-xr-x | build.xml | 28 |
1 files changed, 25 insertions, 3 deletions
@@ -286,10 +286,13 @@ TODO: --> <!-- <artifact:remoteRepository refid="extra-repo"/> --> <dependency groupId="org.scala-lang.modules" artifactId="scala-partest_${scala.binary.version}" version="${partest.version.number}" /> - <dependency groupId="org.scalacheck" artifactId="scalacheck_${scala.binary.version}" version="${scalacheck.version.number}" /> </artifact:dependencies> <copy-deps project="partest"/> + <artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions"> + <dependency groupId="org.scalacheck" artifactId="scalacheck_${scala.binary.version}" version="${scalacheck.version.number}" /> + </artifact:dependencies> + <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions"> <dependency groupId="jline" artifactId="jline" version="${jline.version}"/> </artifact:dependencies> @@ -894,11 +897,30 @@ TODO: <pathelement location="${actors.jar}"/> <!-- partest's dependencies, which marks most of its dependencies as provided, + (but not scala-library, so we filter that one out...) so we provide them: scala-[library/reflect/compiler], scalap built here, scala-xml, scala-parser-combinators via external-modules-nocore, scalacheck as part of `partest.classpath` --> - <path refid="partest.classpath"/> - <path refid="external-modules-nocore"/> <!-- xml, parsers --> + <restrict> + <path refid="partest.classpath"/> + <rsel:not><rsel:or> + <rsel:name name="scala-library*.jar"/> + </rsel:or></rsel:not> + </restrict> + <pathelement location="${scala-xml}"/> + <pathelement location="${scala-parser-combinators}"/> + + <restrict> + <path refid="scalacheck.classpath"/> + <rsel:not><rsel:or> + <rsel:name name="scala-library*.jar"/> + <rsel:name name="scala-compiler*.jar"/> + <rsel:name name="scala-reflect*.jar"/> + <rsel:name name="scala-actors*.jar"/> + <rsel:name name="scala-parser-combinators*.jar"/> + <rsel:name name="scala-xml*.jar"/> + </rsel:or></rsel:not> + </restrict> <!-- partest classes specific to the core compiler build --> <pathelement location="${partest-extras.jar}"/> |