Permalink
Browse files

Introduces scala-reflect.jar

  • Loading branch information...
xeno-by committed Jun 8, 2012
1 parent 13213e3 commit 0b2f1bcf75d31c59b25e19eebcb80f39c155365b
Showing with 347 additions and 33 deletions.
  1. +227 −7 build.xml
  2. +1 −1 lib/scala-compiler.jar.desired.sha1
  3. +1 −1 lib/scala-library.jar.desired.sha1
  4. +1 −0 lib/scala-reflect.jar.desired.sha1
  5. +3 −0 src/build/maven/maven-deploy.xml
  6. +5 −0 src/build/maven/scala-compiler-pom.xml
  7. +62 −0 src/build/maven/scala-reflect-pom.xml
  8. +3 −0 src/build/pack.xml
  9. +11 −0 src/partest/scala/tools/partest/PartestTask.scala
  10. +1 −0 src/partest/scala/tools/partest/nest/AntRunner.scala
  11. +13 −4 src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
  12. +2 −1 src/partest/scala/tools/partest/nest/DirectRunner.scala
  13. +1 −0 src/partest/scala/tools/partest/nest/FileManager.scala
  14. +1 −1 src/partest/scala/tools/partest/nest/NestUI.scala
  15. +2 −2 src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
  16. +2 −0 src/partest/scala/tools/partest/nest/SBTRunner.scala
  17. +2 −0 src/partest/scala/tools/partest/nest/Worker.scala
  18. 0 src/{library → reflect}/scala/reflect/api/AnnotationInfos.scala
  19. 0 src/{library → reflect}/scala/reflect/api/Constants.scala
  20. 0 src/{library → reflect}/scala/reflect/api/Exprs.scala
  21. 0 src/{library → reflect}/scala/reflect/api/FlagSets.scala
  22. 0 src/{library → reflect}/scala/reflect/api/FrontEnds.scala
  23. 0 src/{library → reflect}/scala/reflect/api/Importers.scala
  24. 0 src/{compiler → reflect}/scala/reflect/api/JavaUniverse.scala
  25. 0 src/{library → reflect}/scala/reflect/api/Mirrors.scala
  26. 0 src/{library → reflect}/scala/reflect/api/Names.scala
  27. 0 src/{library → reflect}/scala/reflect/api/Positions.scala
  28. 0 src/{library → reflect}/scala/reflect/api/StandardDefinitions.scala
  29. 0 src/{library → reflect}/scala/reflect/api/StandardNames.scala
  30. 0 src/{library → reflect}/scala/reflect/api/Symbols.scala
  31. 0 src/{compiler → reflect}/scala/reflect/api/TagInterop.scala
  32. 0 src/{library → reflect}/scala/reflect/api/TreePrinters.scala
  33. 0 src/{library → reflect}/scala/reflect/api/Trees.scala
  34. 0 src/{library → reflect}/scala/reflect/api/Types.scala
  35. 0 src/{library → reflect}/scala/reflect/api/Universe.scala
  36. 0 src/{library → reflect}/scala/reflect/api/package.scala
  37. 0 src/{compiler → reflect}/scala/reflect/internal/AbstractFileApi.scala
  38. 0 src/{compiler → reflect}/scala/reflect/internal/AnnotationCheckers.scala
  39. 0 src/{compiler → reflect}/scala/reflect/internal/AnnotationInfos.scala
  40. 0 src/{compiler → reflect}/scala/reflect/internal/BaseTypeSeqs.scala
  41. 0 src/{compiler → reflect}/scala/reflect/internal/BuildUtils.scala
  42. 0 src/{compiler → reflect}/scala/reflect/internal/CapturedVariables.scala
  43. 0 src/{compiler → reflect}/scala/reflect/internal/Chars.scala
  44. 0 src/{compiler → reflect}/scala/reflect/internal/ClassfileConstants.scala
  45. 0 src/{compiler → reflect}/scala/reflect/internal/Constants.scala
  46. 0 src/{compiler → reflect}/scala/reflect/internal/Definitions.scala
  47. 0 src/{compiler → reflect}/scala/reflect/internal/ExistentialsAndSkolems.scala
  48. 0 src/{compiler → reflect}/scala/reflect/internal/FatalError.scala
  49. 0 src/{compiler → reflect}/scala/reflect/internal/FlagSets.scala
  50. 0 src/{compiler → reflect}/scala/reflect/internal/Flags.scala
  51. 0 src/{compiler → reflect}/scala/reflect/internal/HasFlags.scala
  52. 0 src/{compiler → reflect}/scala/reflect/internal/Importers.scala
  53. 0 src/{compiler → reflect}/scala/reflect/internal/InfoTransformers.scala
  54. 0 src/{compiler → reflect}/scala/reflect/internal/Kinds.scala
  55. 0 src/{compiler → reflect}/scala/reflect/internal/Mirrors.scala
  56. 0 src/{compiler → reflect}/scala/reflect/internal/MissingRequirementError.scala
  57. 0 src/{compiler → reflect}/scala/reflect/internal/Names.scala
  58. 0 src/{compiler → reflect}/scala/reflect/internal/Phase.scala
  59. 0 src/{compiler → reflect}/scala/reflect/internal/Positions.scala
  60. 0 src/{compiler → reflect}/scala/reflect/internal/Required.scala
  61. 0 src/{compiler → reflect}/scala/reflect/internal/Scopes.scala
  62. 0 src/{compiler → reflect}/scala/reflect/internal/StdAttachments.scala
  63. 0 src/{compiler → reflect}/scala/reflect/internal/StdCreators.scala
  64. 0 src/{compiler → reflect}/scala/reflect/internal/StdNames.scala
  65. 0 src/{compiler → reflect}/scala/reflect/internal/SymbolTable.scala
  66. 0 src/{compiler → reflect}/scala/reflect/internal/Symbols.scala
  67. 0 src/{compiler → reflect}/scala/reflect/internal/TreeGen.scala
  68. 0 src/{compiler → reflect}/scala/reflect/internal/TreeInfo.scala
  69. 0 src/{compiler → reflect}/scala/reflect/internal/TreePrinters.scala
  70. 0 src/{compiler → reflect}/scala/reflect/internal/Trees.scala
  71. 0 src/{compiler → reflect}/scala/reflect/internal/TypeDebugging.scala
  72. 0 src/{compiler → reflect}/scala/reflect/internal/Types.scala
  73. 0 src/{compiler → reflect}/scala/reflect/internal/package.scala
  74. 0 src/{compiler → reflect}/scala/reflect/internal/pickling/ByteCodecs.scala
  75. 0 src/{compiler → reflect}/scala/reflect/internal/pickling/PickleBuffer.scala
  76. 0 src/{compiler → reflect}/scala/reflect/internal/pickling/PickleFormat.scala
  77. 0 src/{compiler → reflect}/scala/reflect/internal/pickling/UnPickler.scala
  78. 0 src/{compiler → reflect}/scala/reflect/internal/settings/AbsSettings.scala
  79. 0 src/{compiler → reflect}/scala/reflect/internal/settings/MutableSettings.scala
  80. 0 src/{compiler → reflect}/scala/reflect/internal/transform/Erasure.scala
  81. 0 src/{compiler → reflect}/scala/reflect/internal/transform/RefChecks.scala
  82. 0 src/{compiler → reflect}/scala/reflect/internal/transform/Transforms.scala
  83. 0 src/{compiler → reflect}/scala/reflect/internal/transform/UnCurry.scala
  84. 0 src/{compiler → reflect}/scala/reflect/internal/util/Collections.scala
  85. 0 src/{compiler → reflect}/scala/reflect/internal/util/HashSet.scala
  86. 0 src/{compiler → reflect}/scala/reflect/internal/util/Origins.scala
  87. 0 src/{compiler → reflect}/scala/reflect/internal/util/Position.scala
  88. 0 src/{compiler → reflect}/scala/reflect/internal/util/Set.scala
  89. 0 src/{compiler → reflect}/scala/reflect/internal/util/SourceFile.scala
  90. 0 src/{compiler → reflect}/scala/reflect/internal/util/StatBase.scala
  91. 0 src/{compiler → reflect}/scala/reflect/internal/util/Statistics.scala
  92. 0 src/{compiler → reflect}/scala/reflect/internal/util/StringOps.scala
  93. 0 src/{compiler → reflect}/scala/reflect/internal/util/TableDef.scala
  94. 0 src/{compiler → reflect}/scala/reflect/internal/util/TraceSymbolActivity.scala
  95. 0 src/{compiler → reflect}/scala/reflect/internal/util/WeakHashSet.scala
  96. 0 src/{library → reflect}/scala/reflect/makro/Aliases.scala
  97. 0 src/{library → reflect}/scala/reflect/makro/CapturedVariables.scala
  98. 0 src/{library → reflect}/scala/reflect/makro/Context.scala
  99. 0 src/{library → reflect}/scala/reflect/makro/Enclosures.scala
  100. 0 src/{library → reflect}/scala/reflect/makro/Evals.scala
  101. 0 src/{library → reflect}/scala/reflect/makro/ExprUtils.scala
  102. 0 src/{library → reflect}/scala/reflect/makro/Exprs.scala
  103. 0 src/{library → reflect}/scala/reflect/makro/FrontEnds.scala
  104. 0 src/{library → reflect}/scala/reflect/makro/Infrastructure.scala
  105. 0 src/{library → reflect}/scala/reflect/makro/Names.scala
  106. 0 src/{library → reflect}/scala/reflect/makro/Parsers.scala
  107. 0 src/{library → reflect}/scala/reflect/makro/Reifiers.scala
  108. 0 src/{library → reflect}/scala/reflect/makro/Settings.scala
  109. 0 src/{library → reflect}/scala/reflect/makro/TreeBuilder.scala
  110. 0 src/{library → reflect}/scala/reflect/makro/TypeTags.scala
  111. 0 src/{library → reflect}/scala/reflect/makro/Typers.scala
  112. 0 src/{library → reflect}/scala/reflect/makro/Universe.scala
  113. 0 src/{library → reflect}/scala/reflect/makro/package.scala
  114. 0 src/{compiler → reflect}/scala/reflect/runtime/AbstractFile.scala
  115. 0 src/{compiler → reflect}/scala/reflect/runtime/JavaMirrors.scala
  116. 0 src/{compiler → reflect}/scala/reflect/runtime/JavaUniverse.scala
  117. 0 src/{compiler → reflect}/scala/reflect/runtime/ReflectSetup.scala
  118. 0 src/{compiler → reflect}/scala/reflect/runtime/ReflectionUtils.scala
  119. 0 src/{compiler → reflect}/scala/reflect/runtime/Settings.scala
  120. 0 src/{compiler → reflect}/scala/reflect/runtime/SymbolLoaders.scala
  121. 0 src/{compiler → reflect}/scala/reflect/runtime/SymbolTable.scala
  122. 0 src/{compiler → reflect}/scala/reflect/runtime/SynchronizedOps.scala
  123. 0 src/{compiler → reflect}/scala/reflect/runtime/SynchronizedSymbols.scala
  124. 0 src/{compiler → reflect}/scala/reflect/runtime/SynchronizedTypes.scala
  125. 0 src/{compiler → reflect}/scala/reflect/runtime/TwoWayCache.scala
  126. 0 src/{compiler → reflect}/scala/reflect/runtime/package.scala
  127. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/AbstractFile.scala
  128. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/Directory.scala
  129. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/File.scala
  130. 0 src/{compiler → reflect}/scala/tools/nsc/io/FileOperationException.scala
  131. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/NoAbstractFile.scala
  132. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/Path.scala
  133. 0 src/{compiler → reflect}/scala/tools/nsc/io/PlainFile.scala
  134. 0 src/{compiler → reflect}/scala/tools/nsc/io/Streamable.scala
  135. 0 src/{compiler → reflect}/scala/tools/nsc/io/VirtualDirectory.scala
  136. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/VirtualFile.scala
  137. +1 −2 src/{compiler → reflect}/scala/tools/nsc/io/ZipArchive.scala
  138. +2 −2 test/files/presentation/memory-leaks/MemoryLeaksTest.scala
