Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch '2.10.x' into develop

  • Loading branch information...
commit 0e505e5f9432ce0a39e7f577df95387d64a2f841 2 parents a50011f + ec4a9fb
Eugene Burmako xeno-by authored

Showing 309 changed files with 13,542 additions and 7,656 deletions. Show diff stats Hide diff stats

  1. +4 0 META-INF/MANIFEST.MF
  2. +253 135 build.xml
  3. +0 12 classpath.SAMPLE
  4. +1 1  lib/ant/ant-contrib.jar.desired.sha1
  5. +1 1  lib/ant/ant-dotnet-1.0.jar.desired.sha1
  6. +1 1  lib/ant/ant.jar.desired.sha1
  7. +1 1  lib/ant/maven-ant-tasks-2.1.1.jar.desired.sha1
  8. +1 1  lib/ant/vizant.jar.desired.sha1
  9. +1 1  lib/fjbg.jar.desired.sha1
  10. +1 1  lib/forkjoin.jar.desired.sha1
  11. +1 1  lib/jline.jar.desired.sha1
  12. +1 1  lib/msil.jar.desired.sha1
  13. +1 0  lib/scala-compiler-src.jar.desired.sha1
  14. +1 1  lib/scala-compiler.jar.desired.sha1
  15. +1 1  lib/scala-library-src.jar.desired.sha1
  16. +1 1  lib/scala-library.jar.desired.sha1
  17. +1 0  lib/scala-reflect-src.jar.desired.sha1
  18. +1 1  lib/scala-reflect.jar.desired.sha1
  19. +41 239 project/Build.scala
  20. +129 0 project/Packaging.scala
  21. +21 6 project/Release.scala
  22. +53 0 project/RemoteDependencies.scala
  23. +0 3  project/Sametest.scala
  24. +18 17 project/ScalaBuildKeys.scala
  25. +21 0 project/ScalaToolRunner.scala
  26. +49 21 project/ShaResolve.scala
  27. +41 0 project/Testing.scala
  28. +1 0  src/actors-migration/scala/actors/Pattern.scala
  29. +1 0  src/actors-migration/scala/actors/StashingActor.scala
  30. +1 0  src/actors-migration/scala/actors/Timeout.scala
  31. +2 1  src/actors/scala/actors/AbstractActor.scala
  32. +1 2  src/actors/scala/actors/Actor.scala
  33. +2 1  src/actors/scala/actors/CanReply.scala
  34. +2 0  src/actors/scala/actors/Combinators.scala
  35. +1 1  src/actors/scala/actors/MQueue.scala
  36. +1 0  src/actors/scala/actors/Reactor.scala
  37. +2 2 src/build/maven/scala-library-pom.xml
  38. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/AbortMacroException.scala
  39. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Aliases.scala
  40. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/CapturedVariables.scala
  41. +3 4 src/compiler/scala/reflect/{makro → macros}/runtime/Context.scala
  42. +1 2  src/compiler/scala/reflect/{makro → macros}/runtime/Enclosures.scala
  43. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Evals.scala
  44. +2 2 src/compiler/scala/reflect/{makro → macros}/runtime/ExprUtils.scala
  45. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Exprs.scala
  46. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/FrontEnds.scala
  47. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Infrastructure.scala
  48. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Names.scala
  49. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Parsers.scala
  50. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Reifiers.scala
  51. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Settings.scala
  52. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/Traces.scala
  53. +1 1  src/compiler/scala/reflect/{makro → macros}/runtime/TypeTags.scala
  54. +13 20 src/compiler/scala/reflect/{makro → macros}/runtime/Typers.scala
  55. +1 1  src/compiler/scala/reflect/{makro → macros}/util/Traces.scala
  56. +0 26 src/compiler/scala/reflect/makro/runtime/ContextReifiers.scala
  57. +0 40 src/compiler/scala/reflect/makro/runtime/Mirrors.scala
  58. +2 7 src/compiler/scala/reflect/reify/Errors.scala
  59. +3 17 src/compiler/scala/reflect/reify/Reifier.scala
  60. +32 33 src/compiler/scala/reflect/reify/Taggers.scala
  61. +36 8 src/compiler/scala/reflect/reify/codegen/GenSymbols.scala
  62. +4 6 src/compiler/scala/reflect/reify/codegen/GenTrees.scala
  63. +9 13 src/compiler/scala/reflect/reify/codegen/GenTypes.scala
  64. +3 4 src/compiler/scala/reflect/reify/package.scala
  65. +5 27 src/compiler/scala/reflect/reify/utils/Extractors.scala
  66. +3 38 src/compiler/scala/reflect/reify/utils/NodePrinters.scala
  67. +1 1  src/compiler/scala/tools/ant/FastScalac.scala
  68. +1 1  src/compiler/scala/tools/ant/Scalac.scala
  69. +29 8 src/compiler/scala/tools/ant/Scaladoc.scala
  70. +0 1  src/compiler/scala/tools/cmd/CommandLine.scala
  71. +2 2 src/compiler/scala/tools/cmd/FromString.scala
  72. +4 0 src/compiler/scala/tools/cmd/package.scala
  73. +1 1  src/compiler/scala/tools/nsc/CompileServer.scala
  74. +4 2 src/compiler/scala/tools/nsc/Driver.scala
  75. +12 9 src/compiler/scala/tools/nsc/Global.scala
  76. +2 4 src/compiler/scala/tools/nsc/Main.scala
  77. +48 0 src/compiler/scala/tools/nsc/MainBench.scala
  78. +1 1  src/compiler/scala/tools/nsc/ObjectRunner.scala
  79. +2 1  src/compiler/scala/tools/nsc/ScalaDoc.scala
  80. +1 1  src/compiler/scala/tools/nsc/ScriptRunner.scala
  81. +53 36 src/compiler/scala/tools/nsc/ast/DocComments.scala
  82. +1 1  src/compiler/scala/tools/nsc/ast/NodePrinters.scala
  83. +3 3 src/compiler/scala/tools/nsc/ast/{TreePrinters.scala → Printers.scala}
  84. +1 1  src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
  85. +9 14 src/compiler/scala/tools/nsc/ast/TreeGen.scala
  86. +7 6 src/compiler/scala/tools/nsc/ast/Trees.scala
  87. +19 3 src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
  88. +5 1 src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
  89. +1 1  src/compiler/scala/tools/nsc/backend/JavaPlatform.scala
  90. +85 36 src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
  91. +121 31 src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
  92. +7 5 src/compiler/scala/tools/nsc/backend/icode/Repository.scala
  93. +60 116 src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
  94. +3,332 3,287 src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
  95. +11 5 src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
  96. +25 1 src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
  97. +345 167 src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
  98. +11 8 src/compiler/scala/tools/nsc/doc/DocFactory.scala
  99. +103 16 src/compiler/scala/tools/nsc/doc/Settings.scala
  100. +22 3 src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala
  101. +44 19 src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala
  102. +32 24 src/compiler/scala/tools/nsc/doc/html/Page.scala
  103. +5 3 src/compiler/scala/tools/nsc/doc/html/page/Index.scala
  104. +6 10 src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala
  105. +1 1  src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala
  106. +179 90 src/compiler/scala/tools/nsc/doc/html/page/Template.scala
  107. +53 0 src/compiler/scala/tools/nsc/doc/html/page/diagram/DiagramGenerator.scala
  108. +66 0 src/compiler/scala/tools/nsc/doc/html/page/diagram/DiagramStats.scala
  109. +511 0 src/compiler/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
  110. +228 0 src/compiler/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala
  111. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/class_diagram.png
  112. +143 0 src/compiler/scala/tools/nsc/doc/html/resource/lib/diagrams.css
  113. +324 0 src/compiler/scala/tools/nsc/doc/html/resource/lib/diagrams.js
  114. +25 23 src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js
  115. +4 0 src/compiler/scala/tools/nsc/doc/html/resource/lib/modernizr.custom.js
  116. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/object_diagram.png
  117. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/object_to_type_big.png
  118. +10 0 src/compiler/scala/tools/nsc/doc/html/resource/lib/raphael-min.js
  119. +32 11 src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
  120. +111 42 src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js
  121. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/trait_diagram.png
  122. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/type.png
  123. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/type_big.png
  124. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/type_diagram.png
  125. BIN  src/compiler/scala/tools/nsc/doc/html/resource/lib/type_to_object_big.png
  126. +158 52 src/compiler/scala/tools/nsc/doc/model/Entity.scala
  127. +1 7 src/compiler/scala/tools/nsc/doc/model/IndexModelFactory.scala
  128. +24 0 src/compiler/scala/tools/nsc/doc/model/LinkTo.scala
  129. +187 0 src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala
  130. +701 356 src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
  131. +198 107 src/compiler/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
  132. +323 0 src/compiler/scala/tools/nsc/doc/model/ModelFactoryTypeSupport.scala
  133. +1 1  src/compiler/scala/tools/nsc/doc/model/TreeFactory.scala
  134. +1 3 src/compiler/scala/tools/nsc/doc/model/TypeEntity.scala
  135. +5 2 src/compiler/scala/tools/nsc/doc/model/comment/Body.scala
  136. +18 0 src/compiler/scala/tools/nsc/doc/model/comment/Comment.scala
  137. +146 81 src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
  138. +146 0 src/compiler/scala/tools/nsc/doc/model/diagram/Diagram.scala
  139. +262 0 src/compiler/scala/tools/nsc/doc/model/diagram/DiagramDirectiveParser.scala
  140. +256 0 src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
  141. +14 1 src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
  142. +29 12 src/compiler/scala/tools/nsc/interactive/Global.scala
  143. +1 1  src/compiler/scala/tools/nsc/interactive/PresentationCompilerThread.scala
  144. +9 4 src/compiler/scala/tools/nsc/interactive/REPL.scala
  145. +21 27 src/compiler/scala/tools/nsc/interactive/RangePositions.scala
  146. +9 3 src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
  147. +9 5 src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala
  148. +6 3 src/compiler/scala/tools/nsc/interactive/tests/InteractiveTestSettings.scala
  149. +6 3 src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerInstance.scala
  150. +1 1  src/compiler/scala/tools/nsc/interpreter/ILoop.scala
  151. +1 1  src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala
  152. +3 3 src/compiler/scala/tools/nsc/interpreter/IMain.scala
  153. +1 1  src/compiler/scala/tools/nsc/interpreter/Imports.scala
  154. +4 4 src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
  155. +3 2 src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala
  156. +2 2 src/compiler/scala/tools/nsc/interpreter/Power.scala
  157. +3 1 src/compiler/scala/tools/nsc/interpreter/ReplConfig.scala
  158. +1 2  src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala
  159. +2 1  src/compiler/scala/tools/nsc/javac/JavaParsers.scala
  160. +3 3 src/compiler/scala/tools/nsc/javac/JavaScanners.scala
  161. +1 1  src/compiler/scala/tools/nsc/matching/MatchSupport.scala
  162. +1 1  src/compiler/scala/tools/nsc/matching/Patterns.scala
  163. +0 55 src/compiler/scala/tools/nsc/scratchpad/Executor.scala
  164. +98 0 src/compiler/scala/tools/nsc/scratchpad/Mixer.scala
  165. +2 3 src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
  166. +3 1 src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
  167. +11 3 src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala
  168. +33 14 src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
  169. +39 25 src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
  170. +2 2 src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
  171. +8 10 src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
  172. +152 40 src/compiler/scala/tools/nsc/transform/CleanUp.scala
  173. +6 3 src/compiler/scala/tools/nsc/transform/Constructors.scala
  174. +66 24 src/compiler/scala/tools/nsc/transform/Erasure.scala
  175. +32 29 src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
  176. +13 4 src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
  177. +55 30 src/compiler/scala/tools/nsc/transform/LambdaLift.scala
  178. +6 3 src/compiler/scala/tools/nsc/transform/PostErasure.scala
  179. +101 26 src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
  180. +15 6 src/compiler/scala/tools/nsc/transform/TailCalls.scala
  181. +40 32 src/compiler/scala/tools/nsc/transform/UnCurry.scala
  182. +4 3 src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
  183. +15 7 src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
  184. +23 11 src/compiler/scala/tools/nsc/typechecker/Contexts.scala
  185. +19 10 src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
  186. +18 7 src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
  187. +201 129 src/compiler/scala/tools/nsc/typechecker/Implicits.scala
  188. +169 59 src/compiler/scala/tools/nsc/typechecker/Infer.scala
  189. +41 67 src/compiler/scala/tools/nsc/typechecker/Macros.scala
  190. +2 5 src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
  191. +58 83 src/compiler/scala/tools/nsc/typechecker/Namers.scala
  192. +13 2 src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
  193. +834 412 src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
  194. +18 8 src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
  195. +1 1  src/compiler/scala/tools/nsc/typechecker/StdAttachments.scala
  196. +21 0 src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
  197. +2 2 src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
  198. +1 1  src/compiler/scala/tools/nsc/typechecker/Tags.scala
  199. +2 2 src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
  200. +5 1 src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
  201. +333 180 src/compiler/scala/tools/nsc/typechecker/Typers.scala
  202. +63 77 src/compiler/scala/tools/nsc/typechecker/Unapplies.scala
  203. +6 0 src/compiler/scala/tools/nsc/util/DocStrings.scala
  204. +14 2 src/compiler/scala/tools/nsc/util/InterruptReq.scala
  205. +0 200 src/compiler/scala/tools/nsc/util/Statistics.scala
  206. +38 0 src/compiler/scala/tools/nsc/util/StatisticsInfo.scala
  207. +6 1 src/compiler/scala/tools/nsc/util/WorkScheduler.scala
  208. +4 5 src/compiler/scala/tools/reflect/FastTrack.scala
  209. +149 0 src/compiler/scala/tools/reflect/MacroImplementations.scala
  210. +6 3 src/compiler/scala/tools/{nsc → reflect}/ReflectGlobal.scala
  211. +8 4 src/compiler/scala/tools/{nsc → reflect}/ReflectMain.scala
  212. +5 2 src/compiler/scala/tools/{nsc → reflect}/ReflectSetup.scala
  213. +36 20 src/compiler/scala/tools/reflect/StdTags.scala
  214. +30 24 src/compiler/scala/tools/reflect/ToolBox.scala
  215. +75 50 src/compiler/scala/tools/reflect/ToolBoxFactory.scala
  216. +1 1  src/compiler/scala/tools/util/PathResolver.scala
  217. +2 1  src/compiler/scala/tools/util/VerifyClass.scala
  218. +3 1 src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
  219. +1 1  src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala
  220. +6 6 src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala
  221. +52 0 src/eclipse/README.md
  222. +6 0 src/eclipse/asm/.classpath
  223. +29 0 src/eclipse/asm/.project
  224. +7 0 src/eclipse/fjbg/.classpath
  225. +13 1 project.SAMPLE → src/eclipse/fjbg/.project
  226. +14 0 src/eclipse/partest/.classpath
  227. +35 0 src/eclipse/partest/.project
  228. +7 0 src/eclipse/reflect/.classpath
  229. +30 0 src/eclipse/reflect/.project
  230. +13 0 src/eclipse/scala-compiler/.classpath
  231. +35 0 src/eclipse/scala-compiler/.project
  232. +7 0 src/eclipse/scala-library/.classpath
  233. +30 0 src/eclipse/scala-library/.project
  234. +12 0 src/eclipse/scalap/.classpath
  235. +35 0 src/eclipse/scalap/.project
  236. +6 5 src/intellij/README
  237. +2 2 src/intellij/actors.iml.SAMPLE
  238. +12 0 src/intellij/asm.iml.SAMPLE
  239. +6 2 src/intellij/compiler.iml.SAMPLE
  240. +12 0 src/intellij/fjbg.iml.SAMPLE
  241. +12 0 src/intellij/forkjoin.iml.SAMPLE
  242. +3 3 src/intellij/library.iml.SAMPLE
  243. +1 1  src/intellij/manual.iml.SAMPLE
  244. +24 0 src/intellij/msil.iml.SAMPLE
  245. +3 3 src/intellij/partest.iml.SAMPLE
  246. +3 3 src/intellij/reflect.iml.SAMPLE
  247. +13 17 src/intellij/scala-lang.ipr.SAMPLE
  248. +2 1  src/intellij/scalap.iml.SAMPLE
  249. +1 1  src/intellij/swing.iml.SAMPLE
  250. +7 3 src/intellij/test.iml.SAMPLE
  251. +1 0  src/library-aux/scala/AnyRef.scala
  252. +2 2 src/library/scala/Array.scala
  253. +0 3  src/library/scala/Double.scala
  254. +5 2 src/library/scala/Enumeration.scala
  255. +0 3  src/library/scala/Float.scala
  256. +4 4 src/library/scala/Option.scala
  257. +34 26 src/library/scala/Predef.scala
  258. +22 38 src/library/scala/StringContext.scala
  259. +2 3 src/library/scala/{ → annotation}/cloneable.scala
  260. +20 0 src/library/scala/annotation/static.scala
  261. +2 2 src/library/scala/collection/DefaultMap.scala
  262. +0 9 src/library/scala/collection/GenTraversableLike.scala
  263. +20 0 src/library/scala/collection/GenTraversableOnce.scala
  264. +1 1  src/library/scala/collection/IterableViewLike.scala
  265. +3 0  src/library/scala/collection/Iterator.scala
  266. +1 0  src/library/scala/collection/Map.scala
  267. +20 16 src/library/scala/collection/MapLike.scala
  268. +1 1  src/library/scala/collection/SeqLike.scala
  269. +1 1  src/library/scala/collection/SeqViewLike.scala
  270. +18 1 src/library/scala/collection/SortedMap.scala
  271. +23 0 src/library/scala/collection/SortedMapLike.scala
  272. +8 0 src/library/scala/collection/TraversableLike.scala
  273. +13 4 src/library/scala/collection/TraversableOnce.scala
  274. +1 1  src/library/scala/collection/TraversableViewLike.scala
  275. +9 5 src/library/scala/collection/concurrent/TrieMap.scala
  276. +2 1  src/library/scala/collection/convert/Wrappers.scala
  277. +19 17 src/library/scala/collection/generic/{FromRepr.scala → IsTraversableLike.scala}
  278. +62 0 src/library/scala/collection/generic/IsTraversableOnce.scala
  279. +1 7 src/library/scala/collection/generic/package.scala
  280. +1 2  src/library/scala/collection/immutable/HashMap.scala
  281. +1 2  src/library/scala/collection/immutable/HashSet.scala
  282. +147 142 src/library/scala/collection/immutable/IntMap.scala
  283. +2 1  src/library/scala/collection/immutable/List.scala
  284. +161 157 src/library/scala/collection/immutable/LongMap.scala
  285. +6 16 src/library/scala/collection/immutable/MapLike.scala
  286. +17 16 src/library/scala/collection/immutable/RedBlackTree.scala
  287. +30 1 src/library/scala/collection/immutable/SortedMap.scala
  288. +1 1  src/library/scala/collection/immutable/StringOps.scala
  289. +2 2 src/library/scala/collection/immutable/TreeMap.scala
  290. +2 2 src/library/scala/collection/immutable/TreeSet.scala
  291. +18 10 src/library/scala/collection/immutable/Vector.scala
  292. +2 2 src/library/scala/collection/mutable/ArrayOps.scala
  293. +1 1  src/library/scala/collection/mutable/ArrayStack.scala
  294. +2 2 src/library/scala/collection/mutable/Buffer.scala
  295. +1 1  src/library/scala/collection/mutable/BufferLike.scala
  296. +1 4 src/library/scala/collection/mutable/Cloneable.scala
  297. +20 1 src/library/scala/collection/mutable/LinkedHashMap.scala
  298. +1 1  src/library/scala/collection/mutable/PriorityQueue.scala
  299. +0 1  src/library/scala/collection/mutable/Queue.scala
  300. +0 1  src/library/scala/collection/mutable/Stack.scala
  301. +35 2 src/library/scala/collection/parallel/ParIterableLike.scala
