summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'base-2.8.x-2.9.x-2.10.x' into 2.8.x2.8.xPaul Phillips2012-02-081-1/+4
|\
| * Remove alphanumeric characters from the major part of the Scala version number.Iulian Dragos2012-02-081-1/+4
| | | | | | | | | | | | In practice, this removes the 'v' in v2.10.0-M1-0168-g99844ebc10-2012-02-08. Why is this important, you ask? Many tools assume the version number to be composed of 3 numbers and a string qualifier. Eclipse is one of the tools that validates version numbers, and this string is used to stamp Scala IDE builds against Scala nightlies.
* | Merge branch 'fix-script' into 2.8.xPaul Phillips2012-02-041-16/+33
|\|
| * Establish more baseline tags.Paul Phillips2012-02-041-13/+18
| | | | | | | | So we can turn out a build string regardless of local conditions.
| * Time-traveled get-scala-revision to 3-way merge base.Paul Phillips2012-02-041-16/+28
| |
* | Merge branch 'publish-fix' into 2.8.xPaul Phillips2012-02-031-20/+2
|\| | | | | | | | | Conflicts: tools/epfl-publish
| * Fix 2.9.2 scaladoc replacing nightlies in jenkinsVlad Ureche2012-02-031-2/+2
| |
| * Injecting epfl-publish into merge-base.Paul Phillips2012-02-031-0/+32
| |
* | Merge branch 'dec10-version-string' into 2.8.xPaul Phillips2011-12-122-34/+50
|\| | | | | | | | | Conflicts: build.xml
| * More build.xml massaging.Paul Phillips2011-12-122-17/+51
| | | | | | | | | | Backporting auto starr download to 2.8.x and 2.9.x build.xmls. Trying to get build strings consistent.
* | Merge branch 'dec10-version-string' into 2.8.xPaul Phillips2011-12-121-4/+6
|\|
| * Tweaking build string some more.Paul Phillips2011-12-121-4/+6
| | | | | | | | | | | | Reintroduced date and an "r" to meet IDE needs. Moved reference commit backward to accomodate 2.8.x. Merging changes into 2.8.x, 2.9.x, and master.
* | Merge branch 'dec10-version-string' into 2.8.xPaul Phillips2011-12-121-3/+3
|\|
| * More on get-scala-revision.Paul Phillips2011-12-121-3/+3
| | | | | | | | | | | | Now that I've resorted to building git 1.5.4, I can stop trying to reverse engineer it through jenkins. This implementation feels winnerish.
* | Merge branch 'common' into 2.8.xPaul Phillips2011-12-091-0/+22
|\|
| * Hardening get-scala-version.Paul Phillips2011-12-091-0/+22
| | | | | | | | | | | | | | | | | | Reimplementing without git-describe to harden against old gits and make any kind of reference tag unnecessary. Conflicts: tools/get-scala-revision
* | Merge branch 'common-build-script' into 2.8.xPaul Phillips2011-12-091-2/+15
|\ \
| * | Making path to settings.xml configurable.Paul Phillips2011-12-091-3/+8
| | | | | | | | | | | | Environment variable maven_settings.
| * | Boiling more logic out of jenkins.Paul Phillips2011-12-091-2/+10
| | | | | | | | | | | | | | | | | | Offer explicit settings.xml path for maven if some specific hardcoded path exists, don't otherwise. At least it's in one place where we can keep an eye on it.
* | | Merge branch 'common-build-script' into 2.8.xPaul Phillips2011-12-092-18/+23
|\| |
| * | Swimming with the jenkins current.Paul Phillips2011-12-092-18/+23
| | | | | | | | | | | | Configuring via environment variables.
* | | Merge branch 'common-build-script' into 2.8.xPaul Phillips2011-12-092-0/+60
|\| |
| * | Separated build and publish scripts.Paul Phillips2011-12-093-35/+60
| | | | | | | | | | | | Unified further with build options.
| * | Unified 2.8.x and 2.9.x build scripts.Paul Phillips2011-12-091-8/+13
| | |
| * | Moved jenkins build script.Paul Phillips2011-12-091-0/+30
| |/ | | | | | | Out of jenkins and into version control.
* | Unified 2.8.x and 2.9.x build scripts.Paul Phillips2011-12-091-8/+13
| |
* | Moved jenkins build script.Paul Phillips2011-12-091-0/+30
| | | | | | | | Out of jenkins and into version control.
* | Backport of r26028.Antonio Cunei2011-11-181-0/+14
| |
* | Backport of 26012,26013.Antonio Cunei2011-11-161-2/+14
| |
* | Backported r25904 and r25959.Antonio Cunei2011-11-074-4/+26
| |
* | Backport of r25948Antonio Cunei2011-11-07684-3486/+7260
| |
* | Manually Backported r25899.Iulian Dragos2011-11-011-15/+17
| |
* | Backport of r25890Antonio Cunei2011-10-271-38/+64
| |
* | Port of MurmurHash to 2.8.xAntonio Cunei2011-10-271-0/+196
| |
* | Backport of part of r24162 (MutableSettings.sca...Antonio Cunei2011-10-191-0/+1
| | | | | | | | | | Backport of part of r24162 (MutableSettings.scala), as requested by Luc.
* | Merged revisions 25817 via svnmerge from Iulian Dragos2011-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r25817 | dragos | 2011-10-11 11:58:13 +0200 (Tue, 11 Oct 2011) | 1 line Presentation compiler: let ShutdownReq propagate from the background compiler, and don't mark a unit as crashed in that case. ........
* | backport of 25800,25801Antonio Cunei2011-10-072-5/+8
| |
* | backport of r25739Antonio Cunei2011-09-271-1/+1
| |
* | Version number -> 2.8.3 alphaAntonio Cunei2011-09-273-5/+5
| |
* | Version number: 2.8.2.RC3 -> 2.8.2.finalv2.8.2Antonio Cunei2011-09-263-4/+4
| |
* | Backport of r25661 and r25664.Antonio Cunei2011-09-163-9/+56
| |
* | 2.8.2.RC2 -> RC3Antonio Cunei2011-09-163-4/+4
| |
* | Backport of r25625 and r25596.Antonio Cunei2011-09-162-7/+58
| |
* | Version number: 2.8.2.RC1 -> 2.8.2.RC2Antonio Cunei2011-09-073-4/+4
| |
* | Backport of r23893.Antonio Cunei2011-09-077-17/+83
| |
* | Changes for 2.8.xAntonio Cunei2011-07-262-2/+1
| |
* | Merged revisions 24466,25252 via svnmerge from Antonio Cunei2011-07-264-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24466 | phaller | 2011-03-15 17:42:00 +0100 (Tue, 15 Mar 2011) | 1 line Closes #3838. Review by prokopec. ........ r25252 | phaller | 2011-07-07 19:32:31 +0200 (Thu, 07 Jul 2011) | 1 line Fixes SI-4759 ........
* | Added missing jar.Iulian Dragos2011-07-151-0/+1
| |
* | Merged revisions 24691 via svnmerge from Iulian Dragos2011-07-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24691 | dragos | 2011-04-05 19:03:51 +0200 (Tue, 05 Apr 2011) | 1 line Forgot a import in the last commit. no review. ........
* | Merged revisions 24689 via svnmerge from Iulian Dragos2011-07-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24689 | dragos | 2011-04-05 18:19:45 +0200 (Tue, 05 Apr 2011) | 3 lines Wrapped exceptions coming from calls to 'ask' in a FailedException. This allows to get a stack trace from both the presentation compiler thread and the calling thread. review by odersky. ........
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 18:09:21 +0000