View
234 build.xml

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1 +1 @@
-388fae20e2e54836af67c752ffed8ff5540b82ea ?scala-compiler.jar
+bf1b1d794688e661cd9d94ec42be37515f06f453 ?scala-compiler.jar
@@ -1 +1 @@
-6e68e00a30b7328b55de7362f902619066094de7 ?scala-library.jar
+9cc8e09873316a58bddef7dc59229ca6e1c27e79 ?scala-library.jar
@@ -0,0 +1 @@
+ec3636a6da2b3055f6a54488a002a5c3fc2ae192 ?scala-reflect.jar
@@ -111,6 +111,7 @@
<deploy-local name="scala-library" version="@{version}" repository="@{repository}" />
<deploy-local name="scala-compiler" version="@{version}" repository="@{repository}" />
<deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/>
+ <deploy-local name="scala-reflect" version="@{version}" repository="@{repository}" />
<deploy-local name="scala-actors" version="@{version}" repository="@{repository}" />
<deploy-local name="scala-actors-migration" version="@{version}" repository="@{repository}" />
<deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/>
@@ -170,6 +171,7 @@
</extra-attachments>
</deploy-remote>
<deploy-remote name="jline" version="@{version}" repository="@{repository}"/>
+ <deploy-remote name="scala-reflect" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-compiler" version="@{version}" repository="@{repository}" />
<deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-actors" version="@{version}" repository="@{repository}"/>
@@ -238,6 +240,7 @@
<deploy-remote-plugin-signed name="continuations" version="@{version}" repository="@{repository}"/>
<deploy-remote-signed name="scala-library" version="@{version}" repository="@{repository}"/>
<deploy-remote-signed name="jline" version="@{version}" repository="@{repository}"/>
+ <deploy-remote-signed name="scala-reflect" version="@{version}" repository="@{repository}"/>
<deploy-remote-signed name="scala-compiler" version="@{version}" repository="@{repository}" />
<deploy-remote-signed name="scala-swing" version="@{version}" repository="@{repository}"/>
<deploy-remote-signed name="scala-actors" version="@{version}" repository="@{repository}"/>
@@ -37,6 +37,11 @@
<artifactId>scala-library</artifactId>
<version>@VERSION@</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <version>@VERSION@</version>
+ </dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
@@ -0,0 +1,62 @@
+<project
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <packaging>jar</packaging>
+ <version>@VERSION@</version>
+ <name>Scala Compiler</name>
+ <description>Compiler for the Scala Programming Language</description>
+ <url>http://www.scala-lang.org/</url>
+ <inceptionYear>2002</inceptionYear>
+ <organization>
+ <name>LAMP/EPFL</name>
+ <url>http://lamp.epfl.ch/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>BSD-like</name>
+ <url>http://www.scala-lang.org/downloads/license.html
+ </url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git://github.com/scala/scala.git</connection>
+ <url>https://github.com/scala/scala.git</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.scala-lang.org/</url>
+ </issueManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>@VERSION@</version>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>scala-tools.org</id>
+ <url>@RELEASE_REPOSITORY@</url>
+ </repository>
+ <snapshotRepository>
+ <id>scala-tools.org</id>
+ <url>@SNAPSHOT_REPOSITORY@</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
+</project>
View
@@ -136,6 +136,7 @@ MAIN DISTRIBUTION PACKAGING
</macrodef>
<mvn-copy-lib mvn.artifact.name="jline"/>
<mvn-copy-lib mvn.artifact.name="scala-library"/>
+ <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
<mvn-copy-lib mvn.artifact.name="scala-compiler"/>
<mvn-copy-lib mvn.artifact.name="scala-swing"/>
<mvn-copy-lib mvn.artifact.name="scala-actors"/>
@@ -212,6 +213,8 @@ MAIN DISTRIBUTION PACKAGING
file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
<copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
+ <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar"
+ file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
</target>
<target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win">
@@ -279,6 +279,16 @@ class PartestTask extends Task with CompilationPathProperty {
}
} getOrElse sys.error("Provided classpath does not contain a Scala library.")
+ val scalaReflect = {
+ (classpath.list map { fs => new File(fs) }) find { f =>
+ f.getName match {
+ case "scala-reflect.jar" => true
+ case "reflect" if (f.getParentFile.getName == "classes") => true
+ case _ => false
+ }
+ }
+ } getOrElse sys.error("Provided classpath does not contain a Scala reflection library.")
+
val scalaCompiler = {
(classpath.list map { fs => new File(fs) }) find { f =>
f.getName match {
@@ -342,6 +352,7 @@ class PartestTask extends Task with CompilationPathProperty {
antFileManager.failed = runFailed
antFileManager.CLASSPATH = ClassPath.join(classpath.list: _*)
antFileManager.LATEST_LIB = scalaLibrary.getAbsolutePath
+ antFileManager.LATEST_REFLECT = scalaReflect.getAbsolutePath
antFileManager.LATEST_COMP = scalaCompiler.getAbsolutePath
antFileManager.LATEST_PARTEST = scalaPartest.getAbsolutePath
antFileManager.LATEST_ACTORS = scalaActors.getAbsolutePath
@@ -20,6 +20,7 @@ class AntRunner extends DirectRunner {
var JAVAC_CMD: String = "javac"
var CLASSPATH: String = _
var LATEST_LIB: String = _
+ var LATEST_REFLECT: String = _
var LATEST_COMP: String = _
var LATEST_PARTEST: String = _
var LATEST_ACTORS: String = _
@@ -85,6 +85,7 @@ class ConsoleFileManager extends FileManager {
latestLibFile = testClassesDir / "library"
latestActorsFile = testClassesDir / "library" / "actors"
latestActMigFile = testClassesDir / "actors-migration"
+ latestReflectFile = testClassesDir / "reflect"
latestCompFile = testClassesDir / "compiler"
latestPartestFile = testClassesDir / "partest"
latestFjbgFile = testParent / "lib" / "fjbg.jar"
@@ -96,6 +97,7 @@ class ConsoleFileManager extends FileManager {
latestLibFile = dir / "lib/scala-library.jar"
latestActorsFile = dir / "lib/scala-actors.jar"
latestActMigFile = dir / "lib/scala-actors-migration.jar"
+ latestReflectFile = dir / "lib/scala-reflect.jar"
latestCompFile = dir / "lib/scala-compiler.jar"
latestPartestFile = dir / "lib/scala-partest.jar"
latestFjbgFile = testParent / "lib" / "fjbg.jar"
@@ -107,6 +109,7 @@ class ConsoleFileManager extends FileManager {
latestLibFile = prefixFile("build/quick/classes/library")
latestActorsFile = prefixFile("build/quick/classes/library/actors")
latestActMigFile = prefixFile("build/quick/classes/actors-migration")
+ latestReflectFile = prefixFile("build/quick/classes/reflect")
latestCompFile = prefixFile("build/quick/classes/compiler")
latestPartestFile = prefixFile("build/quick/classes/partest")
}
@@ -118,6 +121,7 @@ class ConsoleFileManager extends FileManager {
latestLibFile = prefixFileWith(p, "lib/scala-library.jar")
latestActorsFile = prefixFileWith(p, "lib/scala-actors.jar")
latestActMigFile = prefixFileWith(p, "lib/scala-actors-migration.jar")
+ latestReflectFile = prefixFileWith(p, "lib/scala-reflect.jar")
latestCompFile = prefixFileWith(p, "lib/scala-compiler.jar")
latestPartestFile = prefixFileWith(p, "lib/scala-partest.jar")
}
@@ -128,6 +132,7 @@ class ConsoleFileManager extends FileManager {
latestLibFile = prefixFile("dists/latest/lib/scala-library.jar")
latestActorsFile = prefixFile("dists/latest/lib/scala-actors.jar")
latestActMigFile = prefixFile("dists/latest/lib/scala-actors-migration.jar")
+ latestReflectFile = prefixFile("dists/latest/lib/scala-reflect.jar")
latestCompFile = prefixFile("dists/latest/lib/scala-compiler.jar")
latestPartestFile = prefixFile("dists/latest/lib/scala-partest.jar")
}
@@ -138,6 +143,7 @@ class ConsoleFileManager extends FileManager {
latestLibFile = prefixFile("build/pack/lib/scala-library.jar")
latestActorsFile = prefixFile("build/pack/lib/scala-actors.jar")
latestActMigFile = prefixFile("build/pack/lib/scala-actors-migration.jar")
+ latestReflectFile = prefixFile("build/pack/lib/scala-reflect.jar")
latestCompFile = prefixFile("build/pack/lib/scala-compiler.jar")
latestPartestFile = prefixFile("build/pack/lib/scala-partest.jar")
}
@@ -151,10 +157,10 @@ class ConsoleFileManager extends FileManager {
names map (x => prefixFile(base + "/" + x).lastModified) reduceLeft (_ max _)
// detect most recent build
- val quickTime = mostRecentOf("build/quick/classes", "compiler/compiler.properties", "library/library.properties")
- val packTime = mostRecentOf("build/pack/lib", "scala-compiler.jar", "scala-library.jar")
- val distTime = mostRecentOf("dists/latest/lib", "scala-compiler.jar", "scala-library.jar")
- val instTime = mostRecentOf("lib", "scala-compiler.jar", "scala-library.jar")
+ val quickTime = mostRecentOf("build/quick/classes", "compiler/compiler.properties", "reflect/reflect.properties", "library/library.properties")
+ val packTime = mostRecentOf("build/pack/lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar")
+ val distTime = mostRecentOf("dists/latest/lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar")
+ val instTime = mostRecentOf("lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar")
val pairs = Map(
(quickTime, () => setupQuick()),
@@ -170,13 +176,15 @@ class ConsoleFileManager extends FileManager {
}
LATEST_LIB = latestLibFile.getAbsolutePath
+ LATEST_REFLECT = latestReflectFile.getAbsolutePath
LATEST_COMP = latestCompFile.getAbsolutePath
LATEST_PARTEST = latestPartestFile.getAbsolutePath
LATEST_ACTORS = latestActorsFile.getAbsolutePath
LATEST_ACTORS_MIGRATION = latestActMigFile.getAbsolutePath
}
var LATEST_LIB: String = ""
+ var LATEST_REFLECT: String = ""
var LATEST_COMP: String = ""
var LATEST_PARTEST: String = ""
var LATEST_ACTORS: String = ""
@@ -186,6 +194,7 @@ class ConsoleFileManager extends FileManager {
var latestLibFile: File = _
var latestActorsFile: File = _
var latestActMigFile: File = _
+ var latestReflectFile: File = _
var latestCompFile: File = _
var latestPartestFile: File = _
var latestFjbgFile: File = _
@@ -58,13 +58,14 @@ trait DirectRunner {
//val consFM = new ConsoleFileManager
//import consFM.{ latestCompFile, latestLibFile, latestPartestFile }
val latestCompFile = new File(fileManager.LATEST_COMP)
+ val latestReflectFile = new File(fileManager.LATEST_REFLECT)
val latestLibFile = new File(fileManager.LATEST_LIB)
val latestPartestFile = new File(fileManager.LATEST_PARTEST)
val latestActorsFile = new File(fileManager.LATEST_ACTORS)
val latestActMigFile = new File(fileManager.LATEST_ACTORS_MIGRATION)
val scalacheckURL = PathSettings.scalaCheck.toURL
val scalaCheckParentClassLoader = ScalaClassLoader.fromURLs(
- scalacheckURL :: (List(latestCompFile, latestLibFile, latestActorsFile, latestActMigFile, latestPartestFile).map(_.toURI.toURL))
+ scalacheckURL :: (List(latestCompFile, latestReflectFile, latestLibFile, latestActorsFile, latestActMigFile, latestPartestFile).map(_.toURI.toURL))
)
Output.init()
@@ -60,6 +60,7 @@ trait FileManager extends FileUtil {
var CLASSPATH: String
var LATEST_LIB: String
+ var LATEST_REFLECT: String
var LATEST_COMP: String
var LATEST_PARTEST: String
var LATEST_ACTORS: String
@@ -84,7 +84,7 @@ object NestUI {
println(" --grep <expr> run all tests whose source file contains <expr>")
println
println(" Other options:")
- println(" --pack pick compiler/library in build/pack, and run all tests")
+ println(" --pack pick compiler/reflect/library in build/pack, and run all tests")
println(" --show-log show log")
println(" --show-diff show diff between log and check file")
println(" --failed run only those tests that failed during the last run")
@@ -48,9 +48,9 @@ class ReflectiveRunner {
new ConsoleFileManager
import fileManager.
- { latestCompFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile }
+ { latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile }
val files =
- Array(latestCompFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile) map (x => io.File(x))
+ Array(latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile) map (x => io.File(x))
val sepUrls = files map (_.toURL)
var sepLoader = new URLClassLoader(sepUrls, null)
@@ -13,6 +13,7 @@ object SBTRunner extends DirectRunner {
var JAVAC_CMD: String = "javac"
var CLASSPATH: String = _
var LATEST_LIB: String = _
+ var LATEST_REFLECT: String = _
var LATEST_COMP: String = _
var LATEST_PARTEST: String = _
var LATEST_ACTORS: String = _
@@ -63,6 +64,7 @@ object SBTRunner extends DirectRunner {
}
// Find scala library jar file...
fileManager.LATEST_LIB = findClasspath("scala-library", "scala-library") getOrElse sys.error("No scala-library found! Classpath = " + fileManager.CLASSPATH)
+ fileManager.LATEST_REFLECT = findClasspath("scala-reflect", "scala-reflect") getOrElse sys.error("No scala-reflect found! Classpath = " + fileManager.CLASSPATH)
fileManager.LATEST_COMP = findClasspath("scala-compiler", "scala-compiler") getOrElse sys.error("No scala-compiler found! Classpath = " + fileManager.CLASSPATH)
fileManager.LATEST_PARTEST = findClasspath("scala-partest", "partest") getOrElse sys.error("No scala-partest found! Classpath = " + fileManager.CLASSPATH)
fileManager.LATEST_ACTORS = findClasspath("scala-actors", "actors") getOrElse sys.error("No scala-actors found! Classpath = " + fileManager.CLASSPATH)
@@ -53,6 +53,7 @@ class ScalaCheckFileManager(val origmanager: FileManager) extends FileManager {
var CLASSPATH: String = join(origmanager.CLASSPATH, PathSettings.scalaCheck.path)
var LATEST_LIB: String = origmanager.LATEST_LIB
+ var LATEST_REFLECT: String = origmanager.LATEST_REFLECT
var LATEST_COMP: String = origmanager.LATEST_COMP
var LATEST_PARTEST: String = origmanager.LATEST_PARTEST
var LATEST_ACTORS: String = origmanager.LATEST_ACTORS
@@ -323,6 +324,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
"-Djava.library.path="+logFile.getParentFile.getAbsolutePath,
"-Dpartest.output="+outDir.getAbsolutePath,
"-Dpartest.lib="+LATEST_LIB,
+ "-Dpartest.reflect="+LATEST_REFLECT,
"-Dpartest.cwd="+outDir.getParent,
"-Dpartest.test-path="+testFullPath,
"-Dpartest.testname="+fileBase,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -8,8 +8,7 @@ package scala.tools.nsc
package io
import java.io.{ FileOutputStream, IOException, InputStream, OutputStream, BufferedOutputStream }
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
import java.net.URL
import scala.collection.mutable.ArrayBuffer
@@ -9,8 +9,7 @@
package scala.tools.nsc
package io
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
object Directory {
import scala.util.Properties.{ tmpDir, userHome, userDir }
@@ -13,8 +13,7 @@ package io
import java.io.{
FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter,
BufferedInputStream, BufferedOutputStream, IOException, PrintStream, PrintWriter, Closeable => JCloseable }
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
import java.nio.channels.{ Channel, FileChannel }
import scala.io.Codec
import language.{reflectiveCalls, implicitConversions}
@@ -7,8 +7,7 @@ package scala.tools.nsc
package io
import java.io.InputStream
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
/** A distinguished object so you can avoid both null
* and Option.
@@ -9,8 +9,7 @@ package io
import java.io.{
FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter,
BufferedInputStream, BufferedOutputStream, RandomAccessFile }
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
import java.net.{ URI, URL }
import scala.util.Random.alphanumeric
import language.implicitConversions
@@ -8,8 +8,7 @@ package scala.tools.nsc
package io
import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream }
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
/** This class implements an in-memory file.
*
@@ -8,8 +8,7 @@ package io
import java.net.URL
import java.io.{ IOException, InputStream, ByteArrayInputStream }
-// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar
-// import java.io.{ File => JFile }
+import java.io.{ File => JFile }
import java.util.zip.{ ZipEntry, ZipFile, ZipInputStream }
import scala.collection.{ immutable, mutable }
import annotation.tailrec
Oops, something went wrong.

0 comments on commit 0b2f1bc

Please sign in to comment.