Sorry, we could not display the entire diff because it was too big.
4 META-INF/MANIFEST.MF
@@ -40,9 +40,13 @@ Export-Package:
40 40 scala.tools.nsc.util,
41 41 scala.tools.util,
42 42 scala.reflect.internal,
  43 + scala.reflect.internal.pickling,
43 44 scala.reflect.internal.settings,
  45 + scala.reflect.internal.util,
  46 + scala.reflect.makro,
44 47 scala.reflect.runtime,
45 48 scala.reflect.internal.transform,
  49 + scala.reflect.api,
46 50 ch.epfl.lamp.compiler.msil,
47 51 ch.epfl.lamp.compiler.msil.emit,
48 52 ch.epfl.lamp.compiler.msil.util,
388 build.xml
@@ -55,6 +55,18 @@ END-USER TARGETS
55 55 </antcall>
56 56 </target>
57 57
  58 +
  59 + <target name="partialdist" depends="dist.partial"
  60 + description="Makes a new distribution without documentation, so just for testing."/>
  61 +
  62 + <target name="partialdist-opt"
  63 + description="Makes a new optimised distribution without testing it or removing partially build elements.">
  64 + <antcall target="partialdist">
  65 + <param name="scalac.args.optimise" value="-optimise"/>
  66 + </antcall>
  67 + </target>
  68 +
  69 +
