summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml21
1 files changed, 1 insertions, 20 deletions
diff --git a/build.xml b/build.xml
index 519d3597cc..6b2c9ade0d 100644
--- a/build.xml
+++ b/build.xml
@@ -319,7 +319,6 @@ TODO:
<prepareCross name="scala-parser-combinators" />
<prepareCross name="scala-swing"/>
<prepareCross name="partest"/>
- <prepareCross name="scalacheck"/>
<artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset">
<dependency groupId="org.scala-lang.modules" artifactId="scala-asm" version="${scala-asm.version}"/>
@@ -339,11 +338,6 @@ TODO:
</artifact:dependencies>
<copy-deps project="partest"/>
- <artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions">
- <artifact:remoteRepository refid="extra-repo"/>
- <dependency groupId="org.scalacheck" artifactId="scalacheck${scalacheck.cross}" 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>
@@ -567,7 +561,6 @@ TODO:
<echo message="scala-swing.version.number = ${scala-swing.version.number}"/>
<echo message="jline.version = ${jline.version}"/>
<echo message="partest.version.number = ${partest.version.number}"/>
- <echo message="scalacheck.version.number = ${scalacheck.version.number}"/>
<propertyfile file="versions.properties">
<entry key="starr.version" value="${starr.version}"/>
@@ -577,7 +570,6 @@ TODO:
<entry key="scala-swing.version.number" value="${scala-swing.version.number}"/>
<entry key="jline.version" value="${jline.version}"/>
<entry key="partest.version.number" value="${partest.version.number}"/>
- <entry key="scalacheck.version.number" value="${scalacheck.version.number}"/>
</propertyfile>
</then></if>
@@ -922,7 +914,7 @@ TODO:
(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` -->
+ as part of `partest.classpath` -->
<restrict>
<path refid="partest.classpath"/>
<rsel:not><rsel:or>
@@ -933,17 +925,6 @@ TODO:
<pathelement location="${scala-parser-combinators}"/>
<!-- <pathelement location="${scala-swing}"/> -->
- <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-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}"/>
<pathelement location="${partest-javaagent.jar}"/>