diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-09 11:54:40 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-09 11:54:40 -0700 |
| commit | 414318927dcdf1d151643da0940bf5bb0d8368f3 (patch) | |
| tree | d9d249751b32ad12d41336835e1d52642a33ad09 | |
| parent | 72863241ead712ace45071a21b84288959f6ce53 (diff) | |
| parent | a07879dbc643f362ed86fe764f6386f160d75aaa (diff) | |
| download | scala-414318927dcdf1d151643da0940bf5bb0d8368f3.tar.gz scala-414318927dcdf1d151643da0940bf5bb0d8368f3.tar.bz2 scala-414318927dcdf1d151643da0940bf5bb0d8368f3.zip | |
Merge pull request #2704 from adriaanm/modularize
Separate jars for XML, Parser Combinators. Use released JLine.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | build.xml | 144 | ||||
| -rw-r--r-- | dbuild-meta.json | 250 | ||||
| -rw-r--r-- | lib/jline.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | src/build/bnd/scala-compiler.bnd | 2 | ||||
| -rw-r--r-- | src/build/bnd/scala-parser-combinators.bnd | 5 | ||||
| -rw-r--r-- | src/build/bnd/scala-xml.bnd | 5 | ||||
| -rw-r--r-- | src/build/dbuild-meta-json-gen.scala | 63 | ||||
| -rw-r--r-- | src/build/maven/jline-pom.xml | 68 | ||||
| -rw-r--r-- | src/build/maven/maven-deploy.xml | 320 | ||||
| -rw-r--r-- | src/build/maven/plugins/continuations-pom.xml (renamed from src/build/maven/continuations-plugin-pom.xml) | 0 | ||||
| -rw-r--r-- | src/build/maven/scala-compiler-pom.xml | 56 | ||||
| -rw-r--r-- | src/build/maven/scala-library-pom.xml | 5 | ||||
| -rw-r--r-- | src/build/maven/scala-parser-combinators-pom.xml | 59 | ||||
| -rw-r--r-- | src/build/maven/scala-xml-pom.xml (renamed from src/build/maven/scala-dotnet-library-pom.xml) | 40 | ||||
| -rw-r--r-- | src/build/pack.xml | 27 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 21 | ||||
| -rw-r--r-- | src/eclipse/continuations-library/.classpath | 2 | ||||
| -rw-r--r-- | src/eclipse/continuations-library/.project | 2 | ||||
| -rw-r--r-- | src/eclipse/interactive/.classpath | 5 | ||||
| -rw-r--r-- | src/eclipse/partest/.classpath | 13 | ||||
| -rw-r--r-- | src/eclipse/reflect/.classpath | 2 | ||||
| -rw-r--r-- | src/eclipse/repl/.classpath | 15 | ||||
| -rw-r--r-- | src/eclipse/repl/.project | 64 | ||||
| -rw-r--r-- | src/eclipse/scala-compiler/.classpath | 7 | ||||
| -rw-r--r-- | src/eclipse/scala-library/.classpath | 2 | ||||
| -rw-r--r-- | src/eclipse/scala-parser-combinators/.classpath | 7 | ||||
| -rw-r--r-- | src/eclipse/scala-parser-combinators/.project | 30 | ||||
| -rw-r--r-- | src/eclipse/scala-xml/.classpath | 7 | ||||
| -rw-r--r-- | src/eclipse/scala-xml/.project | 30 | ||||
| -rw-r--r-- | src/eclipse/scaladoc/.classpath | 11 | ||||
| -rw-r--r-- | src/eclipse/scalap/.classpath | 9 | ||||
| -rw-r--r-- | src/eclipse/test-junit/.classpath | 7 | ||||
| -rw-r--r-- | src/library/scala/Predef.scala | 9 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/ImplicitConversions.scala (renamed from src/library/scala/util/parsing/combinator/ImplicitConversions.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/JavaTokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/JavaTokenParsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/PackratParsers.scala (renamed from src/library/scala/util/parsing/combinator/PackratParsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/Parsers.scala (renamed from src/library/scala/util/parsing/combinator/Parsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/RegexParsers.scala (renamed from src/library/scala/util/parsing/combinator/RegexParsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/lexical/Lexical.scala (renamed from src/library/scala/util/parsing/combinator/lexical/Lexical.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/lexical/Scanners.scala (renamed from src/library/scala/util/parsing/combinator/lexical/Scanners.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/lexical/StdLexical.scala (renamed from src/library/scala/util/parsing/combinator/lexical/StdLexical.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/syntactical/TokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/token/StdTokens.scala (renamed from src/library/scala/util/parsing/combinator/token/StdTokens.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/token/Tokens.scala (renamed from src/library/scala/util/parsing/combinator/token/Tokens.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/CharArrayReader.scala (renamed from src/library/scala/util/parsing/input/CharArrayReader.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/CharSequenceReader.scala (renamed from src/library/scala/util/parsing/input/CharSequenceReader.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/NoPosition.scala (renamed from src/library/scala/util/parsing/input/NoPosition.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/OffsetPosition.scala (renamed from src/library/scala/util/parsing/input/OffsetPosition.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/PagedSeqReader.scala (renamed from src/library/scala/util/parsing/input/PagedSeqReader.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/Position.scala (renamed from src/library/scala/util/parsing/input/Position.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/Positional.scala (renamed from src/library/scala/util/parsing/input/Positional.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/Reader.scala (renamed from src/library/scala/util/parsing/input/Reader.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/input/StreamReader.scala (renamed from src/library/scala/util/parsing/input/StreamReader.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/json/JSON.scala (renamed from src/library/scala/util/parsing/json/JSON.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/json/Lexer.scala (renamed from src/library/scala/util/parsing/json/Lexer.scala) | 0 | ||||
| -rw-r--r-- | src/parser-combinators/scala/util/parsing/json/Parser.scala (renamed from src/library/scala/util/parsing/json/Parser.scala) | 0 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 4 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala | 2 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/Delimited.scala | 2 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/JLineReader.scala | 6 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala | 5 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/session/package.scala | 8 | ||||
| -rw-r--r-- | src/xml/scala/xml/Atom.scala (renamed from src/library/scala/xml/Atom.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Attribute.scala (renamed from src/library/scala/xml/Attribute.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Comment.scala (renamed from src/library/scala/xml/Comment.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Document.scala (renamed from src/library/scala/xml/Document.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/Elem.scala (renamed from src/library/scala/xml/Elem.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/EntityRef.scala (renamed from src/library/scala/xml/EntityRef.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Equality.scala (renamed from src/library/scala/xml/Equality.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Group.scala (renamed from src/library/scala/xml/Group.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/MalformedAttributeException.scala (renamed from src/library/scala/xml/MalformedAttributeException.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/MetaData.scala (renamed from src/library/scala/xml/MetaData.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/NamespaceBinding.scala (renamed from src/library/scala/xml/NamespaceBinding.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/Node.scala (renamed from src/library/scala/xml/Node.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/NodeBuffer.scala (renamed from src/library/scala/xml/NodeBuffer.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/NodeSeq.scala (renamed from src/library/scala/xml/NodeSeq.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Null.scala (renamed from src/library/scala/xml/Null.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/PCData.scala (renamed from src/library/scala/xml/PCData.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/PrefixedAttribute.scala (renamed from src/library/scala/xml/PrefixedAttribute.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/PrettyPrinter.scala (renamed from src/library/scala/xml/PrettyPrinter.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/ProcInstr.scala (renamed from src/library/scala/xml/ProcInstr.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/QNode.scala (renamed from src/library/scala/xml/QNode.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/SpecialNode.scala (renamed from src/library/scala/xml/SpecialNode.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Text.scala (renamed from src/library/scala/xml/Text.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/TextBuffer.scala (renamed from src/library/scala/xml/TextBuffer.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/TopScope.scala (renamed from src/library/scala/xml/TopScope.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/TypeSymbol.scala (renamed from src/library/scala/xml/TypeSymbol.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Unparsed.scala (renamed from src/library/scala/xml/Unparsed.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/UnprefixedAttribute.scala (renamed from src/library/scala/xml/UnprefixedAttribute.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/Utility.scala (renamed from src/library/scala/xml/Utility.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/XML.scala (renamed from src/library/scala/xml/XML.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/Xhtml.scala (renamed from src/library/scala/xml/Xhtml.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/ContentModel.scala (renamed from src/library/scala/xml/dtd/ContentModel.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/ContentModelParser.scala (renamed from src/library/scala/xml/dtd/ContentModelParser.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/DTD.scala (renamed from src/library/scala/xml/dtd/DTD.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/Decl.scala (renamed from src/library/scala/xml/dtd/Decl.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/DocType.scala (renamed from src/library/scala/xml/dtd/DocType.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/ElementValidator.scala (renamed from src/library/scala/xml/dtd/ElementValidator.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/ExternalID.scala (renamed from src/library/scala/xml/dtd/ExternalID.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/Scanner.scala (renamed from src/library/scala/xml/dtd/Scanner.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/Tokens.scala (renamed from src/library/scala/xml/dtd/Tokens.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/ValidationException.scala (renamed from src/library/scala/xml/dtd/ValidationException.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/Base.scala (renamed from src/library/scala/xml/dtd/impl/Base.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/BaseBerrySethi.scala (renamed from src/library/scala/xml/dtd/impl/BaseBerrySethi.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/DetWordAutom.scala (renamed from src/library/scala/xml/dtd/impl/DetWordAutom.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/Inclusion.scala (renamed from src/library/scala/xml/dtd/impl/Inclusion.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/NondetWordAutom.scala (renamed from src/library/scala/xml/dtd/impl/NondetWordAutom.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/PointedHedgeExp.scala (renamed from src/library/scala/xml/dtd/impl/PointedHedgeExp.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/SubsetConstruction.scala (renamed from src/library/scala/xml/dtd/impl/SubsetConstruction.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/SyntaxError.scala (renamed from src/library/scala/xml/dtd/impl/SyntaxError.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/WordBerrySethi.scala (renamed from src/library/scala/xml/dtd/impl/WordBerrySethi.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/dtd/impl/WordExp.scala (renamed from src/library/scala/xml/dtd/impl/WordExp.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/factory/Binder.scala (renamed from src/library/scala/xml/factory/Binder.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/factory/LoggedNodeFactory.scala (renamed from src/library/scala/xml/factory/LoggedNodeFactory.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/factory/NodeFactory.scala (renamed from src/library/scala/xml/factory/NodeFactory.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/factory/XMLLoader.scala (renamed from src/library/scala/xml/factory/XMLLoader.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/include/CircularIncludeException.scala (renamed from src/library/scala/xml/include/CircularIncludeException.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/include/UnavailableResourceException.scala (renamed from src/library/scala/xml/include/UnavailableResourceException.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/include/XIncludeException.scala (renamed from src/library/scala/xml/include/XIncludeException.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/include/sax/EncodingHeuristics.scala (renamed from src/library/scala/xml/include/sax/EncodingHeuristics.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/include/sax/XIncludeFilter.scala (renamed from src/library/scala/xml/include/sax/XIncludeFilter.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/include/sax/XIncluder.scala (renamed from src/library/scala/xml/include/sax/XIncluder.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/package.scala (renamed from src/library/scala/xml/package.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/parsing/ConstructingHandler.scala (renamed from src/library/scala/xml/parsing/ConstructingHandler.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/ConstructingParser.scala (renamed from src/library/scala/xml/parsing/ConstructingParser.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/parsing/DefaultMarkupHandler.scala (renamed from src/library/scala/xml/parsing/DefaultMarkupHandler.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/ExternalSources.scala (renamed from src/library/scala/xml/parsing/ExternalSources.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/FactoryAdapter.scala (renamed from src/library/scala/xml/parsing/FactoryAdapter.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/FatalError.scala (renamed from src/library/scala/xml/parsing/FatalError.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/parsing/MarkupHandler.scala (renamed from src/library/scala/xml/parsing/MarkupHandler.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/parsing/MarkupParser.scala (renamed from src/library/scala/xml/parsing/MarkupParser.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/MarkupParserCommon.scala (renamed from src/library/scala/xml/parsing/MarkupParserCommon.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/NoBindingFactoryAdapter.scala (renamed from src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/TokenTests.scala (renamed from src/library/scala/xml/parsing/TokenTests.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/ValidatingMarkupHandler.scala (renamed from src/library/scala/xml/parsing/ValidatingMarkupHandler.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/XhtmlEntities.scala (renamed from src/library/scala/xml/parsing/XhtmlEntities.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/parsing/XhtmlParser.scala (renamed from src/library/scala/xml/parsing/XhtmlParser.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/persistent/CachedFileStorage.scala (renamed from src/library/scala/xml/persistent/CachedFileStorage.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/persistent/Index.scala (renamed from src/library/scala/xml/persistent/Index.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/persistent/SetStorage.scala (renamed from src/library/scala/xml/persistent/SetStorage.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/pull/XMLEvent.scala (renamed from src/library/scala/xml/pull/XMLEvent.scala) | 0 | ||||
| -rwxr-xr-x | src/xml/scala/xml/pull/XMLEventReader.scala (renamed from src/library/scala/xml/pull/XMLEventReader.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/pull/package.scala (renamed from src/library/scala/xml/pull/package.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/transform/BasicTransformer.scala (renamed from src/library/scala/xml/transform/BasicTransformer.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/transform/RewriteRule.scala (renamed from src/library/scala/xml/transform/RewriteRule.scala) | 0 | ||||
| -rw-r--r-- | src/xml/scala/xml/transform/RuleTransformer.scala (renamed from src/library/scala/xml/transform/RuleTransformer.scala) | 0 | ||||
| -rwxr-xr-x | test/partest | 2 |
151 files changed, 814 insertions, 507 deletions
diff --git a/.gitignore b/.gitignore index 378eac25d3..84c048a73c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build +/build/ @@ -123,7 +123,6 @@ TODO: <property name="library.starr.jar" value="${lib.dir}/scala-library.jar"/> <property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/> <property name="compiler.starr.jar" value="${lib.dir}/scala-compiler.jar"/> - <property name="jline.jar" value="${lib.dir}/jline.jar"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/> @@ -153,6 +152,8 @@ TODO: <property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/> <property name="partest.version.number" value="0.9.3"/> + <property name="jline.version" value="2.11"/> + <!-- These are NOT the flags used to run SuperSabbus, but the ones written into the script runners created with scala.tools.ant.ScalaTool --> <property name="java.flags" value="-Xmx256M -Xms32M"/> @@ -238,6 +239,10 @@ TODO: <dependency groupId="org.scala-tools.testing" artifactId="test-interface" version="0.5" /> </artifact:dependencies> + <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.deps.fileset" versionsId="repl.deps.versions"> + <dependency groupId="jline" artifactId="jline" version="${jline.version}"/> + </artifact:dependencies> + <!-- BND support --> <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" /> @@ -472,7 +477,7 @@ TODO: There must be a variable of the shape @{stage}.@{project}.build.path for all @{stage} in locker, quick, strap and all @{project} in library, reflect, compiler - when stage is quick, @{project} also includes: actors, repl, swing, plugins, scalacheck, interactive, scaladoc, partest, scalap + when stage is quick, @{project} also includes: actors, parser-combinators, xml, repl, swing, plugins, scalacheck, interactive, scaladoc, partest, scalap --> <!-- LOCKER --> @@ -510,6 +515,11 @@ TODO: <pathelement location="${build-quick.dir}/classes/actors"/> </path> + <path id="quick.parser-combinators.build.path"> + <path refid="quick.library.build.path"/> + <pathelement location="${build-quick.dir}/classes/parser-combinators"/> + </path> + <path id="quick.reflect.build.path"> <path refid="quick.library.build.path"/> <pathelement location="${build-quick.dir}/classes/reflect"/> @@ -524,12 +534,16 @@ TODO: <path id="quick.repl.build.path"> <path refid="quick.compiler.build.path"/> <pathelement location="${build-quick.dir}/classes/repl"/> - <pathelement location="${jline.jar}"/> + <path refid="repl.deps.classpath"/> + </path> + + <path id="quick.xml.build.path"> + <path refid="quick.library.build.path"/> + <pathelement location="${build-quick.dir}/classes/xml"/> </path> <path id="quick.swing.build.path"> <path refid="quick.library.build.path"/> - <path refid="quick.actors.build.path"/> <pathelement location="${build-quick.dir}/classes/swing"/> </path> @@ -541,6 +555,7 @@ TODO: <path id="quick.scalacheck.build.path"> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/actors"/> + <pathelement location="${build-quick.dir}/classes/parser-combinators"/> <pathelement location="${build-quick.dir}/classes/scalacheck"/> <path refid="partest.extras.classpath"/> </path> @@ -548,18 +563,21 @@ TODO: <path id="quick.scalap.build.path"> <path refid="quick.compiler.build.path"/> <pathelement location="${build-quick.dir}/classes/scalap"/> - <pathelement location="${build-quick.dir}/classes/partest"/> </path> <path id="quick.partest.build.path"> + <path refid="quick.xml.build.path"/> <path refid="quick.scalap.build.path"/> <path refid="partest.extras.classpath"/> <pathelement location="${build-quick.dir}/classes/repl"/> <pathelement location="${scalacheck.jar}"/> + <pathelement location="${build-quick.dir}/classes/partest"/> </path> <path id="quick.scaladoc.build.path"> + <path refid="quick.xml.build.path"/> <path refid="quick.compiler.build.path"/> + <path refid="quick.parser-combinators.build.path"/> <pathelement location="${build-quick.dir}/classes/partest"/> <pathelement location="${build-quick.dir}/classes/scaladoc"/> </path> @@ -571,6 +589,8 @@ TODO: </path> <path id="quick.bin.tool.path"> + <path refid="quick.parser-combinators.build.path"/> + <path refid="quick.xml.build.path"/> <path refid="quick.repl.build.path"/> <path refid="quick.actors.build.path"/> <pathelement location="${build-quick.dir}/classes/scalap"/> @@ -578,25 +598,24 @@ TODO: </path> <!-- PACK --> - <!-- also used for docs.* targets TODO: use separate paths for those --> <path id="pack.compiler.path"> <pathelement location="${build-pack.dir}/lib/scala-library.jar"/> <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> - <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/> - <pathelement location="${build-pack.dir}/lib/scalap.jar"/> - <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/> <pathelement location="${ant.jar}"/> - <path refid="partest.extras.classpath"/> + <path refid="forkjoin.classpath"/> <path refid="aux.libs"/> </path> <path id="pack.bin.tool.path"> <pathelement location="${build-pack.dir}/lib/scala-library.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-parser-combinators.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-xml.jar"/> <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> <pathelement location="${build-pack.dir}/lib/scalap.jar"/> - <pathelement location="${build-pack.dir}/lib/jline.jar"/> + <path refid="repl.deps.classpath"/> <path refid="aux.libs"/> </path> @@ -618,6 +637,8 @@ TODO: <fileset dir="${asm-classes}"/> </path> + <path id="pack.parser-combinators.files"> <fileset dir="${build-quick.dir}/classes/parser-combinators"/> </path> + <path id="pack.xml.files"> <fileset dir="${build-quick.dir}/classes/xml"/> </path> <path id="pack.swing.files"> <fileset dir="${build-quick.dir}/classes/swing"/> </path> <path id="pack.reflect.files"> <fileset dir="${build-quick.dir}/classes/reflect"/> </path> <path id="pack.plugins.files"> <fileset dir="${build-quick.dir}/classes/continuations-plugin"/> </path> @@ -656,6 +677,20 @@ TODO: </path> <!-- MISC --> + <path id="docs.compiler.path"> + <pathelement location="${build-pack.dir}/lib/scala-library.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-parser-combinators.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-xml.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/> + <pathelement location="${build-pack.dir}/lib/scalap.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/> + <pathelement location="${ant.jar}"/> + <path refid="partest.extras.classpath"/> + <path refid="aux.libs"/> + </path> + <path id="sbt.compile.build.path"> <path refid="quick.compiler.build.path"/> <pathelement location="${build-quick.dir}/classes/repl"/> @@ -671,6 +706,11 @@ TODO: <path id="partest.classpath"> <path refid="pack.compiler.path"/> + <pathelement location="${build-pack.dir}/lib/scala-parser-combinators.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-xml.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/> + <pathelement location="${build-pack.dir}/lib/scalap.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/> <path refid="partest.extras.classpath"/> </path> @@ -696,6 +736,7 @@ TODO: <pathelement location="${build-osgi.dir}/org.scala-lang.scala-reflect.jar"/> <pathelement location="${build-osgi.dir}/org.scala-lang.scala-compiler.jar"/> <pathelement location="${build-osgi.dir}/org.scala-lang.scala-actors.jar"/> + <pathelement location="${build-osgi.dir}/org.scala-lang.scala-parser-combinators.jar"/> <path refid="pax.exam.classpath"/> <path refid="forkjoin.classpath"/> </path> @@ -704,7 +745,7 @@ TODO: <pathelement location="${build-palo.dir}/lib/scala-library.jar"/> <pathelement location="${build-palo.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-palo.dir}/lib/scala-compiler.jar"/> - <pathelement location="${build-palo.dir}/lib/jline.jar"/> + <path refid="repl.deps.classpath"/> </path> <path id="test.positions.sub.build.path" path="${build-quick.dir}/classes/library"/> @@ -1070,7 +1111,7 @@ TODO: doctitle="@{title}" docversion="${version.number}" sourcepath="${src.dir}" - classpathref="pack.compiler.path" + classpathref="docs.compiler.path" srcdir="${src.dir}/@{dir}" addparams="${scalac.args.all}" implicits="on" @@ -1086,7 +1127,7 @@ TODO: doctitle="@{title}" docversion="${version.number}" sourcepath="${src.dir}" - classpathref="pack.compiler.path" + classpathref="docs.compiler.path" srcdir="${src.dir}/@{dir}" docRootContent="${src.dir}/@{project}/@{docroot}" addparams="${scalac.args.all}" @@ -1140,6 +1181,9 @@ TODO: <target name="quick.actors" depends="quick.lib"> <staged-build with="locker" stage="quick" project="actors"/> </target> + <target name="quick.parser-combinators" depends="quick.lib"> + <staged-build with="locker" stage="quick" project="parser-combinators"/> </target> + <target name="quick.reflect" depends="quick.lib"> <staged-build with="locker" stage="quick" project="reflect"/> </target> @@ -1149,20 +1193,23 @@ TODO: <target name="quick.repl" depends="quick.comp"> <staged-build with="locker" stage="quick" project="repl"/> </target> - <target name="quick.scalacheck" depends="quick.actors, quick.lib"> + <target name="quick.scalacheck" depends="quick.actors, quick.parser-combinators, quick.lib"> <staged-build with="locker" stage="quick" project="scalacheck" args="-nowarn"/> </target> <target name="quick.scalap" depends="quick.repl"> <staged-build with="locker" stage="quick" project="scalap"/> </target> - <target name="quick.partest" depends="quick.scalap, quick.repl, asm.done"> + <target name="quick.partest" depends="quick.scalap, quick.xml, quick.repl, asm.done"> <staged-build with="locker" stage="quick" project="partest" version="partest"/> </target> - <target name="quick.scaladoc" depends="quick.comp, quick.partest"> - <staged-build with="locker" stage="quick" project="scaladoc" version="scaladoc"/> </target> + <target name="quick.scaladoc" depends="quick.comp, quick.partest, quick.parser-combinators"> + <staged-build with="locker" stage="quick" project="scaladoc" version="scaladoc"/> </target> <target name="quick.interactive" depends="quick.comp, quick.scaladoc"> - <staged-build with="locker" stage="quick" project="interactive"/> </target> + <staged-build with="locker" stage="quick" project="interactive"/> </target> + + <target name="quick.xml" depends="quick.lib"> + <staged-build with="locker" stage="quick" project="xml"/> </target> <target name="quick.swing" depends="quick.actors, quick.lib" if="has.java6"> <staged-build with="locker" stage="quick" project="swing"/> </target> @@ -1200,7 +1247,7 @@ TODO: </staged-uptodate> </target> - <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalacheck, quick.scalap, quick.interactive, quick.swing, quick.plugins, quick.partest, quick.scaladoc"> + <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalacheck, quick.scalap, quick.interactive, quick.xml, quick.parser-combinators, quick.swing, quick.plugins, quick.partest, quick.scaladoc"> <staged-bin stage="quick" classpathref="quick.bin.tool.path"/> </target> @@ -1215,13 +1262,18 @@ TODO: <staged-pack project="library"/></target> <target name="pack.actors" depends="quick.lib"> <staged-pack project="actors"/> </target> + <target name="pack.xml" depends="quick.xml"> <staged-pack project="xml"/> </target> + <target name="pack.parser-combinators" depends="quick.parser-combinators"> <staged-pack project="parser-combinators"/> </target> <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target> <target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target> <target name="pack.comp" depends="quick.comp, quick.scaladoc, quick.interactive, quick.repl, asm.done"> <staged-pack project="compiler" manifest="${build-pack.dir}/META-INF/MANIFEST.MF"> <pre> <!-- TODO the files copied here do not influence actuality of this target (nor does the manifest) --> - <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/> + <copy todir="${build-pack.dir}/lib"> + <resources refid="repl.deps.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${repl.deps.versions}" to="flatten"/> + </copy> <copy todir="${build-pack.dir}/lib"> <fileset dir="${lib-extra.dir}"> <include name="**/*.jar"/> @@ -1251,7 +1303,7 @@ TODO: <target name="pack.scalap" depends="quick.scalap"> <staged-pack project="scalap" targetjar="scalap.jar"/> </target> - <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.partest, pack.plugins, pack.reflect, pack.scalacheck, pack.scalap, pack.swing"> + <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.partest, pack.plugins, pack.reflect, pack.scalacheck, pack.scalap, pack.xml, pack.swing, pack.parser-combinators"> <staged-bin stage="pack"/> </target> @@ -1264,7 +1316,7 @@ TODO: from="${partest.extras.versions}" to="flatten"/> </copy> - <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/> + <taskdef resource="scala/tools/ant/antlib.xml" classpathref="docs.compiler.path"/> <taskdef resource="scala/tools/partest/antlib.xml" classpathref="partest.classpath"/> </target> @@ -1296,7 +1348,10 @@ TODO: <fileset dir="${build-locker.dir}/classes/compiler"/> <fileset dir="${asm-classes}"/> </jar> - <copy file="${jline.jar}" toDir="${build-palo.dir}/lib"/> + <copy todir="${build-palo.dir}/lib"> + <resources refid="repl.deps.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${repl.deps.versions}" to="flatten"/> + </copy> </target> <target name="palo.bin" depends="palo.done"> <staged-bin stage="palo"/></target> @@ -1355,16 +1410,18 @@ TODO: <stopwatch name="osgi.bundle.timer"/> <make-bundle name="scala-library" version="${osgi.version.number}" /> <make-bundle name="scala-actors" version="${osgi.version.number}" /> + <make-bundle name="scala-parser-combinators" version="${osgi.version.number}" /> <make-bundle name="scala-reflect" version="${osgi.version.number}" /> <make-bundle name="scala-compiler" version="${osgi.version.number}" /> <make-plugin-bundle name="continuations" version="${osgi.version.number}" /> + <make-bundle name="scala-xml" version="${osgi.version.number}"/> <touch file="${build-osgi.dir}/bundles.complete" verbose="no"/> <if><isset property="has.java6"/><then> <make-bundle name="scala-swing" version="${osgi.version.number}"/></then> </if> - <stopwatch name="osgi.bundle.timer" action="total"/></then> - </if> + <stopwatch name="osgi.bundle.timer" action="total"/> + </then></if> </target> @@ -1641,7 +1698,7 @@ TODO: docversion="${version.number}" docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1" sourcepath="${src.dir}" - classpathref="pack.compiler.path" + classpathref="docs.compiler.path" addparams="${scalac.args.all}" docRootContent="${src.dir}/library/rootdoc.txt" implicits="on" @@ -1674,16 +1731,21 @@ TODO: </staged-uptodate> </target> - <target name="docs.comp" depends="docs.start"> - <staged-docs project="compiler" title="Scala Compiler" docroot="rootdoc.txt"> + <target name="docs.xml" depends="docs.start"> + <staged-docs project="xml" title="Scala XML Library" docroot="rootdoc.txt"> + <include name="**/*.scala"/> + </staged-docs> + </target> + + <target name="docs.parser-combinators" depends="docs.start"> + <staged-docs project="parser-combinators" title="Scala Parser Combinator Library" docroot="rootdoc.txt"> <include name="**/*.scala"/> </staged-docs> </target> - <target name="docs.jline" depends="docs.start"> - <staged-docs project="jline" dir="jline/src/main/java" title="Scala JLine"> + <target name="docs.comp" depends="docs.start"> + <staged-docs project="compiler" title="Scala Compiler" docroot="rootdoc.txt"> <include name="**/*.scala"/> - <include name="**/*.java"/> </staged-docs> </target> @@ -1712,7 +1774,7 @@ TODO: <mkdir dir="${build.dir}/manmaker/classes"/> <scalac destdir="${build.dir}/manmaker/classes" - classpathref="pack.compiler.path" + classpathref="docs.compiler.path" srcdir="${src.dir}/manual" includes="**/*.scala" addparams="${scalac.args.all}"/> @@ -1742,8 +1804,7 @@ TODO: </staged-uptodate> </target> - <target name="docs.done" depends="docs.jline, docs.comp, docs.man, docs.lib, docs.scalap, docs.partest, docs.continuations-plugin"/> - + <target name="docs.done" depends="docs.comp, docs.man, docs.lib, docs.xml, docs.parser-combinators, docs.scalap, docs.partest, docs.continuations-plugin"/> <!-- =========================================================================== DISTRIBUTION @@ -1771,7 +1832,6 @@ TODO: <mkdir dir="${dist.dir}/lib"/> <copy toDir="${dist.dir}/lib"> <fileset dir="${build-pack.dir}/lib"> - <include name="jline.jar"/> <include name="scalacheck.jar"/> <include name="scala-partest.jar"/> <include name="scalap.jar"/> @@ -1784,12 +1844,20 @@ TODO: from="${partest.extras.versions}" to="flatten"/> </copy> + <copy todir="${dist.dir}/lib"> + <resources refid="repl.deps.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" + from="${repl.deps.versions}" to="flatten"/> + </copy> + <mkdir dir="${dist.dir}/bin"/> <!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. --> <copy-bundle name="scala-library"/> <copy-bundle name="scala-reflect"/> + <copy-bundle name="scala-xml"/> <copy-bundle name="scala-swing"/> <copy-bundle name="scala-actors"/> + <copy-bundle name="scala-parser-combinators"/> <copy-bundle name="scala-compiler"/> <copy toDir="${dist.dir}/bin"> <fileset dir="${build-pack.dir}/bin"/> @@ -1846,8 +1914,10 @@ TODO: <fileset dir="${src.dir}/interactive"/> <fileset dir="${src.dir}/continuations/plugin"/> </jar> + <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-xml-src.jar" basedir="${src.dir}/xml"/> <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-swing-src.jar" basedir="${src.dir}/swing"/> <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-reflect-src.jar" basedir="${src.dir}/reflect"/> + <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-parser-combinators-src.jar" basedir="${src.dir}/parser-combinators"/> <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scalap-src.jar" basedir="${src.dir}/scalap"/> <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-partest-src.jar" basedir="${src.dir}/partest"/> </target> @@ -1896,8 +1966,10 @@ TODO: <target name="starr.src" depends="starr.jars"> <jar whenmanifestonly="fail" destfile="${lib.dir}/scala-library-src.jar"> <fileset dir="${src.dir}/library"/> + <fileset dir="${src.dir}/xml"/> <fileset dir="${src.dir}/swing"/> <fileset dir="${src.dir}/actors"/> + <fileset dir="${src.dir}/parser-combinators"/> <fileset dir="${src.dir}/forkjoin"/> </jar> <jar whenmanifestonly="fail" destfile="${lib.dir}/scala-reflect-src.jar" basedir="${src.dir}/reflect"/> diff --git a/dbuild-meta.json b/dbuild-meta.json new file mode 100644 index 0000000000..705eeeb6b6 --- /dev/null +++ b/dbuild-meta.json @@ -0,0 +1,250 @@ +{ + "version": "2.11.0", + "subproj": [], + "projects": [ + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + } + ], + "dependencies": [], + "name": "scala-library", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-reflect", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + } + ], + "name": "scala-reflect", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-compiler", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-reflect", + "organization": "org.scala-lang" + } + ], + "name": "scala-compiler", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-swing", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + } + ], + "name": "scala-swing", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-actors", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + } + ], + "name": "scala-actors", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-xml", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + } + ], + "name": "scala-xml", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-parser-combinators", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + } + ], + "name": "scala-parser-combinators", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scalacheck", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-library", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scala-actors", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scala-parser-combinators", + "organization": "org.scala-lang" + } + ], + "name": "scalacheck", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scala-partest", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-compiler", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scalap", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scala-xml", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scalacheck", + "organization": "org.scala-lang" + } + ], + "name": "scala-partest", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scaladoc", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-compiler", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scala-partest", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scala-xml", + "organization": "org.scala-lang" + }, + { + "extension": "jar", + "name": "scala-parser-combinators", + "organization": "org.scala-lang" + } + ], + "name": "scaladoc", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "scalap", + "organization": "org.scala-lang" + } + ], + "dependencies": [ + { + "extension": "jar", + "name": "scala-compiler", + "organization": "org.scala-lang" + } + ], + "name": "scalap", + "organization": "org.scala-lang" + }, + { + "artifacts": [ + { + "extension": "jar", + "name": "continuations", + "organization": "org.scala-lang.plugins" + } + ], + "dependencies": [], + "name": "continuations", + "organization": "org.scala-lang.plugins" + } + ] +} diff --git a/lib/jline.jar.desired.sha1 b/lib/jline.jar.desired.sha1 deleted file mode 100644 index 1eb994cf1b..0000000000 --- a/lib/jline.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -e87ad04fdffb5cd9b7aa9293596d9fdde086eccd ?jline.jar diff --git a/src/build/bnd/scala-compiler.bnd b/src/build/bnd/scala-compiler.bnd index c289843447..dc30513db4 100644 --- a/src/build/bnd/scala-compiler.bnd +++ b/src/build/bnd/scala-compiler.bnd @@ -3,6 +3,6 @@ Bundle-SymbolicName: org.scala-lang.scala-compiler ver: @VERSION@ Bundle-Version: ${ver} Export-Package: *;version=${ver} -Import-Package: scala.tools.jline.*;resolution:=optional, \ +Import-Package: jline.*;resolution:=optional, \ org.apache.tools.ant.*;resolution:=optional, \ * diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd new file mode 100644 index 0000000000..d712a4ba2a --- /dev/null +++ b/src/build/bnd/scala-parser-combinators.bnd @@ -0,0 +1,5 @@ +Bundle-Name: Scala Parser Combinators Library +Bundle-SymbolicName: org.scala-lang.scala-parser-combinators +ver: @VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd new file mode 100644 index 0000000000..6203c57dfe --- /dev/null +++ b/src/build/bnd/scala-xml.bnd @@ -0,0 +1,5 @@ +Bundle-Name: Scala XML Library +Bundle-SymbolicName: org.scala-lang.scala-xml +ver: @VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala new file mode 100644 index 0000000000..42214dd191 --- /dev/null +++ b/src/build/dbuild-meta-json-gen.scala @@ -0,0 +1,63 @@ +// use this script to generate dbuild-meta.json +// make sure the version is specified correctly, +// update the dependency structura and +// check out distributed-build and run `sbt console`: +// TODO: also generate build.xml and eclipse config from a similar data-structure + +import distributed.project.model._ + +val meta = + ExtractedBuildMeta("2.11.0", Seq( + Project("scala-library", "org.scala-lang", + Seq(ProjectRef("scala-library", "org.scala-lang")), + Seq.empty), // TODO: forkjoin + Project("scala-reflect", "org.scala-lang", + Seq(ProjectRef("scala-reflect", "org.scala-lang")), + Seq(ProjectRef("scala-library", "org.scala-lang"))), + Project("scala-compiler", "org.scala-lang", + Seq(ProjectRef("scala-compiler", "org.scala-lang")), + Seq(ProjectRef("scala-reflect", "org.scala-lang"))), // asm + + // Project("scala-repl", "org.scala-lang", + // Seq(ProjectRef("scala-repl", "org.scala-lang")), + // Seq(ProjectRef("scala-compiler", "org.scala-lang"))), // jline + + // Project("scala-interactive", "org.scala-lang", + // Seq(ProjectRef("scala-interactive", "org.scala-lang")), + // Seq(ProjectRef("scala-compiler", "org.scala-lang"), ProjectRef("scaladoc", "org.scala-lang"))), + + Project("scala-swing", "org.scala-lang", + Seq(ProjectRef("scala-swing", "org.scala-lang")), + Seq(ProjectRef("scala-library", "org.scala-lang"))), + + Project("scala-actors", "org.scala-lang", + Seq(ProjectRef("scala-actors", "org.scala-lang")), + Seq(ProjectRef("scala-library", "org.scala-lang"))), + Project("scala-xml", "org.scala-lang", + Seq(ProjectRef("scala-xml", "org.scala-lang")), + Seq(ProjectRef("scala-library", "org.scala-lang"))), + Project("scala-parser-combinators", "org.scala-lang", + Seq(ProjectRef("scala-parser-combinators", "org.scala-lang")), + Seq(ProjectRef("scala-library", "org.scala-lang"))), + + Project("scalacheck", "org.scala-lang", + Seq(ProjectRef("scalacheck", "org.scala-lang")), + Seq(ProjectRef("scala-library", "org.scala-lang"), ProjectRef("scala-actors", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))), + + Project("scala-partest", "org.scala-lang", + Seq(ProjectRef("scala-partest", "org.scala-lang")), + Seq(ProjectRef("scala-compiler", "org.scala-lang"), // TODO: refine to scala-repl + ProjectRef("scalap", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scalacheck", "org.scala-lang"))), + + Project("scaladoc", "org.scala-lang", + Seq(ProjectRef("scaladoc", "org.scala-lang")), + Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))), + + Project("scalap", "org.scala-lang", + Seq(ProjectRef("scalap", "org.scala-lang")), + Seq(ProjectRef("scala-compiler", "org.scala-lang"))), + + Project("continuations", "org.scala-lang.plugins", Seq(ProjectRef("continuations", "org.scala-lang.plugins")), Seq.empty) + )) + +println(Utils.writeValue(meta)) diff --git a/src/build/maven/jline-pom.xml b/src/build/maven/jline-pom.xml deleted file mode 100644 index 0d6e801551..0000000000 --- a/src/build/maven/jline-pom.xml +++ /dev/null @@ -1,68 +0,0 @@ -<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>jline</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>jline</name> - <description>Like readline, but better</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2011</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> - <license> - <name>The BSD License</name> - <url>http://www.opensource.org/licenses/bsd-license.php</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.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.4</version> - <!--<scope>provided</scope>--> - </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> diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index e70173319e..84a12066f5 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -5,271 +5,121 @@ <description> SuperSabbus extension for deploying a distribution to Maven. THIS FILE IS MEANT TO BE RUN STANDALONE IN THE MAVEN "distpack" DIRECTORY </description> - <target name="init.properties"> + + <target name="boot"> <!-- Pull in properties from build --> <property file="build.properties" /> - <!-- Initialize specific properties --> + <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" /> - <property name="remote.release.repository" value="https://oss.sonatype.org/service/local/staging/deploy/maven2" /> + <property name="remote.release.repository" value="https://oss.sonatype.org/service/local/staging/deploy/maven2" /> <property name="local.snapshot.repository" value="${user.home}/.m2/repository" /> - <property name="local.release.repository" value="${user.home}/.m2/repository" /> + <property name="local.release.repository" value="${user.home}/.m2/repository" /> + <property name="repository.credentials.id" value="sonatype-nexus" /> <property name="settings.file" value="${user.home}/.m2/settings.xml" /> - <condition property="version.is.snapshot"> - <contains string="${maven.version.number}" substring="-SNAPSHOT"/> - </condition> - - <echo>Using server[${repository.credentials.id}] for maven repository credentials. - Please make sure that your ~/.m2/settings.xml has the needed username/password for this server id - </echo> - - </target> - - <target name="init.maven" depends="init.properties"> + <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute --> + <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="ant-contrib.jar"/> <!-- Add our maven ant tasks --> <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" /> <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> + </target> - <!-- simplify fixing pom versions --> - <macrodef name="make-pom"> - <attribute name="name" /> - <attribute name="version" /> - <sequential> - <copy file="@{name}/@{name}-pom.xml" tofile="@{name}/@{name}-pom-fixed.xml" overwrite="true"> - <filterset> - <filter token="VERSION" value="@{version}" /> - <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" /> - <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" /> - </filterset> - </copy> - <artifact:pom id="@{name}.pom" file="@{name}/@{name}-pom-fixed.xml" /> - </sequential> - </macrodef> + <target name="init" depends="boot"> + <if><contains string="${maven.version.number}" substring="-SNAPSHOT"/><then> + <property name="remote.repository" value="${remote.snapshot.repository}"/> + <property name="local.repository" value="${local.snapshot.repository}"/> + </then><else> + <property name="remote.repository" value="${remote.release.repository}"/> + <property name="local.repository" value="${local.release.repository}"/> + </else></if> - <macrodef name="make-pom-plugin"> + <echo>Using server[${repository.credentials.id}] for maven repository credentials. + Please make sure that your ~/.m2/settings.xml has the needed username/password for this server id + </echo> + + <macrodef name="deploy-one"> + <attribute name="dir" default=""/> <attribute name="name" /> <attribute name="version" /> + <attribute name="local" /> + <attribute name="signed" /> + <sequential> - <copy file="plugins/@{name}/@{name}-plugin-pom.xml" tofile="plugins/@{name}/@{name}-pom-fixed.xml" overwrite="true"> + <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/> + + <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo> + + <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true"> <filterset> <filter token="VERSION" value="@{version}" /> <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" /> <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" /> + <filter token="JLINE_VERSION" value="${jline.version}" /> </filterset> </copy> - <artifact:pom id="plugin-@{name}.pom" file="plugins/@{name}/@{name}-pom-fixed.xml" /> - </sequential> - </macrodef> - </target> - <!-- macros for local deployment --> - <target name="deploy.local.init" depends="init.maven"> - <!-- Deploy single artifact locally --> - <macrodef name="deploy-local"> - <attribute name="name" /> - <attribute name="version" /> - <attribute name="repository" /> - <element name="extra-attachments" optional="yes" /> - <sequential> - <make-pom name="@{name}" version="@{version}" /> - <artifact:install file="@{name}/@{name}.jar"> - <artifact:pom refid="@{name}.pom" /> - <artifact:localRepository path="@{repository}" id="${repository.credentials.id}" /> - <artifact:attach type="jar" file="@{name}/@{name}-src.jar" classifier="sources" /> - <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" /> - <extra-attachments /> - </artifact:install> - </sequential> - </macrodef> - - <!-- Deploy compiler plugins --> - <macrodef name="deploy-local-plugin"> - <attribute name="name" /> - <attribute name="version" /> - <attribute name="repository" /> - <element name="extra-attachments" optional="yes" /> - <sequential> - <make-pom-plugin name="@{name}" version="@{version}" /> - <artifact:install file="plugins/@{name}/@{name}.jar"> - <artifact:pom refid="plugin-@{name}.pom" /> - <artifact:attach type="jar" file="plugins/@{name}/@{name}-src.jar" classifier="sources" /> - <artifact:attach type="jar" file="plugins/@{name}/@{name}-docs.jar" classifier="javadoc" /> - <artifact:localRepository path="@{repository}" id="${repository.credentials.id}" /> - <extra-attachments /> - </artifact:install> - </sequential> - </macrodef> - - - <!-- Deploy all artifacts locally --> - <macrodef name="deploy-local-all"> - <attribute name="repository" /> - <attribute name="version" /> - <sequential> - <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-swing" version="@{version}" repository="@{repository}"/> - <deploy-local name="scalap" version="@{version}" repository="@{repository}"/> - <deploy-local name="scala-partest" version="@{version}" repository="@{repository}"/> - <deploy-local name="jline" version="@{version}" repository="@{repository}"/> - </sequential> - </macrodef> - </target> - - <!-- macros for remote deployment --> - <target name="deploy.remote.init" depends="init.maven"> - <!-- Deploy single artifact locally --> - <macrodef name="deploy-remote"> - <attribute name="name" /> - <attribute name="repository" /> - <attribute name="version" /> - <element name="extra-attachments" optional="yes" /> - <sequential> - <make-pom name="@{name}" version="@{version}" /> - <artifact:deploy file="@{name}/@{name}.jar" settingsFile="${settings.file}"> - <artifact:pom refid="@{name}.pom" /> - <artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" /> - <artifact:attach type="jar" file="@{name}/@{name}-src.jar" classifier="sources" /> - <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" /> - <extra-attachments /> - </artifact:deploy> + <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" /> + + <if><equals arg1="@{signed}" arg2="false"/><then> + <if><equals arg1="@{local}" arg2="false"/><then> + <artifact:deploy file="${path}.jar" settingsFile="${settings.file}"> + <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" /> + <artifact:pom refid="@{name}.pom" /> + <artifact:attach type="jar" file="${path}-src.jar" classifier="sources" /> + <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" /> + </artifact:deploy> + </then><else> + <artifact:install file="${path}.jar"> + <artifact:localRepository path="${local.repository}" id="${repository.credentials.id}" /> + <artifact:pom refid="@{name}.pom" /> + <artifact:attach type="jar" file="${path}-src.jar" classifier="sources" /> + <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" /> + </artifact:install> + </else></if> + </then><else> + <local name="repo"/> + <if><equals arg1="@{local}" arg2="false"/><then> + <property name="repo" value="${remote.repository}"/> + </then><else> + <property name="repo" value="${local.repository}"/> + </else></if> + <artifact:mvn> + <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" /> + <arg value="-Durl=${repo}" /> + <arg value="-DrepositoryId=${repository.credentials.id}" /> + <arg value="-DpomFile=${path}-pom-filtered.xml" /> + <arg value= "-Dfile=${path}.jar" /> + <arg value="-Dsources=${path}-src.jar" /> + <arg value="-Djavadoc=${path}-docs.jar" /> + <arg value="-Pgpg" /> + <arg value="-Dgpg.useagent=true" /> + </artifact:mvn> + </else></if> </sequential> </macrodef> - <!-- Deploy compiler plugins --> - <macrodef name="deploy-remote-plugin"> - <attribute name="name" /> - <attribute name="version" /> - <attribute name="repository" /> - <element name="extra-attachments" optional="yes" /> - <sequential> - <make-pom-plugin name="@{name}" version="@{version}" /> - <artifact:deploy file="plugins/@{name}/@{name}.jar" settingsFile="${settings.file}"> - <artifact:pom refid="plugin-@{name}.pom" /> - <artifact:attach type="jar" file="plugins/@{name}/@{name}-src.jar" classifier="sources" /> - <artifact:attach type="jar" file="plugins/@{name}/@{name}-docs.jar" classifier="javadoc" /> - <artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" /> - <extra-attachments /> - </artifact:deploy> - </sequential> - </macrodef> + <macrodef name="deploy"> + <attribute name="local" default="false"/> + <attribute name="signed" default="false"/> - <!-- Deploy all artifacts locally --> - <macrodef name="deploy-remote-all"> - <attribute name="repository" /> - <attribute name="version" /> <sequential> - <deploy-remote name="scala-library" version="@{version}" repository="@{repository}"/> - <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}"/> - <deploy-remote name="scalap" version="@{version}" repository="@{repository}"/> - <deploy-remote name="scala-partest" version="@{version}" repository="@{repository}"/> - <deploy-remote-plugin name="continuations" version="@{version}" repository="@{repository}"/> + <deploy-one name="scala-actors" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-library" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-xml" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-parser-combinators" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-partest" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-reflect" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scala-swing" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one name="scalap" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one dir="plugins/" name="continuations" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> </sequential> </macrodef> - - <!-- PGP Signed deployment --> - <macrodef name="deploy-remote-signed-single"> - <attribute name="pom" /> - <attribute name="repository" /> - <attribute name="jar" /> - <attribute name="srcjar" /> - <attribute name="docjar" /> - <sequential> - <artifact:mvn> - <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" /> - <arg value="-Durl=@{repository}" /> - <arg value="-DrepositoryId=${repository.credentials.id}" /> - <arg value="-DpomFile=@{pom}" /> - <arg value="-Dfile=@{jar}" /> - <arg value="-Dsources=@{srcjar}" /> - <arg value="-Djavadoc=@{docjar}" /> - <arg value="-Pgpg" /> - <arg value="-Dgpg.useagent=true" /> - </artifact:mvn> - </sequential> - </macrodef> - <macrodef name="deploy-remote-signed"> - <attribute name="name" /> - <attribute name="repository" /> - <attribute name="version" /> - <element name="extra-attachments" optional="yes" /> - <sequential> - <make-pom name="@{name}" version="@{version}" /> - <deploy-remote-signed-single - pom="@{name}/@{name}-pom-fixed.xml" - repository="@{repository}" - jar="@{name}/@{name}.jar" - srcjar="@{name}/@{name}-src.jar" - docjar="@{name}/@{name}-docs.jar" /> - </sequential> - </macrodef> - <macrodef name="deploy-remote-plugin-signed"> - <attribute name="name" /> - <attribute name="repository" /> - <attribute name="version" /> - <element name="extra-attachments" optional="yes" /> - <sequential> - <make-pom-plugin name="@{name}" version="@{version}" /> - <deploy-remote-signed-single - pom="plugins/@{name}/@{name}-pom-fixed.xml" - repository="@{repository}" - jar="plugins/@{name}/@{name}.jar" - srcjar="plugins/@{name}/@{name}-src.jar" - docjar="plugins/@{name}/@{name}-docs.jar" /> - </sequential> - </macrodef> - <macrodef name="deploy-remote-signed-all"> - <attribute name="repository" /> - <attribute name="version" /> - <sequential> - <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}"/> - <deploy-remote-signed name="scalap" version="@{version}" repository="@{repository}"/> - <deploy-remote-signed name="scala-partest" version="@{version}" repository="@{repository}"/> - </sequential> - </macrodef> - </target> - - <!-- Local Targets --> - <target name="deploy.snapshot.local" depends="deploy.local.init" if="version.is.snapshot" description="Deploys the bundled snapshot of the Scala Lanaguage to a local maven repository"> - <deploy-local-all version="${maven.version.number}" repository="${local.snapshot.repository}" /> - </target> - - <target name="deploy.release.local" depends="deploy.local.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the local Maven repository"> - <deploy-local-all version="${maven.version.number}" repository="${local.release.repository}" /> - </target> - <target name="deploy.local" depends="deploy.snapshot.local, deploy.release.local" description="Deploys the bundle files to the local maven repo."/> - - <!-- Remote Signed Targets --> - <target name="deploy.signed.snapshot" depends="deploy.remote.init" if="version.is.snapshot" description="Deploys the bundled files as a snapshot into the desired remote Maven repository"> - <deploy-remote-signed-all version="${maven.version.number}" repository="${remote.snapshot.repository}" /> </target> - <target name="deploy.signed.release" depends="deploy.remote.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the desired remote Maven repository"> - <deploy-remote-signed-all version="${maven.version.number}" repository="${remote.release.repository}" /> - </target> - <target name="deploy.signed" depends="deploy.signed.release, deploy.signed.snapshot" description="Deploys signed bundles to remote repo"/> - <!-- Remote unsigned targets --> - <target name="deploy.snapshot" depends="deploy.remote.init" if="version.is.snapshot" description="Deploys the bundled files as a snapshot into the desired remote Maven repository"> - <deploy-remote-all version="${maven.version.number}" repository="${remote.snapshot.repository}" /> - </target> - - <target name="deploy.release" depends="deploy.remote.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the desired remote Maven repository"> - <deploy-remote-all version="${maven.version.number}" repository="${remote.release.repository}" /> - </target> - <target name="deploy" depends="deploy.snapshot, deploy.release" description="Deploys unsigned artifacts to the maven repo."/> + <target name="deploy" depends="init" description="Deploys unsigned artifacts to the maven repo."> <deploy/> </target> + <target name="deploy.local" depends="init" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target> + <target name="deploy.signed" depends="init" description="Deploys signed artifacts to the remote maven repo."> <deploy signed="true"/> </target> </project> diff --git a/src/build/maven/continuations-plugin-pom.xml b/src/build/maven/plugins/continuations-pom.xml index 9abb0a36f0..9abb0a36f0 100644 --- a/src/build/maven/continuations-plugin-pom.xml +++ b/src/build/maven/plugins/continuations-pom.xml diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml index fedc34a5d5..6e7f1a0f2c 100644 --- a/src/build/maven/scala-compiler-pom.xml +++ b/src/build/maven/scala-compiler-pom.xml @@ -1,13 +1,13 @@ <project - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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-compiler</artifactId> <packaging>jar</packaging> <version>@VERSION@</version> - <name>Scala Compiler</name> - <description>Compiler for the Scala Programming Language</description> + <name>Scala Compiler</name> + <description>Compiler for the Scala Programming Language</description> <url>http://www.scala-lang.org/</url> <inceptionYear>2002</inceptionYear> <organization> @@ -23,12 +23,12 @@ </license> </licenses> <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> + <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> + <system>JIRA</system> + <url>https://issues.scala-lang.org/</url> </issueManagement> <dependencies> @@ -37,17 +37,27 @@ <artifactId>scala-library</artifactId> <version>@VERSION@</version> </dependency> + <dependency> <!-- for scaladoc --> + <groupId>org.scala-lang</groupId> + <artifactId>scala-xml</artifactId> + <version>@VERSION@</version> + </dependency> + <dependency> <!-- for scaladoc --> + <groupId>org.scala-lang</groupId> + <artifactId>scala-parser-combinators</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> - <version>@VERSION@</version> - <optional>true</optional> - </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>@JLINE_VERSION@</version> + <optional>true</optional> + </dependency> </dependencies> <distributionManagement> <repository> @@ -60,14 +70,14 @@ <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> + <developers> + <developer> + <id>lamp</id> + <name>EPFL LAMP</name> + </developer> + <developer> + <id>Typesafe</id> + <name>Typesafe, Inc.</name> + </developer> + </developers> </project> diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml index fc9964ae92..684474e79a 100644 --- a/src/build/maven/scala-library-pom.xml +++ b/src/build/maven/scala-library-pom.xml @@ -34,11 +34,6 @@ <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> </properties> <dependencies> - <!--<dependency> - <groupId>com.typesafe</groupId> - <artifactId>config</artifactId> - <version>0.4.0</version> - </dependency>--> </dependencies> <distributionManagement> <repository> diff --git a/src/build/maven/scala-parser-combinators-pom.xml b/src/build/maven/scala-parser-combinators-pom.xml new file mode 100644 index 0000000000..cddff269c8 --- /dev/null +++ b/src/build/maven/scala-parser-combinators-pom.xml @@ -0,0 +1,59 @@ +<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-parser-combinators</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Scala Parser Combinators</name> + <description>Parser Combinator Library 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> + <properties> + <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> + </properties> + <dependencies> + </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> diff --git a/src/build/maven/scala-dotnet-library-pom.xml b/src/build/maven/scala-xml-pom.xml index 007e8be173..629872c2e2 100644 --- a/src/build/maven/scala-dotnet-library-pom.xml +++ b/src/build/maven/scala-xml-pom.xml @@ -1,15 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<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-dotnet-library</artifactId> - <version>@VERSION@</version> - <name>Class Library</name> - <packaging>dotnet:library</packaging> - - <url>http://www.scala-lang.org/</url> +<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-xml</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Scala XML</name> + <description>XML Library for the Scala Programming Language</description> + <url>http://www.scala-lang.org/</url> <inceptionYear>2002</inceptionYear> <organization> <name>LAMP/EPFL</name> @@ -31,6 +30,11 @@ <system>JIRA</system> <url>https://issues.scala-lang.org/</url> </issueManagement> + <properties> + <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> + </properties> + <dependencies> + </dependencies> <distributionManagement> <repository> <id>scala-tools.org</id> @@ -41,5 +45,15 @@ <url>@SNAPSHOT_REPOSITORY@</url> <uniqueVersion>false</uniqueVersion> </snapshotRepository> - </distributionManagement> + </distributionManagement> + <developers> + <developer> + <id>lamp</id> + <name>EPFL LAMP</name> + </developer> + <developer> + <id>Typesafe</id> + <name>Typesafe, Inc.</name> + </developer> + </developers> </project> diff --git a/src/build/pack.xml b/src/build/pack.xml index 20c4034107..6b6579ce12 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -151,8 +151,9 @@ MAIN DISTRIBUTION PACKAGING </copy> </sequential> </macrodef> - <mvn-copy-lib mvn.artifact.name="jline"/> <mvn-copy-lib mvn.artifact.name="scala-library"/> + <mvn-copy-lib mvn.artifact.name="scala-xml"/> + <mvn-copy-lib mvn.artifact.name="scala-parser-combinators"/> <mvn-copy-lib mvn.artifact.name="scala-reflect"/> <mvn-copy-lib mvn.artifact.name="scala-compiler"/> <mvn-copy-lib mvn.artifact.name="scala-swing"/> @@ -170,8 +171,8 @@ MAIN DISTRIBUTION PACKAGING <fileset dir="${dist.dir}/misc/scala-devel/plugins/"> <filename name="@{mvn.artifact.name}.jar"/> </fileset> - <fileset dir="${src.dir}/build/maven/"> - <filename name="@{mvn.artifact.name}-plugin-pom.xml"/> + <fileset dir="${src.dir}/build/maven/plugins/"> + <filename name="@{mvn.artifact.name}-pom.xml"/> </fileset> </copy> </sequential> @@ -181,12 +182,6 @@ MAIN DISTRIBUTION PACKAGING <target name="pack-maven.srcs" depends="pack-maven.libs"> <!-- Add missing src jars. --> - <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/jline/jline-src.jar" - basedir="${src.dir}/jline/src/main/java"> - <include name="**/*"/> - </jar> - - <!-- Continuations plugin --> <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar" basedir="${src.dir}/continuations/plugin"> @@ -195,14 +190,18 @@ MAIN DISTRIBUTION PACKAGING </target> <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins"> - <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/jline/jline-docs.jar" - basedir="${build-docs.dir}/jline"> - <include name="**/*"/> - </jar> <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" basedir="${build-docs.dir}/library"> <include name="**/*"/> </jar> + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-xml/scala-xml-docs.jar" + basedir="${build-docs.dir}/xml"> + <include name="**/*"/> + </jar> + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-parser-combinators/scala-parser-combinators-docs.jar" + basedir="${build-docs.dir}/parser-combinators"> + <include name="**/*"/> + </jar> <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar" basedir="${build-docs.dir}/compiler"> <include name="**/*"/> @@ -243,6 +242,8 @@ MAIN DISTRIBUTION PACKAGING <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win,pack-maven.srcs"> <copy todir="${dists.dir}/maven/${version.number}" + file="${lib-ant.dir}/ant-contrib.jar"/> + <copy todir="${dists.dir}/maven/${version.number}" file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar"/> <copy tofile="${dists.dir}/maven/${version.number}/build.xml" file="${src.dir}/build/maven/maven-deploy.xml"/> diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index 84ccaba749..abf9925ad9 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -115,7 +115,7 @@ if [[ -n "$cygwin$mingw" ]]; then case "$TERM" in rxvt* | xterm*) stty -icanon min 1 -echo - WINDOWS_OPT="-Djline.terminal=scala.tools.jline.UnixTerminal" + WINDOWS_OPT="-Djline.terminal=unix" ;; esac fi diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 1f4ff7cc2d..1f8f13ae02 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -99,22 +99,13 @@ trait Contexts { self: Analyzer => // there must be a scala.xml package when xml literals were parsed in this unit if (unit.hasXml && ScalaXmlPackage == NoSymbol) - unit.error(unit.firstXmlPos, "XML literals may only be used if the package scala.xml is present in the compilation classpath.") - - // TODO: remove the def below and drop `|| predefDefinesDollarScope` in the condition for `contextWithXML` - // as soon as 2.11.0-M4 is released and used as STARR (and $scope is no longer defined in Predef) - // Until then, to allow compiling quick with pre-2.11.0-M4 STARR, - // which relied on Predef defining `val $scope`, we've left it in place. - // Since the new scheme also imports $scope (as an alias for scala.xml.TopScope), - // we must check whether it is still there and not import the alias to avoid ambiguity. - // (All of this is only necessary to compile the full quick stage with STARR. - // if using locker, Predef.$scope is no longer needed.) - def predefDefinesDollarScope = definitions.getMemberIfDefined(PredefModule, nme.dollarScope) != NoSymbol - - // hack for the old xml library (detected by looking for scala.xml.TopScope, which needs to be in scope as $scope) - // import scala.xml.{TopScope => $scope} + unit.error(unit.firstXmlPos, "To compile XML syntax, the scala.xml package must be on the classpath.\nPlease see https://github.com/scala/scala/wiki/Scala-2.11#xml.") + + // scala-xml needs `scala.xml.TopScope` to be in scope globally as `$scope` + // We detect `scala-xml` by looking for `scala.xml.TopScope` and + // inject the equivalent of `import scala.xml.{TopScope => $scope}` val contextWithXML = - if (!unit.hasXml || ScalaXmlTopScope == NoSymbol || predefDefinesDollarScope) rootImportsContext + if (!unit.hasXml || ScalaXmlTopScope == NoSymbol) rootImportsContext else rootImportsContext.make(gen.mkImport(ScalaXmlPackage, nme.TopScope, nme.dollarScope)) val c = contextWithXML.make(tree, unit = unit) diff --git a/src/eclipse/continuations-library/.classpath b/src/eclipse/continuations-library/.classpath index b3ca4eeb48..61cb3f060e 100644 --- a/src/eclipse/continuations-library/.classpath +++ b/src/eclipse/continuations-library/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="library"/> + <classpathentry kind="src" path="continuations-library"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> diff --git a/src/eclipse/continuations-library/.project b/src/eclipse/continuations-library/.project index f3a53a3d97..33cc57d667 100644 --- a/src/eclipse/continuations-library/.project +++ b/src/eclipse/continuations-library/.project @@ -22,7 +22,7 @@ <locationURI>SCALA_BASEDIR/build/quick/classes/continuations/library</locationURI> </link> <link> - <name>library</name> + <name>continuations-library</name> <type>2</type> <locationURI>SCALA_BASEDIR/src/continuations/library</locationURI> </link> diff --git a/src/eclipse/interactive/.classpath b/src/eclipse/interactive/.classpath index 870cc67aec..73a67e45ed 100644 --- a/src/eclipse/interactive/.classpath +++ b/src/eclipse/interactive/.classpath @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="interactive"/> - <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/scaladoc"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> <classpathentry kind="output" path="build-quick-interactive"/> </classpath> diff --git a/src/eclipse/partest/.classpath b/src/eclipse/partest/.classpath index a990c5a1b3..462cbb9c94 100644 --- a/src/eclipse/partest/.classpath +++ b/src/eclipse/partest/.classpath @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="partest"/> - <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/scalap"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/ant/ant.jar"/> - <classpathentry kind="lib" path="lib/jline.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/asm"/> - <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> <classpathentry combineaccessrules="false" kind="src" path="/repl"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scala-tools/testing/test-interface/0.5/test-interface-0.5.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build-quick-partest"/> </classpath> diff --git a/src/eclipse/reflect/.classpath b/src/eclipse/reflect/.classpath index 36e6b6adf1..1eb37e3f5f 100644 --- a/src/eclipse/reflect/.classpath +++ b/src/eclipse/reflect/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build-quick-reflect"/> </classpath> diff --git a/src/eclipse/repl/.classpath b/src/eclipse/repl/.classpath index 30744da306..748fa6c9c8 100644 --- a/src/eclipse/repl/.classpath +++ b/src/eclipse/repl/.classpath @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="repl"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry kind="var" path="SCALA_BASEDIR/lib/jline.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/asm"/> - <classpathentry kind="output" path="build-quick-repl"/> + <classpathentry kind="src" path="repl"/> + <classpathentry combineaccessrules="false" kind="src" path="/asm"/> + <classpathentry kind="var" path="M2_REPO/jline/jline/2.11/jline-2.11.jar"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build-quick-repl"/> </classpath> diff --git a/src/eclipse/repl/.project b/src/eclipse/repl/.project index ea188bc262..69ad08ab1a 100644 --- a/src/eclipse/repl/.project +++ b/src/eclipse/repl/.project @@ -1,35 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>repl</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.scala-ide.sdt.core.scalabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.scala-ide.sdt.core.scalanature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> - <linkedResources> - <link> - <name>build-quick-repl</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/build/quick/classes/repl</locationURI> - </link> - <link> - <name>lib</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/lib</locationURI> - </link> - <link> - <name>repl</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/src/repl</locationURI> - </link> - </linkedResources> + <name>repl</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.scala-ide.sdt.core.scalabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.scala-ide.sdt.core.scalanature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> + <linkedResources> + <link> + <name>build-quick-repl</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/build/quick/classes/repl</locationURI> + </link> + <link> + <name>lib</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/lib</locationURI> + </link> + <link> + <name>repl</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/src/repl</locationURI> + </link> + </linkedResources> </projectDescription> diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath index 0488a0dc39..b6ef5f35bb 100644 --- a/src/eclipse/scala-compiler/.classpath +++ b/src/eclipse/scala-compiler/.classpath @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="compiler"/> + <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/asm"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/ant/ant.jar"/> - <classpathentry kind="lib" path="lib/jline.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> + <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build-quick-compiler"/> </classpath> diff --git a/src/eclipse/scala-library/.classpath b/src/eclipse/scala-library/.classpath index a3a4933d34..eff3c8e0b7 100644 --- a/src/eclipse/scala-library/.classpath +++ b/src/eclipse/scala-library/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="src" path="library"/> <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build-quick-lib"/> </classpath> diff --git a/src/eclipse/scala-parser-combinators/.classpath b/src/eclipse/scala-parser-combinators/.classpath new file mode 100644 index 0000000000..7eab7094eb --- /dev/null +++ b/src/eclipse/scala-parser-combinators/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src-parser-combinators"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build-quick-parser-combinators"/> +</classpath> diff --git a/src/eclipse/scala-parser-combinators/.project b/src/eclipse/scala-parser-combinators/.project new file mode 100644 index 0000000000..d94523f56d --- /dev/null +++ b/src/eclipse/scala-parser-combinators/.project @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>scala-parser-combinators</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.scala-ide.sdt.core.scalabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.scala-ide.sdt.core.scalanature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> + <linkedResources> + <link> + <name>build-quick-parser-combinators</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/build/quick/classes/parser-combinators</locationURI> + </link> + <link> + <name>src-parser-combinators</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/src/parser-combinators</locationURI> + </link> + </linkedResources> +</projectDescription> diff --git a/src/eclipse/scala-xml/.classpath b/src/eclipse/scala-xml/.classpath new file mode 100644 index 0000000000..b90d951640 --- /dev/null +++ b/src/eclipse/scala-xml/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src-xml"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build-quick-xml"/> +</classpath> diff --git a/src/eclipse/scala-xml/.project b/src/eclipse/scala-xml/.project new file mode 100644 index 0000000000..8b0f7f6864 --- /dev/null +++ b/src/eclipse/scala-xml/.project @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>scala-xml</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.scala-ide.sdt.core.scalabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.scala-ide.sdt.core.scalanature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> + <linkedResources> + <link> + <name>build-quick-xml</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/build/quick/classes/xml</locationURI> + </link> + <link> + <name>src-xml</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/src/xml</locationURI> + </link> + </linkedResources> +</projectDescription> diff --git a/src/eclipse/scaladoc/.classpath b/src/eclipse/scaladoc/.classpath index f12ba4bb2c..caafcf33b0 100644 --- a/src/eclipse/scaladoc/.classpath +++ b/src/eclipse/scaladoc/.classpath @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry combineaccessrules="false" kind="src" path="/partest"/> <classpathentry kind="src" path="scaladoc"/> - <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/partest"/> <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/asm"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build-quick-scaladoc"/> </classpath> diff --git a/src/eclipse/scalap/.classpath b/src/eclipse/scalap/.classpath index 0a55745702..3b635cf56e 100644 --- a/src/eclipse/scalap/.classpath +++ b/src/eclipse/scalap/.classpath @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="scalap"/> - <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> + <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/ant/ant.jar"/> - <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> <classpathentry kind="output" path="build-quick-scalap"/> </classpath> diff --git a/src/eclipse/test-junit/.classpath b/src/eclipse/test-junit/.classpath index 718f7b6ece..8e4f88e0f0 100644 --- a/src/eclipse/test-junit/.classpath +++ b/src/eclipse/test-junit/.classpath @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="test-junit"/> + <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> + <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/ant/ant.jar"/> - <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/> <classpathentry kind="output" path="build-test-junit"/> </classpath> diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index a188602543..3b588e261f 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -134,15 +134,6 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef { @inline def implicitly[T](implicit e: T) = e // for summoning implicit values from the nether world -- TODO: when dependent method types are on by default, give this result type `e.type`, so that inliner has better chance of knowing which method to inline in calls like `implicitly[MatchingStrategy[Option]].zero` @inline def locally[T](x: T): T = x // to communicate intent and avoid unmoored statements - // TODO: remove `val $scope = ...` as soon as 2.11.0-M4 is released and used as STARR - // As it has a '$' in its name, we don't have to deprecate first. - // The compiler now aliases `scala.xml.TopScope` to `$scope` (unless Predef.$scope is still there). - // This definition left in place for older compilers and to compile quick with pre-2.11.0-M4 STARR. - // In principle we don't need it to compile library/reflect/compiler (there's no xml left there), - // so a new locker can be built without this definition, and locker can build quick - // (partest, scaladoc still require xml). - val $scope = scala.xml.TopScope - // errors and asserts ------------------------------------------------- // !!! Remove this when possible - ideally for 2.11. diff --git a/src/library/scala/util/parsing/combinator/ImplicitConversions.scala b/src/parser-combinators/scala/util/parsing/combinator/ImplicitConversions.scala index 0683ea927d..0683ea927d 100644 --- a/src/library/scala/util/parsing/combinator/ImplicitConversions.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/ImplicitConversions.scala diff --git a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/JavaTokenParsers.scala index 01288a182e..01288a182e 100644 --- a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/JavaTokenParsers.scala diff --git a/src/library/scala/util/parsing/combinator/PackratParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/PackratParsers.scala index a11dd18e62..a11dd18e62 100644 --- a/src/library/scala/util/parsing/combinator/PackratParsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/PackratParsers.scala diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/parser-combinators/scala/util/parsing/combinator/Parsers.scala index 16754646fd..16754646fd 100644 --- a/src/library/scala/util/parsing/combinator/Parsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/Parsers.scala diff --git a/src/library/scala/util/parsing/combinator/RegexParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/RegexParsers.scala index 8ebbc573ad..8ebbc573ad 100644 --- a/src/library/scala/util/parsing/combinator/RegexParsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/RegexParsers.scala diff --git a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala b/src/parser-combinators/scala/util/parsing/combinator/lexical/Lexical.scala index d8029d068f..d8029d068f 100644 --- a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/lexical/Lexical.scala diff --git a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala b/src/parser-combinators/scala/util/parsing/combinator/lexical/Scanners.scala index 2e12915bb8..2e12915bb8 100644 --- a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/lexical/Scanners.scala diff --git a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/parser-combinators/scala/util/parsing/combinator/lexical/StdLexical.scala index 32d7502cda..32d7502cda 100644 --- a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/lexical/StdLexical.scala diff --git a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala index 5b9d14c9a7..5b9d14c9a7 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala diff --git a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala index adcf85da7a..adcf85da7a 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala diff --git a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/syntactical/TokenParsers.scala index b06babcd7e..b06babcd7e 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/syntactical/TokenParsers.scala diff --git a/src/library/scala/util/parsing/combinator/token/StdTokens.scala b/src/parser-combinators/scala/util/parsing/combinator/token/StdTokens.scala index a102d1541e..a102d1541e 100644 --- a/src/library/scala/util/parsing/combinator/token/StdTokens.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/token/StdTokens.scala diff --git a/src/library/scala/util/parsing/combinator/token/Tokens.scala b/src/parser-combinators/scala/util/parsing/combinator/token/Tokens.scala index 5c3f1f95b5..5c3f1f95b5 100644 --- a/src/library/scala/util/parsing/combinator/token/Tokens.scala +++ b/src/parser-combinators/scala/util/parsing/combinator/token/Tokens.scala diff --git a/src/library/scala/util/parsing/input/CharArrayReader.scala b/src/parser-combinators/scala/util/parsing/input/CharArrayReader.scala index 22530cb9aa..22530cb9aa 100644 --- a/src/library/scala/util/parsing/input/CharArrayReader.scala +++ b/src/parser-combinators/scala/util/parsing/input/CharArrayReader.scala diff --git a/src/library/scala/util/parsing/input/CharSequenceReader.scala b/src/parser-combinators/scala/util/parsing/input/CharSequenceReader.scala index 8e7751cc82..8e7751cc82 100644 --- a/src/library/scala/util/parsing/input/CharSequenceReader.scala +++ b/src/parser-combinators/scala/util/parsing/input/CharSequenceReader.scala diff --git a/src/library/scala/util/parsing/input/NoPosition.scala b/src/parser-combinators/scala/util/parsing/input/NoPosition.scala index 4a32264b79..4a32264b79 100644 --- a/src/library/scala/util/parsing/input/NoPosition.scala +++ b/src/parser-combinators/scala/util/parsing/input/NoPosition.scala diff --git a/src/library/scala/util/parsing/input/OffsetPosition.scala b/src/parser-combinators/scala/util/parsing/input/OffsetPosition.scala index 23f79c74d1..23f79c74d1 100644 --- a/src/library/scala/util/parsing/input/OffsetPosition.scala +++ b/src/parser-combinators/scala/util/parsing/input/OffsetPosition.scala diff --git a/src/library/scala/util/parsing/input/PagedSeqReader.scala b/src/parser-combinators/scala/util/parsing/input/PagedSeqReader.scala index 468f1f9a5f..468f1f9a5f 100644 --- a/src/library/scala/util/parsing/input/PagedSeqReader.scala +++ b/src/parser-combinators/scala/util/parsing/input/PagedSeqReader.scala diff --git a/src/library/scala/util/parsing/input/Position.scala b/src/parser-combinators/scala/util/parsing/input/Position.scala index b7995a6471..b7995a6471 100644 --- a/src/library/scala/util/parsing/input/Position.scala +++ b/src/parser-combinators/scala/util/parsing/input/Position.scala diff --git a/src/library/scala/util/parsing/input/Positional.scala b/src/parser-combinators/scala/util/parsing/input/Positional.scala index cfde67cadd..cfde67cadd 100644 --- a/src/library/scala/util/parsing/input/Positional.scala +++ b/src/parser-combinators/scala/util/parsing/input/Positional.scala diff --git a/src/library/scala/util/parsing/input/Reader.scala b/src/parser-combinators/scala/util/parsing/input/Reader.scala index 9dbf08a7ca..9dbf08a7ca 100644 --- a/src/library/scala/util/parsing/input/Reader.scala +++ b/src/parser-combinators/scala/util/parsing/input/Reader.scala diff --git a/src/library/scala/util/parsing/input/StreamReader.scala b/src/parser-combinators/scala/util/parsing/input/StreamReader.scala index 30eb097fd7..30eb097fd7 100644 --- a/src/library/scala/util/parsing/input/StreamReader.scala +++ b/src/parser-combinators/scala/util/parsing/input/StreamReader.scala diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/parser-combinators/scala/util/parsing/json/JSON.scala index b06dddf532..b06dddf532 100644 --- a/src/library/scala/util/parsing/json/JSON.scala +++ b/src/parser-combinators/scala/util/parsing/json/JSON.scala diff --git a/src/library/scala/util/parsing/json/Lexer.scala b/src/parser-combinators/scala/util/parsing/json/Lexer.scala index 7fc4e0bab6..7fc4e0bab6 100644 --- a/src/library/scala/util/parsing/json/Lexer.scala +++ b/src/parser-combinators/scala/util/parsing/json/Lexer.scala diff --git a/src/library/scala/util/parsing/json/Parser.scala b/src/parser-combinators/scala/util/parsing/json/Parser.scala index 521dfc6612..521dfc6612 100644 --- a/src/library/scala/util/parsing/json/Parser.scala +++ b/src/parser-combinators/scala/util/parsing/json/Parser.scala diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index 230ada4803..7bfa8c6e77 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -68,12 +68,14 @@ trait FileManager extends FileUtil { else (SFile(LATEST_LIB).parent.parent / "classes" / what).toAbsolute.path } + def latestParserCBLib = relativeToLibrary("parser-combinators") + def latestXmlLib = relativeToLibrary("xml") def latestScaladoc = relativeToLibrary("scaladoc") def latestInteractive = relativeToLibrary("interactive") def latestScalapFile = relativeToLibrary("scalap") def latestPaths = List( LATEST_LIB, LATEST_REFLECT, LATEST_COMP, LATEST_PARTEST, LATEST_ACTORS, - latestScalapFile, latestScaladoc, latestInteractive + latestParserCBLib, latestXmlLib, latestScalapFile, latestScaladoc, latestInteractive ) def latestFiles = latestPaths map (p => new java.io.File(p)) def latestUrls = latestFiles map (_.toURI.toURL) diff --git a/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala b/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala index 48af261937..cf03ecb480 100644 --- a/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala +++ b/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import scala.tools.jline.console.{ ConsoleReader, CursorBuffer } +import jline.console.{ ConsoleReader, CursorBuffer } trait ConsoleReaderHelper extends ConsoleReader { def terminal = getTerminal() diff --git a/src/repl/scala/tools/nsc/interpreter/Delimited.scala b/src/repl/scala/tools/nsc/interpreter/Delimited.scala index e88a044931..b7f06f1d0a 100644 --- a/src/repl/scala/tools/nsc/interpreter/Delimited.scala +++ b/src/repl/scala/tools/nsc/interpreter/Delimited.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import scala.tools.jline.console.completer.ArgumentCompleter.{ ArgumentDelimiter, ArgumentList } +import jline.console.completer.ArgumentCompleter.{ ArgumentDelimiter, ArgumentList } class JLineDelimiter extends ArgumentDelimiter { def toJLine(args: List[String], cursor: Int) = args match { diff --git a/src/repl/scala/tools/nsc/interpreter/JLineReader.scala b/src/repl/scala/tools/nsc/interpreter/JLineReader.scala index 5d41f1bbb4..d8a876feb2 100644 --- a/src/repl/scala/tools/nsc/interpreter/JLineReader.scala +++ b/src/repl/scala/tools/nsc/interpreter/JLineReader.scala @@ -6,8 +6,8 @@ package scala.tools.nsc package interpreter -import scala.tools.jline.console.ConsoleReader -import scala.tools.jline.console.completer._ +import jline.console.ConsoleReader +import jline.console.completer._ import session._ import Completion._ @@ -42,7 +42,7 @@ class JLineReader(_completion: => Completion) extends InteractiveReader { def readOneKey(prompt: String) = { this.print(prompt) this.flush() - this.readVirtualKey() + this.readCharacter() } def eraseLine() = consoleReader.resetPromptLine("", "", 0) def redrawLineAndFlush(): Unit = { flush() ; drawLine() ; flush() } diff --git a/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala b/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala index 89998e438a..7c49b91296 100644 --- a/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala +++ b/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala @@ -46,6 +46,11 @@ class SimpleHistory extends JLineHistory { def entries(): JListIterator[JEntry] = toEntries().asJava.listIterator() def iterator: JIterator[JEntry] = toEntries().iterator.asJava + def remove(idx: Int): CharSequence = buf remove idx + def removeFirst(): CharSequence = buf remove 0 + def removeLast(): CharSequence = buf remove lastIndex + def set(idx: Int, to: CharSequence): Unit = buf(idx) = to + def current() = if (index >= 0 && index < buf.size) buf(index) else fail("current()") def previous() = (index > 0) && minusOne def next() = (index <= lastIndex) && plusOne diff --git a/src/repl/scala/tools/nsc/interpreter/session/package.scala b/src/repl/scala/tools/nsc/interpreter/session/package.scala index c62cf21151..a3d7312c98 100644 --- a/src/repl/scala/tools/nsc/interpreter/session/package.scala +++ b/src/repl/scala/tools/nsc/interpreter/session/package.scala @@ -14,10 +14,10 @@ package object session { type JIterator[T] = java.util.Iterator[T] type JListIterator[T] = java.util.ListIterator[T] - type JEntry = scala.tools.jline.console.history.History.Entry - type JHistory = scala.tools.jline.console.history.History - type JMemoryHistory = scala.tools.jline.console.history.MemoryHistory - type JPersistentHistory = scala.tools.jline.console.history.PersistentHistory + type JEntry = jline.console.history.History.Entry + type JHistory = jline.console.history.History + type JMemoryHistory = jline.console.history.MemoryHistory + type JPersistentHistory = jline.console.history.PersistentHistory private[interpreter] implicit def charSequenceFix(x: CharSequence): String = x.toString } diff --git a/src/library/scala/xml/Atom.scala b/src/xml/scala/xml/Atom.scala index 33e58ba7e7..33e58ba7e7 100644 --- a/src/library/scala/xml/Atom.scala +++ b/src/xml/scala/xml/Atom.scala diff --git a/src/library/scala/xml/Attribute.scala b/src/xml/scala/xml/Attribute.scala index e4b2b69fc6..e4b2b69fc6 100644 --- a/src/library/scala/xml/Attribute.scala +++ b/src/xml/scala/xml/Attribute.scala diff --git a/src/library/scala/xml/Comment.scala b/src/xml/scala/xml/Comment.scala index b8dccdcb16..b8dccdcb16 100644 --- a/src/library/scala/xml/Comment.scala +++ b/src/xml/scala/xml/Comment.scala diff --git a/src/library/scala/xml/Document.scala b/src/xml/scala/xml/Document.scala index 9a725014fc..9a725014fc 100644 --- a/src/library/scala/xml/Document.scala +++ b/src/xml/scala/xml/Document.scala diff --git a/src/library/scala/xml/Elem.scala b/src/xml/scala/xml/Elem.scala index 484cf98744..484cf98744 100755 --- a/src/library/scala/xml/Elem.scala +++ b/src/xml/scala/xml/Elem.scala diff --git a/src/library/scala/xml/EntityRef.scala b/src/xml/scala/xml/EntityRef.scala index 7a58831075..7a58831075 100644 --- a/src/library/scala/xml/EntityRef.scala +++ b/src/xml/scala/xml/EntityRef.scala diff --git a/src/library/scala/xml/Equality.scala b/src/xml/scala/xml/Equality.scala index 021d185812..021d185812 100644 --- a/src/library/scala/xml/Equality.scala +++ b/src/xml/scala/xml/Equality.scala diff --git a/src/library/scala/xml/Group.scala b/src/xml/scala/xml/Group.scala index e3af615008..e3af615008 100644 --- a/src/library/scala/xml/Group.scala +++ b/src/xml/scala/xml/Group.scala diff --git a/src/library/scala/xml/MalformedAttributeException.scala b/src/xml/scala/xml/MalformedAttributeException.scala index d499ad3e10..d499ad3e10 100644 --- a/src/library/scala/xml/MalformedAttributeException.scala +++ b/src/xml/scala/xml/MalformedAttributeException.scala diff --git a/src/library/scala/xml/MetaData.scala b/src/xml/scala/xml/MetaData.scala index 8b5ea187cb..8b5ea187cb 100644 --- a/src/library/scala/xml/MetaData.scala +++ b/src/xml/scala/xml/MetaData.scala diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/xml/scala/xml/NamespaceBinding.scala index b320466976..b320466976 100644 --- a/src/library/scala/xml/NamespaceBinding.scala +++ b/src/xml/scala/xml/NamespaceBinding.scala diff --git a/src/library/scala/xml/Node.scala b/src/xml/scala/xml/Node.scala index e121284252..e121284252 100755 --- a/src/library/scala/xml/Node.scala +++ b/src/xml/scala/xml/Node.scala diff --git a/src/library/scala/xml/NodeBuffer.scala b/src/xml/scala/xml/NodeBuffer.scala index ae7c7b2bf8..ae7c7b2bf8 100644 --- a/src/library/scala/xml/NodeBuffer.scala +++ b/src/xml/scala/xml/NodeBuffer.scala diff --git a/src/library/scala/xml/NodeSeq.scala b/src/xml/scala/xml/NodeSeq.scala index b8022472fb..b8022472fb 100644 --- a/src/library/scala/xml/NodeSeq.scala +++ b/src/xml/scala/xml/NodeSeq.scala diff --git a/src/library/scala/xml/Null.scala b/src/xml/scala/xml/Null.scala index f763c023c4..f763c023c4 100644 --- a/src/library/scala/xml/Null.scala +++ b/src/xml/scala/xml/Null.scala diff --git a/src/library/scala/xml/PCData.scala b/src/xml/scala/xml/PCData.scala index 31eea2b6d7..31eea2b6d7 100644 --- a/src/library/scala/xml/PCData.scala +++ b/src/xml/scala/xml/PCData.scala diff --git a/src/library/scala/xml/PrefixedAttribute.scala b/src/xml/scala/xml/PrefixedAttribute.scala index 4ab79c8677..4ab79c8677 100644 --- a/src/library/scala/xml/PrefixedAttribute.scala +++ b/src/xml/scala/xml/PrefixedAttribute.scala diff --git a/src/library/scala/xml/PrettyPrinter.scala b/src/xml/scala/xml/PrettyPrinter.scala index 9e01905357..9e01905357 100755 --- a/src/library/scala/xml/PrettyPrinter.scala +++ b/src/xml/scala/xml/PrettyPrinter.scala diff --git a/src/library/scala/xml/ProcInstr.scala b/src/xml/scala/xml/ProcInstr.scala index 189c1c6878..189c1c6878 100644 --- a/src/library/scala/xml/ProcInstr.scala +++ b/src/xml/scala/xml/ProcInstr.scala diff --git a/src/library/scala/xml/QNode.scala b/src/xml/scala/xml/QNode.scala index f9e3f1854b..f9e3f1854b 100644 --- a/src/library/scala/xml/QNode.scala +++ b/src/xml/scala/xml/QNode.scala diff --git a/src/library/scala/xml/SpecialNode.scala b/src/xml/scala/xml/SpecialNode.scala index 5fef8ef66c..5fef8ef66c 100644 --- a/src/library/scala/xml/SpecialNode.scala +++ b/src/xml/scala/xml/SpecialNode.scala diff --git a/src/library/scala/xml/Text.scala b/src/xml/scala/xml/Text.scala index debea0c025..debea0c025 100644 --- a/src/library/scala/xml/Text.scala +++ b/src/xml/scala/xml/Text.scala diff --git a/src/library/scala/xml/TextBuffer.scala b/src/xml/scala/xml/TextBuffer.scala index 514b1701af..514b1701af 100644 --- a/src/library/scala/xml/TextBuffer.scala +++ b/src/xml/scala/xml/TextBuffer.scala diff --git a/src/library/scala/xml/TopScope.scala b/src/xml/scala/xml/TopScope.scala index 474fbbbdb5..474fbbbdb5 100644 --- a/src/library/scala/xml/TopScope.scala +++ b/src/xml/scala/xml/TopScope.scala diff --git a/src/library/scala/xml/TypeSymbol.scala b/src/xml/scala/xml/TypeSymbol.scala index fb371ee340..fb371ee340 100644 --- a/src/library/scala/xml/TypeSymbol.scala +++ b/src/xml/scala/xml/TypeSymbol.scala diff --git a/src/library/scala/xml/Unparsed.scala b/src/xml/scala/xml/Unparsed.scala index bc190eb724..bc190eb724 100644 --- a/src/library/scala/xml/Unparsed.scala +++ b/src/xml/scala/xml/Unparsed.scala diff --git a/src/library/scala/xml/UnprefixedAttribute.scala b/src/xml/scala/xml/UnprefixedAttribute.scala index 6fa827da5f..6fa827da5f 100644 --- a/src/library/scala/xml/UnprefixedAttribute.scala +++ b/src/xml/scala/xml/UnprefixedAttribute.scala diff --git a/src/library/scala/xml/Utility.scala b/src/xml/scala/xml/Utility.scala index 9134476401..9134476401 100755 --- a/src/library/scala/xml/Utility.scala +++ b/src/xml/scala/xml/Utility.scala diff --git a/src/library/scala/xml/XML.scala b/src/xml/scala/xml/XML.scala index 020264e509..020264e509 100755 --- a/src/library/scala/xml/XML.scala +++ b/src/xml/scala/xml/XML.scala diff --git a/src/library/scala/xml/Xhtml.scala b/src/xml/scala/xml/Xhtml.scala index 6a12c1a89a..6a12c1a89a 100644 --- a/src/library/scala/xml/Xhtml.scala +++ b/src/xml/scala/xml/Xhtml.scala diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/xml/scala/xml/dtd/ContentModel.scala index 4007985dce..4007985dce 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/xml/scala/xml/dtd/ContentModel.scala diff --git a/src/library/scala/xml/dtd/ContentModelParser.scala b/src/xml/scala/xml/dtd/ContentModelParser.scala index 71b391c422..71b391c422 100644 --- a/src/library/scala/xml/dtd/ContentModelParser.scala +++ b/src/xml/scala/xml/dtd/ContentModelParser.scala diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/xml/scala/xml/dtd/DTD.scala index 16a824fe2c..16a824fe2c 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/xml/scala/xml/dtd/DTD.scala diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/xml/scala/xml/dtd/Decl.scala index 8bf859c460..8bf859c460 100644 --- a/src/library/scala/xml/dtd/Decl.scala +++ b/src/xml/scala/xml/dtd/Decl.scala diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/xml/scala/xml/dtd/DocType.scala index 849d560cc9..849d560cc9 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/xml/scala/xml/dtd/DocType.scala diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/xml/scala/xml/dtd/ElementValidator.scala index 4830769a7d..4830769a7d 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/xml/scala/xml/dtd/ElementValidator.scala diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/xml/scala/xml/dtd/ExternalID.scala index 880633d860..880633d860 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/xml/scala/xml/dtd/ExternalID.scala diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/xml/scala/xml/dtd/Scanner.scala index 5f9d1ccaed..5f9d1ccaed 100644 --- a/src/library/scala/xml/dtd/Scanner.scala +++ b/src/xml/scala/xml/dtd/Scanner.scala diff --git a/src/library/scala/xml/dtd/Tokens.scala b/src/xml/scala/xml/dtd/Tokens.scala index 07e888e77a..07e888e77a 100644 --- a/src/library/scala/xml/dtd/Tokens.scala +++ b/src/xml/scala/xml/dtd/Tokens.scala diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/xml/scala/xml/dtd/ValidationException.scala index 1bfae55286..1bfae55286 100644 --- a/src/library/scala/xml/dtd/ValidationException.scala +++ b/src/xml/scala/xml/dtd/ValidationException.scala diff --git a/src/library/scala/xml/dtd/impl/Base.scala b/src/xml/scala/xml/dtd/impl/Base.scala index 91ff03a93a..91ff03a93a 100644 --- a/src/library/scala/xml/dtd/impl/Base.scala +++ b/src/xml/scala/xml/dtd/impl/Base.scala diff --git a/src/library/scala/xml/dtd/impl/BaseBerrySethi.scala b/src/xml/scala/xml/dtd/impl/BaseBerrySethi.scala index f30309b037..f30309b037 100644 --- a/src/library/scala/xml/dtd/impl/BaseBerrySethi.scala +++ b/src/xml/scala/xml/dtd/impl/BaseBerrySethi.scala diff --git a/src/library/scala/xml/dtd/impl/DetWordAutom.scala b/src/xml/scala/xml/dtd/impl/DetWordAutom.scala index 6f8ba4de72..6f8ba4de72 100644 --- a/src/library/scala/xml/dtd/impl/DetWordAutom.scala +++ b/src/xml/scala/xml/dtd/impl/DetWordAutom.scala diff --git a/src/library/scala/xml/dtd/impl/Inclusion.scala b/src/xml/scala/xml/dtd/impl/Inclusion.scala index 07b6afaeba..07b6afaeba 100644 --- a/src/library/scala/xml/dtd/impl/Inclusion.scala +++ b/src/xml/scala/xml/dtd/impl/Inclusion.scala diff --git a/src/library/scala/xml/dtd/impl/NondetWordAutom.scala b/src/xml/scala/xml/dtd/impl/NondetWordAutom.scala index 0bb19a7e3e..0bb19a7e3e 100644 --- a/src/library/scala/xml/dtd/impl/NondetWordAutom.scala +++ b/src/xml/scala/xml/dtd/impl/NondetWordAutom.scala diff --git a/src/library/scala/xml/dtd/impl/PointedHedgeExp.scala b/src/xml/scala/xml/dtd/impl/PointedHedgeExp.scala index 1720604132..1720604132 100644 --- a/src/library/scala/xml/dtd/impl/PointedHedgeExp.scala +++ b/src/xml/scala/xml/dtd/impl/PointedHedgeExp.scala diff --git a/src/library/scala/xml/dtd/impl/SubsetConstruction.scala b/src/xml/scala/xml/dtd/impl/SubsetConstruction.scala index 632ca1eb18..632ca1eb18 100644 --- a/src/library/scala/xml/dtd/impl/SubsetConstruction.scala +++ b/src/xml/scala/xml/dtd/impl/SubsetConstruction.scala diff --git a/src/library/scala/xml/dtd/impl/SyntaxError.scala b/src/xml/scala/xml/dtd/impl/SyntaxError.scala index a5b8a5aba0..a5b8a5aba0 100644 --- a/src/library/scala/xml/dtd/impl/SyntaxError.scala +++ b/src/xml/scala/xml/dtd/impl/SyntaxError.scala diff --git a/src/library/scala/xml/dtd/impl/WordBerrySethi.scala b/src/xml/scala/xml/dtd/impl/WordBerrySethi.scala index 9bf3fa518b..9bf3fa518b 100644 --- a/src/library/scala/xml/dtd/impl/WordBerrySethi.scala +++ b/src/xml/scala/xml/dtd/impl/WordBerrySethi.scala diff --git a/src/library/scala/xml/dtd/impl/WordExp.scala b/src/xml/scala/xml/dtd/impl/WordExp.scala index a4bb54c1ea..a4bb54c1ea 100644 --- a/src/library/scala/xml/dtd/impl/WordExp.scala +++ b/src/xml/scala/xml/dtd/impl/WordExp.scala diff --git a/src/library/scala/xml/factory/Binder.scala b/src/xml/scala/xml/factory/Binder.scala index 947f99e6a4..947f99e6a4 100755 --- a/src/library/scala/xml/factory/Binder.scala +++ b/src/xml/scala/xml/factory/Binder.scala diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/xml/scala/xml/factory/LoggedNodeFactory.scala index bc074bfc83..bc074bfc83 100644 --- a/src/library/scala/xml/factory/LoggedNodeFactory.scala +++ b/src/xml/scala/xml/factory/LoggedNodeFactory.scala diff --git a/src/library/scala/xml/factory/NodeFactory.scala b/src/xml/scala/xml/factory/NodeFactory.scala index 94801bb554..94801bb554 100644 --- a/src/library/scala/xml/factory/NodeFactory.scala +++ b/src/xml/scala/xml/factory/NodeFactory.scala diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/xml/scala/xml/factory/XMLLoader.scala index b69f187039..b69f187039 100644 --- a/src/library/scala/xml/factory/XMLLoader.scala +++ b/src/xml/scala/xml/factory/XMLLoader.scala diff --git a/src/library/scala/xml/include/CircularIncludeException.scala b/src/xml/scala/xml/include/CircularIncludeException.scala index 351f403008..351f403008 100644 --- a/src/library/scala/xml/include/CircularIncludeException.scala +++ b/src/xml/scala/xml/include/CircularIncludeException.scala diff --git a/src/library/scala/xml/include/UnavailableResourceException.scala b/src/xml/scala/xml/include/UnavailableResourceException.scala index 47b176e0f3..47b176e0f3 100644 --- a/src/library/scala/xml/include/UnavailableResourceException.scala +++ b/src/xml/scala/xml/include/UnavailableResourceException.scala diff --git a/src/library/scala/xml/include/XIncludeException.scala b/src/xml/scala/xml/include/XIncludeException.scala index 11e1644d83..11e1644d83 100644 --- a/src/library/scala/xml/include/XIncludeException.scala +++ b/src/xml/scala/xml/include/XIncludeException.scala diff --git a/src/library/scala/xml/include/sax/EncodingHeuristics.scala b/src/xml/scala/xml/include/sax/EncodingHeuristics.scala index 57ab5ed91c..57ab5ed91c 100644 --- a/src/library/scala/xml/include/sax/EncodingHeuristics.scala +++ b/src/xml/scala/xml/include/sax/EncodingHeuristics.scala diff --git a/src/library/scala/xml/include/sax/XIncludeFilter.scala b/src/xml/scala/xml/include/sax/XIncludeFilter.scala index 3fa3beefb0..3fa3beefb0 100644 --- a/src/library/scala/xml/include/sax/XIncludeFilter.scala +++ b/src/xml/scala/xml/include/sax/XIncludeFilter.scala diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/xml/scala/xml/include/sax/XIncluder.scala index 1939fa1875..1939fa1875 100644 --- a/src/library/scala/xml/include/sax/XIncluder.scala +++ b/src/xml/scala/xml/include/sax/XIncluder.scala diff --git a/src/library/scala/xml/package.scala b/src/xml/scala/xml/package.scala index 4001cc5ffb..4001cc5ffb 100644 --- a/src/library/scala/xml/package.scala +++ b/src/xml/scala/xml/package.scala diff --git a/src/library/scala/xml/parsing/ConstructingHandler.scala b/src/xml/scala/xml/parsing/ConstructingHandler.scala index ba416e4301..ba416e4301 100755 --- a/src/library/scala/xml/parsing/ConstructingHandler.scala +++ b/src/xml/scala/xml/parsing/ConstructingHandler.scala diff --git a/src/library/scala/xml/parsing/ConstructingParser.scala b/src/xml/scala/xml/parsing/ConstructingParser.scala index 3caeddabf4..3caeddabf4 100644 --- a/src/library/scala/xml/parsing/ConstructingParser.scala +++ b/src/xml/scala/xml/parsing/ConstructingParser.scala diff --git a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala b/src/xml/scala/xml/parsing/DefaultMarkupHandler.scala index 6ec7474843..6ec7474843 100755 --- a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala +++ b/src/xml/scala/xml/parsing/DefaultMarkupHandler.scala diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/xml/scala/xml/parsing/ExternalSources.scala index bb939bca95..bb939bca95 100644 --- a/src/library/scala/xml/parsing/ExternalSources.scala +++ b/src/xml/scala/xml/parsing/ExternalSources.scala diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/xml/scala/xml/parsing/FactoryAdapter.scala index 2154bdf5ba..2154bdf5ba 100644 --- a/src/library/scala/xml/parsing/FactoryAdapter.scala +++ b/src/xml/scala/xml/parsing/FactoryAdapter.scala diff --git a/src/library/scala/xml/parsing/FatalError.scala b/src/xml/scala/xml/parsing/FatalError.scala index ab3cb2a74d..ab3cb2a74d 100644 --- a/src/library/scala/xml/parsing/FatalError.scala +++ b/src/xml/scala/xml/parsing/FatalError.scala diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/xml/scala/xml/parsing/MarkupHandler.scala index 1ebffb9c90..1ebffb9c90 100755 --- a/src/library/scala/xml/parsing/MarkupHandler.scala +++ b/src/xml/scala/xml/parsing/MarkupHandler.scala diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/xml/scala/xml/parsing/MarkupParser.scala index 3bbd136b67..3bbd136b67 100755 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/xml/scala/xml/parsing/MarkupParser.scala diff --git a/src/library/scala/xml/parsing/MarkupParserCommon.scala b/src/xml/scala/xml/parsing/MarkupParserCommon.scala index 57c1651558..57c1651558 100644 --- a/src/library/scala/xml/parsing/MarkupParserCommon.scala +++ b/src/xml/scala/xml/parsing/MarkupParserCommon.scala diff --git a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/xml/scala/xml/parsing/NoBindingFactoryAdapter.scala index 56ac185f47..56ac185f47 100644 --- a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala +++ b/src/xml/scala/xml/parsing/NoBindingFactoryAdapter.scala diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/xml/scala/xml/parsing/TokenTests.scala index 8dd9cdfaa3..8dd9cdfaa3 100644 --- a/src/library/scala/xml/parsing/TokenTests.scala +++ b/src/xml/scala/xml/parsing/TokenTests.scala diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/xml/scala/xml/parsing/ValidatingMarkupHandler.scala index 1b20901249..1b20901249 100644 --- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/src/xml/scala/xml/parsing/ValidatingMarkupHandler.scala diff --git a/src/library/scala/xml/parsing/XhtmlEntities.scala b/src/xml/scala/xml/parsing/XhtmlEntities.scala index 3683af202c..3683af202c 100644 --- a/src/library/scala/xml/parsing/XhtmlEntities.scala +++ b/src/xml/scala/xml/parsing/XhtmlEntities.scala diff --git a/src/library/scala/xml/parsing/XhtmlParser.scala b/src/xml/scala/xml/parsing/XhtmlParser.scala index 6ce5bec8d0..6ce5bec8d0 100644 --- a/src/library/scala/xml/parsing/XhtmlParser.scala +++ b/src/xml/scala/xml/parsing/XhtmlParser.scala diff --git a/src/library/scala/xml/persistent/CachedFileStorage.scala b/src/xml/scala/xml/persistent/CachedFileStorage.scala index a1489ef3f4..a1489ef3f4 100644 --- a/src/library/scala/xml/persistent/CachedFileStorage.scala +++ b/src/xml/scala/xml/persistent/CachedFileStorage.scala diff --git a/src/library/scala/xml/persistent/Index.scala b/src/xml/scala/xml/persistent/Index.scala index 9ee45e7086..9ee45e7086 100644 --- a/src/library/scala/xml/persistent/Index.scala +++ b/src/xml/scala/xml/persistent/Index.scala diff --git a/src/library/scala/xml/persistent/SetStorage.scala b/src/xml/scala/xml/persistent/SetStorage.scala index 8db56a2e71..8db56a2e71 100644 --- a/src/library/scala/xml/persistent/SetStorage.scala +++ b/src/xml/scala/xml/persistent/SetStorage.scala diff --git a/src/library/scala/xml/pull/XMLEvent.scala b/src/xml/scala/xml/pull/XMLEvent.scala index 3beb3648e7..3beb3648e7 100644 --- a/src/library/scala/xml/pull/XMLEvent.scala +++ b/src/xml/scala/xml/pull/XMLEvent.scala diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/xml/scala/xml/pull/XMLEventReader.scala index 76e51e17fd..76e51e17fd 100755 --- a/src/library/scala/xml/pull/XMLEventReader.scala +++ b/src/xml/scala/xml/pull/XMLEventReader.scala diff --git a/src/library/scala/xml/pull/package.scala b/src/xml/scala/xml/pull/package.scala index 0e3019446b..0e3019446b 100644 --- a/src/library/scala/xml/pull/package.scala +++ b/src/xml/scala/xml/pull/package.scala diff --git a/src/library/scala/xml/transform/BasicTransformer.scala b/src/xml/scala/xml/transform/BasicTransformer.scala index c98339fd67..c98339fd67 100644 --- a/src/library/scala/xml/transform/BasicTransformer.scala +++ b/src/xml/scala/xml/transform/BasicTransformer.scala diff --git a/src/library/scala/xml/transform/RewriteRule.scala b/src/xml/scala/xml/transform/RewriteRule.scala index 1399ee538d..1399ee538d 100644 --- a/src/library/scala/xml/transform/RewriteRule.scala +++ b/src/xml/scala/xml/transform/RewriteRule.scala diff --git a/src/library/scala/xml/transform/RuleTransformer.scala b/src/xml/scala/xml/transform/RuleTransformer.scala index 3a222ba759..3a222ba759 100644 --- a/src/library/scala/xml/transform/RuleTransformer.scala +++ b/src/xml/scala/xml/transform/RuleTransformer.scala diff --git a/test/partest b/test/partest index 99a731a49b..0259cdb791 100755 --- a/test/partest +++ b/test/partest @@ -64,7 +64,7 @@ if [ -z "$EXT_CLASSPATH" ] ; then fi done elif [ -f "$SCALA_HOME/build/pack/lib/scala-partest.jar" ] ; then - for lib in `echo "scala-partest scala-library scala-reflect scala-compiler diffutils"`; do + for lib in `echo "scala-partest scala-library scala-parser-combinators scala-xml scala-reflect scala-compiler diffutils"`; do ext="$SCALA_HOME/build/pack/lib/$lib.jar" if [ -z "$EXT_CLASSPATH" ] ; then EXT_CLASSPATH="$ext" |