58 70 <target name="fastdist" depends="dist.done"
59 71 description="Makes a new distribution without testing it or removing partially build elements."/>
60 72
@@ -104,6 +116,12 @@ END-USER TARGETS
104 116 <antcall target="test.done"/>
105 117 </target>
106 118
  119 + <target name="replacestarrwin-opt"
  120 + description="Creates a new Starr on Windows. Manually execute 'ant locker.clean build' first!">
  121 + <antcall target="replacestarrwin">
  122 + <param name="scalac.args.optimise" value="-optimise"/>
  123 + </antcall>
  124 + </target>
107 125 <target name="replacelocker"
108 126 description="Replaces the Locker compiler and library by fresh ones built from current sources.">
109 127 <antcall target="palo.clean"/>
@@ -123,10 +141,30 @@ END-USER TARGETS
123 141 <antcall target="palo.done"/>
124 142 </target>
125 143
126   - <target name="fastlocker"
  144 + <target name="fastlocker.lib"
  145 + description="Buildlocker without extra fuss">
  146 + <property name="fastlocker" value="true"/>
  147 + <antcall target="locker.unlock"/>
  148 + <antcall target="locker.lib"/>
  149 + </target>
  150 +
  151 + <target name="fastlocker.reflect"
  152 + description="Buildlocker without extra fuss">
  153 + <property name="fastlocker" value="true"/>
  154 + <antcall target="locker.unlock"/>
  155 + <antcall target="locker.reflect"/>
  156 + </target>
  157 +
  158 + <target name="fastlocker.comp"
127 159 description="Buildlocker without extra fuss">
  160 + <property name="fastlocker" value="true"/>
128 161 <antcall target="locker.unlock"/>
129   - <antcall target="locker.done"/>
  162 + <antcall target="locker.comp"/>
  163 + </target>
  164 +
  165 + <target name="fastlocker"
  166 + description="Buildlocker without extra fuss">
  167 + <antcall target="fastlocker.comp"/>
130 168 </target>
131 169
132 170 <target name="buildlocker"
@@ -242,7 +280,7 @@ INITIALISATION
242 280 <!-- Resolve maven dependencies -->
243 281 <target name="init.maven.jars" depends="init.maven.tasks">
244 282 <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset">
245   - <dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/>
  283 + <!--<dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/>-->
246 284 </artifact:dependencies>
247 285 </target>
248 286
@@ -334,17 +372,32 @@ INITIALISATION
334 372 <target name="init.version.done" depends="init.version.release, init.version.snapshot"/>
335 373
336 374 <target name="init.testjava6">
337   - <fail message="This build requires JDK 1.6">
338   - <condition>
339   - <not>
  375 + <condition property="has.java6">
340 376 <equals arg1="${ant.java.version}" arg2="1.6"/>
341   - </not>
342 377 </condition>
343   - </fail>
  378 + <condition property="has.java7">
  379 + <equals arg1="${ant.java.version}" arg2="1.7"/>
  380 + </condition>
  381 + <condition property="has.unsupported.jdk">
  382 + <not><or>
  383 + <isset property="has.java7" />
  384 + <isset property="has.java6" />
  385 + </or></not>
  386 + </condition>
  387 + </target>
  388 +
  389 + <target name="init.fail.bad.jdk" depends="init.testjava6">
  390 + <fail if="has.unsupported.jdk"
  391 + message="JDK ${ant.java.version} is not supported by this build!"/>
  392 + </target>
  393 + <target name="init.warn.jdk7" depends="init.testjava6" if="has.java7">
  394 + <echo level="warning"> You are using JDK7 for this build. While this will be able to build most of Scala, it will
  395 + not build the Swing project. You will be unable to create a distribution.
  396 + </echo>
344 397 </target>
345 398
346   - <target name="init" depends="init.jars, init.maven.jars, init.version.done">
347   - <property name="scalac.args.always" value="" />
  399 + <target name="init" depends="init.jars, init.maven.jars, init.version.done, init.fail.bad.jdk, init.warn.jdk7">
  400 + <property name="scalac.args.always" value="-Yreify-copypaste" />
348 401 <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
349 402 <property name="scalac.args.optimise" value=""/>
350 403 <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.)
@@ -446,7 +499,7 @@ LOCAL DEPENDENCY (Adapted ASM)
446 499 destdir="${build-asm.dir}/classes"
447 500 classpath="${build-asm.dir}/classes"
448 501 includes="**/*.java"
449   - target="1.5" source="1.5">
  502 + target="1.6" source="1.5">
450 503 <compilerarg line="${javac.args} -XDignore.symbol.file"/>
451 504 </javac>
452 505 <touch file="${build-asm.dir}/asm.complete" verbose="no"/>
@@ -467,7 +520,7 @@ LOCAL DEPENDENCY (Adapted ASM)
467 520 <!-- ===========================================================================
468 521 LOCAL DEPENDENCY (FORKJOIN)
469 522 ============================================================================ -->
470   - <target name="forkjoin.start" depends="init, init.testjava6">
  523 + <target name="forkjoin.start" depends="init">
