summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Tagged builds now display tag version. (maven = canonical).v2.9.2-RC3v2.9.2Josh Suereth2012-03-301-20/+34
|
* Backport fix for SI-4545, SI-5633.Paul Phillips2012-03-301-2/+2
|
* Minimal version of final-field patch.Paul Phillips2012-03-281-2/+3
| | | | Just enforce no ACC_FINAL except on eager vals.
* Merge pull request #330 from dcsobral/backport/SI-4750v2.9.2-RC2Josh Suereth2012-03-263-2/+41
|\ | | | | Backport SI-4750
| * Document regex replacement strings behavior.Daniel C. Sobral2012-03-263-2/+41
| | | | | | | | | | | | | | | | | | All replacement methods use dolar signs to identify groups in the matched string, and backslashes to escape characters. Document this behavior, and provide a method that can be used to properly quote replacement strings when this behavior is not desired. Closes SI-4750.
* | Added latest link for sources so we can include them in distributions.Josh Suereth2012-03-261-1/+15
|/
* Merge pull request #327 from retronym/backport/large-scope-soeJosh Suereth2012-03-261-13/+27
|\ | | | | Backport/large scope soe
| * Fixed stackoverflow problem when initializing large scopes.Martin Odersky2012-03-251-13/+27
|/ | | | Cherry pick of 09b1a31309c9cbf1394c317b87d2073d39a8cd56
* Merge branch '2.9.x' of github.com:scala/scala into 2.9.xJosh Suereth2012-03-2415-109/+92
|\
| * Merge pull request #324 from jsuereth/2.9.x-distroJosh Suereth2012-03-236-57/+10
| |\ | | | | | | 2.9.x distro
| | * Removed git from source repo generation.Josh Suereth2012-03-231-0/+1
| | |
| | * Updated README for latest installationsJosh Suereth2012-03-231-10/+4
| | |
| | * No longer generate SBAZ documentation as part of distribution.Josh Suereth2012-03-231-1/+1
| | |
| | * disable version numbers on windows, they're broken.Lukas Rytz2012-03-231-2/+0
| | |
| | * Yet another attempt to make the version a good oneJosh Suereth2012-03-234-44/+4
| |/ | | | | | | | | This fixes the git commit drift issue and gives us enough granularity to make releases at any time that are cronologically increasing.
| * Remove unnecessary method.Paul Phillips2012-03-211-4/+0
| |
| *-. Merge remote-tracking branches 'retronym/backport/4895', ↵Paul Phillips2012-03-213-3/+3
| |\ \ | | | | | | | | | | | | 'retronym/backport/fork-join-detection-jdk-1.7' and 'matthewfarwell/si-4771-scala-eats-exit-code' into develop-2.9.x
| | | * Fix for si-4771 Scala eats exit code when piping stdinMatthew Farwell2012-03-211-1/+1
| | | |
| | * | Changes the fork join pool detection for JVM1.7...Aleksandar Pokopec2012-03-212-2/+2
| | |/ | | | | | | | | | | | | | | | | | | Changes the fork join pool detection for JVM1.7, for actors and parallel collections libraries. Review by phaller.
| * / Fixes #4895.Aleksandar Pokopec2012-03-213-2/+28
| |/ | | | | | | | | | | The size map size computation for parallel hash sets was invalid. No review.
| * Merge pull request #285 from jsuereth/make-release-notesJosh Suereth2012-03-191-0/+49
| |\ | | | | | | Make release notes
| | * First cut at a release notes tool to help generate them.Josh Suereth2012-03-161-0/+49
| | |
| * | Merge pull request #287 from jsuereth/fix-version-on-tagJosh Suereth2012-03-194-53/+12
| |\ \ | | |/ | |/| Fix version on tag
| | * Fixed versioning scheme when running on a tag.Josh Suereth2012-03-194-53/+12
| |/ | | | | | | git describe is useless in that situation, afaict.
* / Scaladoc is now pointing to sources in githubVlad Ureche2012-03-243-5/+20
|/ | | | | | | | | | | | | | For snapshots, it points to the exact commit, for releases it points to the tag ("v" + maven version). The link now opens in a different tab, as opening in the same frame is not compatible with github (the page doesn't load for some reason). Left the repo url in test/review untouched because it points to the root of all LAMP repos. But... is anyone still using that script?!? Conflicts: build.xml
* Merge pull request #271 from jsuereth/2.9.x-version-fixinv2.9.2-RC1Josh Suereth2012-03-1611-55/+206
|\ | | | | 2.9.x version fixin
| * Fixed sha to not have the 'g' for git.Josh Suereth2012-03-162-2/+3
| | | | | | | | Swapped 'r' to 'v' now that I've had more coffee and sleep.
| * Fixed maven deployment issues for new versioning scheme.Josh Suereth2012-03-162-15/+20
| |
| * Finished migrating to new versioning schemeJosh Suereth2012-03-169-52/+155
| |
| * properties loading is now maven/osgi version aware. yippie.Josh Suereth2012-03-141-14/+13
| |
| * Modified build for new versioning scheme.Josh Suereth2012-03-143-3/+10
| |
| * Moved to Mirco's versioning idea.Josh Suereth2012-03-142-6/+19
| |
| * Fixes to build numbering system for 2.9.x releaseJosh Suereth2012-03-144-9/+32
| |
* | Fix for a bug in CharArrayReader which made tri...Paul Phillips2012-03-144-5/+35
| | | | | | | | | | | | | | | | | | Fix for a bug in CharArrayReader which made triple quoted strings fail to parse sometimes. Note: when the temptation strikes to adjust for special cases by letting the regular case happen and subsequently attempting to fix the ball of mutation by selectively applying what seems like the inverse operation, please consider the possibility that this is not the optimal approach. Closes SI-4785, no review.
* | Merge pull request #253 from rjmac/backport/4835Josh Suereth2012-03-143-2/+53
|\ \ | |/ |/| Backport/4835
| * Remove source-compatibility-breaking parenthesesRobert J. Macomber2012-03-141-1/+1
| |
| * Add test case for SI-4835 (https://issues.scala-lang.org/browse/SI-4835)Kota Mizushima2012-03-022-0/+45
| | | | | | | | | | | | This test case only confirm that StreamIterator's lazyiness is not broken. Test case about memory consumption could be created. However, such a test cause a greatly increased time of test.
| * * Fixed SI-4835 (https://issues.scala-lang.org/browse/SI-4835).Kota Mizushima2012-03-021-3/+9
| | | | | | | | | | | | | | Conflicts: src/library/scala/collection/immutable/Stream.scala - removed inheritance from AbstractIterator
* | Fix for checkfile difference.Paul Phillips2012-03-081-1/+2
| |
* | Revert attempt to limit private types in lubs.Paul Phillips2012-03-084-1/+84
| | | | | | | | | | | | | | | | | | | | Has to be somewhere more directly tied to structural refinements. See run/lub-visibility.scala before/after output for motivation. Closes SI-5534. Conflicts: src/compiler/scala/tools/nsc/symtab/Types.scala
* | Fix deadlocks occurring during presentation compiler shutdown.Iulian Dragos2012-03-062-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | During shutdown, other threads can still post work items on the work queue. They will never be serviced, leading to clients waiting forever. The fix is to replace the implementation of the queue with a 'always fail' implementation during shutdown. Review by @odersky.(cherry picked from commit 53fb61cba9f02c176f1aae80f0b270491fbbf91c) (removed the test because there are no presentation compiler tests in 2.9.x and it depends on test infrastructure that is not in place). Conflicts: src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
| |
| \
*-. \ Merge remote-tracking branches ↵Paul Phillips2012-03-053-5/+19
|\ \ \ | | | | | | | | | | | | 'szabolcsberecz/backports/fix-specialized-tests' and 'szabolcsberecz/backports/SI-5380' into develop-2.9.x
| | * | Fixes SI-5380: non-local return of try expressionSzabolcs Berecz2012-03-032-3/+14
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 02e260a8e67e2b2b6f876aafe76cd61248a89374) Conflicts: src/compiler/scala/tools/nsc/transform/UnCurry.scala Lift only *non-local* returns of try expressions. (cherry picked from commit edf3ae0b8c3688b5cacbe2f7e2ae826f5fbb7644) Conflicts: src/compiler/scala/tools/nsc/transform/UnCurry.scala
| * / Fixed instrumented.jar and scalacheck.jar locationSzabolcs Berecz2012-03-031-2/+5
| |/ | | | | | | | | | | | | | | | | | | Depending on the file order in the directory, PathSettings.srcSpecLib could end up as "instrumented.jar.desired.sha1" instead of "instrumented.jar" which would cause all the specialized tests to fail. The same goes for scalacheck.jar (cherry picked from commit 35934129f2593816c3d9a0a5d5786737868fed6c)
* | Merge pull request #258 from dragos/2.9.xJosh Suereth2012-03-036-15/+81
|\ \ | | | | | | Fix for cps regression.
| * | Fix for cps regression. Closes 5538. Closes 5445.Tiark Rompf2012-03-036-15/+81
|/ / | | | | | | (cherry picked from commit 9f5767dd31395cac0bc64c86c2cacf247b1924fa)
* / Fixed type in maven deployJosh Suereth2012-03-031-1/+1
|/
* Fixes NPE using iterator with an XML attribute ...Paul Phillips2012-03-015-4/+32
| | | | | | | | Fixes NPE using iterator with an XML attribute being null or None ) (SI-5052 Also fixes incorrect size method (SI-5115 ) Contributed by Jordi Salvat i Alabart. Closes SI-5052, SI-5115, no review.
* Fixing missing , because I'm an idiotJosh Suereth2012-03-011-1/+1
|
* Fixed nightly target to include all documentationJosh Suereth2012-03-011-1/+1
|