471 524 <uptodate property="forkjoin.available" targetfile="${build-libs.dir}/forkjoin.complete">
472 525 <srcfiles dir="${src.dir}/forkjoin">
473 526 <include name="**/*.java"/>
@@ -477,6 +530,7 @@ LOCAL DEPENDENCY (FORKJOIN)
477 530 </target>
478 531
479 532 <target name="forkjoin.lib" depends="forkjoin.start" unless="forkjoin.available">
  533 + <stopwatch name="forkjoin.lib.timer"/>
480 534 <mkdir dir="${build-libs.dir}/classes/forkjoin"/>
481 535 <javac
482 536 fork="yes"
@@ -486,10 +540,11 @@ LOCAL DEPENDENCY (FORKJOIN)
486 540 classpath="${build-libs.dir}/classes/forkjoin"
487 541 includes="**/*.java"
488 542 debug="true"
489   - target="1.5" source="1.5">
  543 + target="1.6" source="1.5">
490 544 <compilerarg line="${javac.args} -XDignore.symbol.file"/>
491 545 </javac>
492 546 <touch file="${build-libs.dir}/forkjoin.complete" verbose="no"/>
  547 + <stopwatch name="forkjoin.lib.timer" action="total"/>
493 548 </target>
494 549
495 550 <target name="forkjoin.pack" depends="forkjoin.lib">
@@ -524,6 +579,7 @@ LOCAL DEPENDENCY (FJBG)
524 579 </target>
525 580
526 581 <target name="fjbg.lib" depends="fjbg.init" unless="fjbg.available">
  582 + <stopwatch name="fjbg.lib.timer" />
527 583 <mkdir dir="${build-libs.dir}/classes/fjbg"/>
528 584 <javac
529 585 srcdir="${src.dir}/fjbg"
@@ -531,10 +587,11 @@ LOCAL DEPENDENCY (FJBG)
531 587 classpath="${build-libs.dir}/classes/fjbg"
532 588 includes="**/*.java"
533 589 debug="true"
534   - target="1.5" source="1.4">
  590 + target="1.6" source="1.4">
535 591 <compilerarg line="${javac.args} -XDignore.symbol.file"/>
536 592 </javac>
537 593 <touch file="${build-libs.dir}/fjbg.complete" verbose="no"/>
  594 + <stopwatch name="fjbg.lib.timer" action="total"/>
538 595 </target>
539 596
540 597 <target name="fjbg.pack" depends="fjbg.lib">
@@ -578,7 +635,7 @@ LOCAL REFERENCE BUILD (LOCKER)
578 635 srcdir="${src.dir}/library"
579 636 destdir="${build-locker.dir}/classes/library"
580 637 includes="**/*.java"
581   - target="1.5" source="1.5">
  638 + target="1.6" source="1.5">
582 639 <compilerarg line="${javac.args} -XDignore.symbol.file"/>
583 640 <classpath>
584 641 <path refid="forkjoin.classpath"/>
@@ -677,33 +734,43 @@ LOCAL REFERENCE BUILD (LOCKER)
677 734 <target name="locker.comp" depends="locker.pre-comp" if="locker.comp.needed">
678 735 <stopwatch name="locker.comp.timer"/>
679 736 <mkdir dir="${build-locker.dir}/classes/compiler"/>
680   - <!-- Compile MSIL inside of locker.... -->
681   - <javac
682   - srcdir="${src.dir}/msil"
683   - destdir="${build-locker.dir}/classes/compiler"
684   - classpath="${build-locker.dir}/classes/compiler"
685   - includes="**/*.java"
686   - excludes="**/tests/**"
687   - debug="true"
688   - target="1.5" source="1.4">
689   - <compilerarg line="${javac.args}"/>
690   - </javac>
691   - <scalacfork
692   - destdir="${build-locker.dir}/classes/compiler"
693   - compilerpathref="starr.classpath"
694   - params="${scalac.args.all}"
695   - srcdir="${src.dir}/msil"
696   - jvmargs="${scalacfork.jvmargs}">
697   - <include name="**/*.scala"/>
698   - <compilationpath>
699   - <pathelement location="${build-locker.dir}/classes/library"/>
700   - <pathelement location="${build-locker.dir}/classes/reflect"/>
701   - <pathelement location="${build-locker.dir}/classes/compiler"/>
702   - <path refid="fjbg.classpath"/>
703   - <path refid="aux.libs"/>
704   - <pathelement location="${jline.jar}"/>
705   - </compilationpath>
706   - </scalacfork>
  737 + <if>
  738 + <equals arg1="${fastlocker}" arg2="true" />
  739 + <then>
  740 + <!-- Fastlocker build: don't compile MSIL, use its starr version.... -->
  741 + <property name="locker.comp.msil" value="${msil.starr.jar}"/>
  742 + </then>
  743 + <else>
  744 + <!-- Regular build: Compile MSIL inside of locker.... -->
  745 + <javac
  746 + srcdir="${src.dir}/msil"
  747 + destdir="${build-locker.dir}/classes/compiler"
  748 + classpath="${build-locker.dir}/classes/compiler"
  749 + includes="**/*.java"
  750 + excludes="**/tests/**"
  751 + debug="true"
  752 + target="1.6" source="1.4">
  753 + <compilerarg line="${javac.args}"/>
  754 + </javac>
  755 + <scalacfork
  756 + destdir="${build-locker.dir}/classes/compiler"
  757 + compilerpathref="starr.classpath"
  758 + params="${scalac.args.all}"
  759 + srcdir="${src.dir}/msil"
  760 + jvmargs="${scalacfork.jvmargs}">
  761 + <include name="**/*.scala"/>
  762 + <compilationpath>
  763 + <pathelement location="${build-locker.dir}/classes/library"/>
  764 + <pathelement location="${build-locker.dir}/classes/reflect"/>
  765 + <pathelement location="${build-locker.dir}/classes/compiler"/>
  766 + <path refid="fjbg.classpath"/>
  767 + <path refid="aux.libs"/>
  768 + <pathelement location="${jline.jar}"/>
  769 + </compilationpath>
  770 + </scalacfork>
  771 + <property name="locker.comp.msil" value="${build-locker.dir}/classes/compiler"/>
  772 + </else>
  773 + </if>
707 774 <scalacfork
708 775 destdir="${build-locker.dir}/classes/compiler"
709 776 compilerpathref="starr.classpath"
@@ -718,6 +785,7 @@ LOCAL REFERENCE BUILD (LOCKER)
718 785 <path refid="fjbg.classpath"/>
719 786 <path refid="aux.libs"/>
720 787 <path refid="asm.classpath"/>
  788 + <pathelement location="${locker.comp.msil}" />
721 789 <pathelement location="${jline.jar}"/>
722 790 </compilationpath>
723 791 </scalacfork>
@@ -941,7 +1009,7 @@ QUICK BUILD (QUICK)
941 1009 srcdir="${src.dir}/library"
942 1010 destdir="${build-quick.dir}/classes/library"
943 1011 includes="**/*.java"
944   - target="1.5" source="1.5">
  1012 + target="1.6" source="1.5">
945 1013 <compilerarg line="${javac.args} -XDignore.symbol.file"/>
946 1014 <classpath>
947 1015 <path refid="forkjoin.classpath"/>
@@ -952,7 +1020,7 @@ QUICK BUILD (QUICK)
952 1020 srcdir="${src.dir}/actors"
953 1021 destdir="${build-quick.dir}/classes/library"
954 1022 includes="**/*.java"
955   - target="1.5" source="1.5">
  1023 + target="1.6" source="1.5">
956 1024 <compilerarg line="${javac.args}"/>
957 1025 <classpath>
958 1026 <path refid="forkjoin.classpath"/>
@@ -978,15 +1046,6 @@ QUICK BUILD (QUICK)
978 1046 <include name="**/*.scala"/>
979 1047 <compilationpath refid="quick.compilation.path"/>
980 1048 </scalacfork>
981   - <scalacfork
982   - destdir="${build-quick.dir}/classes/library"
983   - compilerpathref="locker.classpath"
984   - params="${scalac.args.quick}"
985   - srcdir="${src.dir}/swing"
986   - jvmargs="${scalacfork.jvmargs}">
987   - <include name="**/*.scala"/>
988   - <compilationpath refid="quick.compilation.path"/>
989   - </scalacfork>
990 1049 <propertyfile file="${build-quick.dir}/classes/library/library.properties">
991 1050 <entry key="version.number" value="${version.number}"/>
992 1051 <entry key="maven.version.number" value="${maven.version.number}"/>
@@ -1001,12 +1060,26 @@ QUICK BUILD (QUICK)
1001 1060 <include name="**/*.css"/>
1002 1061 </fileset>
1003 1062 </copy>
1004   - <touch file="${build-quick.dir}/library.complete" verbose="no"/>
1005   - <stopwatch name="quick.lib.timer" action="total"/>
1006 1063 </target>
1007 1064
  1065 + <target name="quick.swing" depends="quick.lib" if="has.java6" unless="quick.lib.available">
  1066 + <scalacfork
  1067 + destdir="${build-quick.dir}/classes/library"
  1068 + compilerpathref="locker.classpath"
  1069 + params="${scalac.args.quick}"
  1070 + srcdir="${src.dir}/swing"
  1071 + jvmargs="${scalacfork.jvmargs}">
  1072 + <include name="**/*.scala"/>
  1073 + <compilationpath refid="quick.compilation.path"/>
  1074 + </scalacfork>
  1075 + </target>
  1076 +
  1077 + <target name="quick.lib.done" depends="quick.swing, quick.lib">
  1078 + <stopwatch name="quick.lib.timer" action="total"/>
  1079 + <touch file="${build-quick.dir}/library.complete" verbose="no"/>
  1080 + </target>
1008 1081
1009   - <target name="quick.pre-reflect" depends="quick.lib">
  1082 + <target name="quick.pre-reflect" depends="quick.lib.done">
1010 1083 <uptodate property="quick.reflect.available" targetfile="${build-quick.dir}/reflect.complete">
1011 1084 <srcfiles dir="${src.dir}">
1012 1085 <include name="reflect/**"/>
@@ -1072,12 +1145,12 @@ QUICK BUILD (QUICK)
1072 1145 includes="**/*.java"
1073 1146 excludes="**/tests/**"
1074 1147 debug="true"
1075   - target="1.5" source="1.4">
  1148 + target="1.6" source="1.4">
1076 1149 <compilerarg line="${javac.args}"/>
1077 1150 </javac>
1078 1151 <scalacfork
1079 1152 destdir="${build-quick.dir}/classes/compiler"
1080   - compilerpathref="starr.classpath"
  1153 + compilerpathref="locker.classpath"
1081 1154 params="${scalac.args.all}"
1082 1155 srcdir="${src.dir}/msil"
1083 1156 jvmargs="${scalacfork.jvmargs}">
@@ -1221,7 +1294,7 @@ QUICK BUILD (QUICK)
1221 1294 <scalacfork
1222 1295 destdir="${build-quick.dir}/classes/scalacheck"
1223 1296 compilerpathref="quick.classpath"
1224   - params="${scalac.args.quick}"
  1297 + params="${scalac.args.quick} -nowarn"
1225 1298 srcdir="${src.dir}/scalacheck"
1226 1299 jvmargs="${scalacfork.jvmargs}">
1227 1300 <include name="**/*.scala"/>
@@ -1264,7 +1337,7 @@ QUICK BUILD (QUICK)
1264 1337 <stopwatch name="quick.scalap.timer" action="total"/>
1265 1338 </target>
1266 1339
1267   - <target name="quick.pre-partest" depends="quick.scalap">
  1340 + <target name="quick.pre-partest" depends="quick.scalap, asm.done">
1268 1341 <uptodate property="quick.partest.available" targetfile="${build-quick.dir}/partest.complete">
1269 1342 <srcfiles dir="${src.dir}/partest"/>
1270 1343 </uptodate>
@@ -1276,13 +1349,14 @@ QUICK BUILD (QUICK)
1276 1349 <javac
1277 1350 srcdir="${src.dir}/partest"
1278 1351 destdir="${build-quick.dir}/classes/partest"
1279   - target="1.5" source="1.5">
  1352 + target="1.6" source="1.5">
1280 1353 <classpath>
1281 1354 <pathelement location="${build-quick.dir}/classes/library"/>
1282 1355 <pathelement location="${build-quick.dir}/classes/reflect"/>
1283 1356 <pathelement location="${build-quick.dir}/classes/compiler"/>
1284 1357 <pathelement location="${build-quick.dir}/classes/scalap"/>
1285 1358 <pathelement location="${build-quick.dir}/classes/partest"/>
  1359 + <path refid="asm.classpath"/>
1286 1360 </classpath>
1287 1361 <include name="**/*.java"/>
1288 1362 <compilerarg line="${javac.args}"/>
@@ -1334,6 +1408,7 @@ QUICK BUILD (QUICK)
1334 1408 <path refid="forkjoin.classpath"/>
1335 1409 <path refid="fjbg.classpath"/>
1336 1410 <path refid="aux.libs"/>
  1411 + <path refid="asm.classpath"/>
1337 1412 <pathelement location="${jline.jar}"/>
1338 1413 </path>
1339 1414 <taskdef name="quick-bin" classname="scala.tools.ant.ScalaTool" classpathref="quick.bin.classpath"/>
@@ -1412,11 +1487,6 @@ PACKED QUICK BUILD (PACK)
1412 1487 </fileset>
1413 1488 <fileset dir="${build-libs.dir}/classes/forkjoin"/>
1414 1489 </jar>
1415   - <jar destfile="${build-pack.dir}/lib/scala-swing.jar">
1416   - <fileset dir="${build-quick.dir}/classes/library">
1417   - <include name="scala/swing/**"/>
1418   - </fileset>
1419   - </jar>
1420 1490 <jar destfile="${build-pack.dir}/lib/scala-actors.jar">
1421 1491 <fileset dir="${build-quick.dir}/classes/library">
1422 1492 <include name="scala/actors/**"/>
@@ -1427,7 +1497,15 @@ PACKED QUICK BUILD (PACK)
1427 1497 </jar>
1428 1498 </target>
1429 1499
1430   - <target name="pack.pre-reflect" depends="pack.lib">
  1500 + <target name="pack.swing" depends="pack.lib" if="has.java6">
  1501 + <jar destfile="${build-pack.dir}/lib/scala-swing.jar">
  1502 + <fileset dir="${build-quick.dir}/classes/library">
  1503 + <include name="scala/swing/**"/>
  1504 + </fileset>
  1505 + </jar>
  1506 + </target>
  1507 +
  1508 + <target name="pack.pre-reflect" depends="pack.lib, pack.swing">
1431 1509 <uptodate
1432 1510 property="pack.reflect.available"
1433 1511 targetfile="${build-pack.dir}/lib/scala-reflect.jar"
@@ -1498,7 +1576,14 @@ PACKED QUICK BUILD (PACK)
1498 1576 <target name="pack.partest" depends="pack.pre-partest" unless="pack.partest.available">
1499 1577 <mkdir dir="${build-pack.dir}/lib"/>
1500 1578 <jar destfile="${build-pack.dir}/lib/scala-partest.jar">
1501   - <fileset dir="${build-quick.dir}/classes/partest"/>
  1579 + <fileset dir="${build-quick.dir}/classes/partest">
  1580 + <exclude name="scala/tools/partest/javaagent/**"/>
  1581 + </fileset>
  1582 + </jar>
  1583 + <jar destfile="${build-pack.dir}/lib/scala-partest-javaagent.jar" manifest="${src.dir}/partest/scala/tools/partest/javaagent/MANIFEST.MF">
  1584 + <fileset dir="${build-quick.dir}/classes/partest">
  1585 + <include name="scala/tools/partest/javaagent/**"/>
  1586 + </fileset>
1502 1587 </jar>
1503 1588 </target>
1504 1589
@@ -1606,7 +1691,7 @@ BOOTSTRAPPING BUILD (STRAP)
1606 1691 srcdir="${src.dir}/library"
1607 1692 destdir="${build-strap.dir}/classes/library"
1608 1693 includes="**/*.java"
1609   - target="1.5" source="1.5">
  1694 + target="1.6" source="1.5">
1610 1695 <compilerarg line="${javac.args} -XDignore.symbol.file"/>
1611 1696 <classpath>
1612 1697 <path refid="forkjoin.classpath"/>
@@ -1617,7 +1702,7 @@ BOOTSTRAPPING BUILD (STRAP)
1617 1702 srcdir="${src.dir}/actors"
1618 1703 destdir="${build-strap.dir}/classes/library"
1619 1704 includes="**/*.java"
1620   - target="1.5" source="1.5">
  1705 + target="1.6" source="1.5">
1621 1706 <compilerarg line="${javac.args}"/>
1622 1707 <classpath>
1623 1708 <path refid="forkjoin.classpath"/>
@@ -1643,15 +1728,6 @@ BOOTSTRAPPING BUILD (STRAP)
1643 1728 <include name="**/*.scala"/>
1644 1729 <compilationpath refid="strap.compilation.path"/>
1645 1730 </scalacfork>
1646   - <scalacfork
1647   - destdir="${build-strap.dir}/classes/library"
1648   - compilerpathref="pack.classpath"
1649   - params="${scalac.args.quick}"
1650   - srcdir="${src.dir}/swing"
1651   - jvmargs="${scalacfork.jvmargs}">
1652   - <include name="**/*.scala"/>
1653   - <compilationpath refid="strap.compilation.path"/>
1654   - </scalacfork>
1655 1731 <propertyfile file="${build-strap.dir}/classes/library/library.properties">
1656 1732 <entry key="version.number" value="${version.number}"/>
1657 1733 <entry key="maven.version.number" value="${maven.version.number}"/>
@@ -1666,11 +1742,26 @@ BOOTSTRAPPING BUILD (STRAP)
1666 1742 <include name="**/*.css"/>
1667 1743 </fileset>
1668 1744 </copy>
  1745 + </target>
  1746 +
  1747 + <target name="strap.swing" if="has.java6" unless="strap.lib.available" depends="strap.lib">
  1748 + <scalacfork
  1749 + destdir="${build-strap.dir}/classes/library"
  1750 + compilerpathref="pack.classpath"
  1751 + params="${scalac.args.quick}"
  1752 + srcdir="${src.dir}/swing"
  1753 + jvmargs="${scalacfork.jvmargs}">
  1754 + <include name="**/*.scala"/>
  1755 + <compilationpath refid="strap.compilation.path"/>
  1756 + </scalacfork>
  1757 + </target>
  1758 +
  1759 + <target name="strap.lib.done" depends="strap.swing, strap.lib">
1669 1760 <touch file="${build-strap.dir}/library.complete" verbose="no"/>
1670 1761 <stopwatch name="strap.lib.timer" action="total"/>
1671 1762 </target>
1672 1763
1673   - <target name="strap.pre-reflect" depends="strap.lib">
  1764 + <target name="strap.pre-reflect" depends="strap.lib.done">
1674 1765 <uptodate property="strap.reflect.available" targetfile="${build-strap.dir}/reflect.complete">
1675 1766 <srcfiles dir="${src.dir}/reflect"/>
1676 1767 </uptodate>
@@ -1735,12 +1826,12 @@ BOOTSTRAPPING BUILD (STRAP)
1735 1826 includes="**/*.java"
1736 1827 excludes="**/tests/**"
1737 1828 debug="true"
1738   - target="1.5" source="1.4">
  1829 + target="1.6" source="1.4">
1739 1830 <compilerarg line="${javac.args}"/>
1740 1831 </javac>
1741 1832 <scalacfork
1742 1833 destdir="${build-strap.dir}/classes/compiler"
1743   - compilerpathref="starr.classpath"
  1834 + compilerpathref="pack.classpath"
1744 1835 params="${scalac.args.all}"
1745 1836 srcdir="${src.dir}/msil"
1746 1837 jvmargs="${scalacfork.jvmargs}">
@@ -1851,7 +1942,7 @@ BOOTSTRAPPING BUILD (STRAP)
1851 1942 <scalacfork
1852 1943 destdir="${build-strap.dir}/classes/scalacheck"
1853 1944 compilerpathref="pack.classpath"
1854   - params="${scalac.args.quick}"
  1945 + params="${scalac.args.quick} -nowarn"
1855 1946 srcdir="${src.dir}/scalacheck"
1856 1947 jvmargs="${scalacfork.jvmargs}">
1857 1948 <include name="**/*.scala"/>
@@ -1891,7 +1982,7 @@ BOOTSTRAPPING BUILD (STRAP)
1891 1982 <stopwatch name="strap.scalap.timer" action="total"/>
1892 1983 </target>
1893 1984
1894   - <target name="strap.pre-partest" depends="strap.scalap">
  1985 + <target name="strap.pre-partest" depends="strap.scalap, asm.done">
1895 1986 <uptodate property="strap.partest.available" targetfile="${build-strap.dir}/partest.complete">
1896 1987 <srcfiles dir="${src.dir}/partest"/>
1897 1988 </uptodate>
@@ -1903,13 +1994,14 @@ BOOTSTRAPPING BUILD (STRAP)
1903 1994 <javac
1904 1995 srcdir="${src.dir}/partest"
1905 1996 destdir="${build-strap.dir}/classes/partest"
1906   - target="1.5" source="1.5">
  1997 + target="1.6" source="1.5">
1907 1998 <classpath>
1908 1999 <pathelement location="${build-strap.dir}/classes/library"/>
1909 2000 <pathelement location="${build-strap.dir}/classes/reflect"/>
1910 2001 <pathelement location="${build-strap.dir}/classes/compiler"/>
1911 2002 <pathelement location="${build-strap.dir}/classes/scalap"/>
1912 2003 <pathelement location="${build-strap.dir}/classes/partest"/>
  2004 + <path refid="asm.classpath"/>
1913 2005 </classpath>
1914 2006 <include name="**/*.java"/>
1915 2007 <compilerarg line="${javac.args}"/>
@@ -1929,6 +2021,7 @@ BOOTSTRAPPING BUILD (STRAP)
1929 2021 <pathelement location="${build-strap.dir}/classes/partest"/>
1930 2022 <pathelement location="${ant.jar}"/>
1931 2023 <path refid="forkjoin.classpath"/>
  2024 + <path refid="asm.classpath"/>
1932 2025 <pathelement location="${scalacheck.jar}"/>
1933 2026 </compilationpath>
1934 2027 </scalacfork>
@@ -1951,7 +2044,7 @@ BOOTSTRAPPING BUILD (STRAP)
1951 2044 LIBRARIES (Forkjoin, FJBG, ASM)
1952 2045 ============================================================================ -->
1953 2046
1954   -
  2047 +
1955 2048 <target name="libs.clean" depends="pack.clean, asm.clean">
1956 2049 <delete dir="${build-libs.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
1957 2050 </target>
@@ -1988,6 +2081,10 @@ DOCUMENTATION
1988 2081 <!-- Compute the URL and show it -->
1989 2082 <property name="scaladoc.url" value="https://github.com/scala/scala/tree/${scaladoc.git.commit}/src"/>
1990 2083 <echo message="Scaladoc will point to ${scaladoc.url} for source files."/>
  2084 +
  2085 + <!-- Unless set with -Dscaladoc.<...>, these won't be activated -->
  2086 + <property name="scaladoc.raw.output" value="no"/>
  2087 + <property name="scaladoc.no.prefixes" value="no"/>
1991 2088 </target>
1992 2089
1993 2090 <target name="docs.pre-lib" depends="docs.start">
@@ -2015,7 +2112,11 @@ DOCUMENTATION
2015 2112 classpathref="pack.classpath"
2016 2113 addparams="${scalac.args.all}"
2017 2114 docRootContent="${src.dir}/library/rootdoc.txt"
2018   - implicits="on" diagrams="on">
  2115 + implicits="on"
  2116 + diagrams="on"
  2117 + groups="on"
  2118 + rawOutput="${scaladoc.raw.output}"
  2119 + noPrefixes="${scaladoc.no.prefixes}">
2019 2120 <src>
2020 2121 <files includes="${src.dir}/actors-migration"/>
2021 2122 <files includes="${src.dir}/actors"/>
@@ -2099,7 +2200,11 @@ DOCUMENTATION
2099 2200 srcdir="${src.dir}/compiler"
2100 2201 docRootContent="${src.dir}/compiler/rootdoc.txt"
2101 2202 addparams="${scalac.args.all}"
2102   - implicits="on" diagrams="on">
  2203 + implicits="on"
  2204 + diagrams="on"
  2205 + groups="on"
  2206 + rawOutput="${scaladoc.raw.output}"
  2207 + noPrefixes="${scaladoc.no.prefixes}">
2103 2208 <include name="**/*.scala"/>
2104 2209 </scaladoc>
2105 2210 <touch file="${build-docs.dir}/compiler.complete" verbose="no"/>
@@ -2121,7 +2226,11 @@ DOCUMENTATION
2121 2226 classpathref="pack.classpath"
2122 2227 srcdir="${src.dir}/jline/src/main/java"
2123 2228 addparams="${scalac.args.all}"
2124   - implicits="on" diagrams="on">
  2229 + implicits="on"
  2230 + diagrams="on"
  2231 + groups="on"
  2232 + rawOutput="${scaladoc.raw.output}"
  2233 + noPrefixes="${scaladoc.no.prefixes}">
2125 2234 <include name="**/*.scala"/>
2126 2235 <include name="**/*.java"/>
2127 2236 </scaladoc>
@@ -2145,7 +2254,11 @@ DOCUMENTATION
2145 2254 classpathref="pack.classpath"
2146 2255 srcdir="${src.dir}/scalap"
2147 2256 addparams="${scalac.args.all}"
2148   - implicits="on" diagrams="on">
  2257 + implicits="on"
  2258 + diagrams="on"
  2259 + groups="on"
  2260 + rawOutput="${scaladoc.raw.output}"
  2261 + noPrefixes="${scaladoc.no.prefixes}">
2149 2262 <include name="**/*.scala"/>
2150 2263 </scaladoc>
2151 2264 <touch file="${build-docs.dir}/scalap.complete" verbose="no"/>
@@ -2167,7 +2280,11 @@ DOCUMENTATION
2167 2280 classpathref="pack.classpath"
2168 2281 srcdir="${src.dir}/partest"
2169 2282 addparams="${scalac.args.all}"
2170   - implicits="on" diagrams="on">
  2283 + implicits="on"
  2284 + diagrams="on"
  2285 + groups="on"
  2286 + rawOutput="${scaladoc.raw.output}"
  2287 + noPrefixes="${scaladoc.no.prefixes}">
2171 2288 <include name="**/*.scala"/>
2172 2289 </scaladoc>
2173 2290 <touch file="${build-docs.dir}/partest.complete" verbose="no"/>
@@ -2189,7 +2306,11 @@ DOCUMENTATION
2189 2306 classpathref="pack.classpath"
2190 2307 srcdir="${src.dir}/continuations/plugin"
2191 2308 addparams="${scalac.args.all}"
2192   - implicits="on" diagrams="on">
  2309 + implicits="on"
  2310 + diagrams="on"
  2311 + groups="on"
  2312 + rawOutput="${scaladoc.raw.output}"
  2313 + noPrefixes="${scaladoc.no.prefixes}">
2193 2314 <include name="**/*.scala"/>
2194 2315 </scaladoc>
2195 2316 <touch file="${build-docs.dir}/continuations-plugin.complete" verbose="no"/>
@@ -2211,7 +2332,11 @@ DOCUMENTATION
2211 2332 classpathref="pack.classpath"
2212 2333 srcdir="${src.dir}/actors-migration"
2213 2334 addparams="${scalac.args.all}"
2214   - implicits="on" diagrams="on">
  2335 + implicits="on"
  2336 + diagrams="on"
  2337 + groups="on"
  2338 + rawOutput="${scaladoc.raw.output}"
  2339 + noPrefixes="${scaladoc.no.prefixes}">
2215 2340 <include name="**/*.scala"/>
2216 2341 </scaladoc>
2217 2342 <touch file="${build-docs.dir}/actors-migration.complete" verbose="no"/>
@@ -2307,6 +2432,9 @@ BOOTRAPING TEST AND TEST SUITE
2307 2432 <specializedtests dir="${partest.dir}/${partest.srcdir}/specialized">
2308 2433 <include name="*.scala"/>
2309 2434 </specializedtests>
  2435 + <instrumentedtests dir="${partest.dir}/${partest.srcdir}/instrumented">
  2436 + <include name="*.scala"/>
  2437 + </instrumentedtests>
2310 2438 <presentationtests dir="${partest.dir}/${partest.srcdir}/presentation">
2311 2439 <include name="*/*.scala"/>
2312 2440 </presentationtests>
@@ -2348,7 +2476,7 @@ BOOTRAPING TEST AND TEST SUITE
2348 2476 DISTRIBUTION
2349 2477 ============================================================================ -->
2350 2478
2351   - <target name="dist.start" depends="docs.done, pack.done">
  2479 + <target name="dist.start" depends="pack.done">
2352 2480 <property name="dist.name" value="scala-${version.number}"/>
2353 2481 <property name="dist.dir" value="${dists.dir}/${dist.name}"/>
2354 2482 </target>
@@ -2373,7 +2501,7 @@ DISTRIBUTION
2373 2501 </copy>
2374 2502 </target>
2375 2503
2376   - <target name="dist.doc" depends="dist.base">
  2504 + <target name="dist.doc" depends="dist.base, docs.done">
2377 2505 <mkdir dir="${dist.dir}/doc/scala-devel-docs"/>
2378 2506 <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc"/>
2379 2507 <copy file="${docs.dir}/README" toDir="${dist.dir}/doc"/>
@@ -2432,11 +2560,11 @@ DISTRIBUTION
2432 2560 </jar>
2433 2561 </target>
2434 2562
2435   - <target name="dist.latest.unix" depends="dist.src" unless="os.win">
  2563 + <target name="dist.latest.unix" depends="dist.base" unless="os.win">
2436 2564 <symlink link="${dists.dir}/latest" resource="${dist.name}" overwrite="yes"/>
2437 2565 </target>
2438 2566
2439   - <target name="dist.latest.win" depends="dist.src" if="os.win">
  2567 + <target name="dist.latest.win" depends="dist.base" if="os.win">
2440 2568 <copy todir="${dists.dir}/latest">
2441 2569 <fileset dir="${dist.dir}"/>
2442 2570 </copy>
@@ -2444,7 +2572,9 @@ DISTRIBUTION
2444 2572
2445 2573 <target name="dist.latest" depends="dist.latest.unix,dist.latest.win"/>
2446 2574
2447   - <target name="dist.done" depends="dist.latest"/>
  2575 + <target name="dist.partial" depends="dist.base, dist.latest"/>
  2576 +
  2577 + <target name="dist.done" depends="dist.latest, dist.src"/>
2448 2578
2449 2579 <target name="dist.clean">
2450 2580 <delete dir="${dists.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
@@ -2483,53 +2613,39 @@ STABLE REFERENCE (STARR)
2483 2613 <delete file="${basedir}/lib/scala-reflect.jar"/>
2484 2614 <delete file="${basedir}/lib/scala-compiler.jar"/>
2485 2615 <delete file="${basedir}/lib/scala-library-src.jar"/>
  2616 + <delete file="${basedir}/lib/scala-reflect-src.jar"/>
  2617 + <delete file="${basedir}/lib/scala-compiler-src.jar"/>
2486 2618 </target>
2487 2619
2488   - <target name="starr.lib" depends="starr.start">
2489   - <jar destfile="${basedir}/lib/scala-library.jar">
2490   - <fileset dir="${basedir}/build/quick/classes/library"/>
2491   - </jar>
2492   - </target>
2493   -
2494   - <target name="starr.reflect" depends="starr.lib">
2495   - <jar destfile="${basedir}/lib/scala-reflect.jar">
2496   - <fileset dir="${basedir}/build/quick/classes/reflect"/>
2497   - </jar>
2498   - </target>
2499   -
2500   - <target name="starr.comp" depends="starr.reflect">
2501   - <jar destfile="${basedir}/lib/scala-compiler.jar">
2502   - <fileset dir="${basedir}/build/quick/classes/compiler"/>
2503   - </jar>
  2620 + <target name="starr.jars" depends="starr.start">
  2621 + <copy toDir="${basedir}/lib/" overwrite="yes">
  2622 + <fileset dir="${build-pack.dir}/lib">
  2623 + <include name="scala-library.jar"/>
  2624 + <include name="scala-reflect.jar"/>
  2625 + <include name="scala-compiler.jar"/>
  2626 + </fileset>
  2627 + </copy>
2504 2628 </target>
2505 2629
2506   - <target name="starr.src" depends="starr.comp">
  2630 + <target name="starr.src" depends="starr.jars">
2507 2631 <jar destfile="${basedir}/lib/scala-library-src.jar">
2508 2632 <fileset dir="${basedir}/src/library"/>
2509 2633 <fileset dir="${basedir}/src/swing"/>
2510 2634 <fileset dir="${basedir}/src/actors"/>
  2635 + <fileset dir="${basedir}/src/forkjoin"/>
  2636 + </jar>
  2637 + <jar destfile="${basedir}/lib/scala-reflect-src.jar">
  2638 + <fileset dir="${basedir}/src/reflect"/>
  2639 + </jar>
  2640 + <jar destfile="${basedir}/lib/scala-compiler-src.jar">
  2641 + <fileset dir="${basedir}/src/compiler"/>
  2642 + <fileset dir="${basedir}/src/asm"/>
  2643 + <fileset dir="${basedir}/src/fjbg"/>
  2644 + <fileset dir="${basedir}/src/msil"/>
2511 2645 </jar>
2512 2646 </target>
2513 2647
2514   - <target name="starr.libs" depends="starr.src, forkjoin.done, fjbg.done">
2515   - <!-- TODO - Do we even *need* this in starr? -->
2516   - <copy toDir="${lib.dir}" overwrite="yes">
2517   - <fileset dir="${build-libs.dir}">
2518   - <include name="fjbg.jar"/>
2519   - <include name="forkjoin.jar"/>
2520   - </fileset>
2521   - </copy>
2522   - <!-- remove SHA1 files for no starr, so we don't loose artifacts. -->
2523   - <delete>
2524   - <fileset dir="${lib.dir}">
2525   - <include name="fjbg.jar.desired.sha1"/>
2526   - <include name="msil.jar.desired.sha1"/>
2527   - <include name="forkjoin.jar.desired.sha1"/>
2528   - </fileset>
2529   - </delete>
2530   - </target>
2531   -
2532   - <target name="starr.removesha1" depends="starr.libs">
  2648 + <target name="starr.removesha1" depends="starr.src">
2533 2649 <!-- remove SHA1 files for no starr, so we don't loose artifacts. -->
2534 2650 <delete>
2535 2651 <fileset dir="${lib.dir}">
@@ -2537,11 +2653,13 @@ STABLE REFERENCE (STARR)
2537 2653 <include name="scala-reflect.jar.desired.sha1"/>
2538 2654 <include name="scala-library.jar.desired.sha1"/>
2539 2655 <include name="scala-library-src.jar.desired.sha1"/>
  2656 + <include name="scala-reflect-src.jar.desired.sha1"/>
  2657 + <include name="scala-compiler-src.jar.desired.sha1"/>
2540 2658 </fileset>
2541 2659 </delete>
2542 2660 </target>
2543 2661
2544   - <target name="starr.done" depends="starr.libs, starr.removesha1"/>
  2662 + <target name="starr.done" depends="starr.jars, starr.removesha1"/>
2545 2663
2546 2664 <!-- ===========================================================================
2547 2665 FORWARDED TARGETS FOR PACKAGING
12 classpath.SAMPLE
... ... @@ -1,12 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<classpath>
3   - <classpathentry kind="src" path="src/compiler"/>
4   - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
5   - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6   - <classpathentry kind="lib" path="lib/msil.jar"/>
7   - <classpathentry kind="lib" path="lib/jline.jar"/>
8   - <classpathentry kind="lib" path="lib/fjbg.jar"/>
9   - <classpathentry kind="lib" path="lib/forkjoin.jar"/>
10   - <classpathentry kind="lib" path="lib/ant/ant.jar"/>
11   - <classpathentry kind="output" path="build/quick/classes/compiler"/>
12   -</classpath>
2  lib/ant/ant-contrib.jar.desired.sha1
... ... @@ -1 +1 @@
1   -943cd5c8802b2a3a64a010efb86ec19bac142e40 ?ant-contrib.jar
  1 +943cd5c8802b2a3a64a010efb86ec19bac142e40 *ant-contrib.jar
2  lib/ant/ant-dotnet-1.0.jar.desired.sha1
... ... @@ -1 +1 @@
1   -3fc1e35ca8c991fc3488548f7a276bd9053c179d ?ant-dotnet-1.0.jar
  1 +3fc1e35ca8c991fc3488548f7a276bd9053c179d *ant-dotnet-1.0.jar
2  lib/ant/ant.jar.desired.sha1
... ... @@ -1 +1 @@
1   -7b456ca6b93900f96e58cc8371f03d90a9c1c8d1 ?ant.jar
  1 +7b456ca6b93900f96e58cc8371f03d90a9c1c8d1 *ant.jar
2  lib/ant/maven-ant-tasks-2.1.1.jar.desired.sha1
... ... @@ -1 +1 @@
1   -7e50e3e227d834695f1e0bf018a7326e06ee4c86 ?maven-ant-tasks-2.1.1.jar
  1 +7e50e3e227d834695f1e0bf018a7326e06ee4c86 *maven-ant-tasks-2.1.1.jar
2  lib/ant/vizant.jar.desired.sha1
... ... @@ -1 +1 @@
1   -2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b ?vizant.jar
  1 +2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b *vizant.jar
2  lib/fjbg.jar.desired.sha1
... ... @@ -1 +1 @@
1   -c3f9b576c91cb9761932ad936ccc4a71f33d2ef2 ?fjbg.jar
  1 +8acc87f222210b4a5eb2675477602fc1759e7684 *fjbg.jar
2  lib/forkjoin.jar.desired.sha1
... ... @@ -1 +1 @@
1   -b5baf94dff8d3ca991d44a59add7bcbf6640379b ?forkjoin.jar
  1 +f93a2525b5616d3a4bee7848fabbb2856b56f653 *forkjoin.jar
2  lib/jline.jar.desired.sha1
... ... @@ -1 +1 @@
1   -a5261e70728c1847639e2b47d953441d0b217bcb ?jline.jar
  1 +a5261e70728c1847639e2b47d953441d0b217bcb *jline.jar
2  lib/msil.jar.desired.sha1
... ... @@ -1 +1 @@
1   -d48cb950ceded82a5e0ffae8ef2c68d0923ed00c ?msil.jar
  1 +d48cb950ceded82a5e0ffae8ef2c68d0923ed00c *msil.jar
1  lib/scala-compiler-src.jar.desired.sha1
... ... @@ -0,0 +1 @@
  1 +67257bb7ce010e2ceac800d737e202cfbfc2a1f6 ?scala-compiler-src.jar
2  lib/scala-compiler.jar.desired.sha1
... ... @@ -1 +1 @@
1   -a6cc9171d15cc36297bf2a93d8bd0bcc7c601eaa ?scala-compiler.jar
  1 +c52277de9e76187f34a5ae073e5d2aacc592ac50 ?scala-compiler.jar
2  lib/scala-library-src.jar.desired.sha1
... ... @@ -1 +1 @@
1   -7db4c7523f0e268ce58de2ab4ae6a3dd0e903f43 ?scala-library-src.jar
  1 +40b9c97e0c3abea4c460b73ca178f60a3bfea242 ?scala-library-src.jar
2  lib/scala-library.jar.desired.sha1
... ... @@ -1 +1 @@
1   -81f424c3b2d8ba2c061d65003b90096e83efddf4 ?scala-library.jar
  1 +0a8e0e39e1e6713323a2e659aab743ccfa57c071 ?scala-library.jar
1  lib/scala-reflect-src.jar.desired.sha1
... ... @@ -0,0 +1 @@
  1 +d1abf389fbf5dfc95889a181d28f94a6779c6165 ?scala-reflect-src.jar
2  lib/scala-reflect.jar.desired.sha1
... ... @@ -1 +1 @@
1   -3749c7d17e1f85b27d962dac524db57584e78c45 ?scala-reflect.jar
  1 +02b44e860b9b9abd1353bbaa1004b3f0004dd0b3 ?scala-reflect.jar
280 project/Build.scala
... ... @@ -1,12 +1,11 @@
1 1 import sbt._
2 2 import Keys._
3 3 import partest._
4   -import SameTest._
5 4 import ScalaBuildKeys._
  5 +import Release._
6 6
7 7
8   -
9   -object ScalaBuild extends Build with Layers {
  8 +object ScalaBuild extends Build with Layers with Packaging with Testing {
10 9
11 10 // Build wide settings:
12 11 override lazy val settings = super.settings ++ Versions.settings ++ Seq(
@@ -21,36 +20,13 @@ object ScalaBuild extends Build with Layers {
21 20 ),
22 21 organization := "org.scala-lang",
23 22 version <<= Versions.mavenVersion,
24   - pomExtra := epflPomExtra,
25   - commands += Command.command("fix-uri-projects") { (state: State) =>
26   - if(state.get(buildFixed) getOrElse false) state
27   - else {
28   - // TODO -fix up scalacheck's dependencies!
29   - val extracted = Project.extract(state)
30   - import extracted._
31   - def fix(s: Setting[_]): Setting[_] = s match {
32   - case ScopedExternalSetting(`scalacheck`, scalaInstance.key, setting) => fullQuickScalaReference mapKey Project.mapScope(_ => s.key.scope)
33   - case s => s
34   - }
35   - val transformed = session.mergeSettings map ( s => fix(s) )
36   - val scopes = transformed collect { case ScopedExternalSetting(`scalacheck`, _, s) => s.key.scope } toSet
37   - // Create some fixers so we don't download scala or rely on it.
38   - val fixers = for { scope <- scopes
39   - setting <- Seq(autoScalaLibrary := false, crossPaths := false)
40   - } yield setting mapKey Project.mapScope(_ => scope)
41   - val newStructure = Load.reapply(transformed ++ fixers, structure)
42   - Project.setProject(session, newStructure, state).put(buildFixed, true)
43   - }
44   - },
45   - onLoad in Global <<= (onLoad in Global) apply (_ andThen { (state: State) =>
46   - "fix-uri-projects" :: state
47   - })
48   - )
  23 + pomExtra := epflPomExtra
  24 + )
49 25
50 26 // Collections of projects to run 'compile' on.
51   - lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin, fjbg)
  27 + lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, actorsMigration, swing, forkjoin, fjbg)
52 28 // Collection of projects to 'package' and 'publish' together.
53   - lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, continuationsPlugin, jline, scalap)
  29 + lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, actors, actorsMigration, continuationsPlugin, jline, scalap)
54 30 lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite)
55 31
56 32 private def epflPomExtra = (
@@ -110,7 +86,6 @@ object ScalaBuild extends Build with Layers {
110 86 },
111 87 // TODO - Make exported products == makeDist so we can use this when creating a *real* distribution.
112 88 commands += Release.pushStarr
113   - //commands += Release.setStarrHome
114 89 )
115 90 // Note: Root project is determined by lowest-alphabetical project that has baseDirectory as file("."). we use aaa_ to 'win'.
116 91 lazy val aaa_root = Project("scala", file(".")) settings(projectSettings: _*) settings(ShaResolve.settings: _*)
@@ -123,6 +98,11 @@ object ScalaBuild extends Build with Layers {
123 98 )
124 99 )
125 100
  101 + def fixArtifactSrc(dir: File, name: String) = name match {
  102 + case x if x startsWith "scala-" => dir / "src" / (name drop 6)
  103 + case x => dir / "src" / name
  104 + }
  105 +
126