summaryrefslogtreecommitdiff
path: root/project
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-052-5/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'refs/pull/1574/head': (24 commits) Fixing issue where OSGi bundles weren't getting used for distribution. Fixes example in Type.asSeenFrom Fix for SI-6600, regression with ScalaNumber. SI-6562 Fix crash with class nested in @inline method Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013 Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013 SI-6606 Drops new icons in, replaces abstract types placeholder icons SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings Labeling scala.reflect and scala.reflect.macros experimental in the API docs Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later SI-6399 Adds API docs for Any and AnyVal Removing actors-migration from main repository so it can live on elsewhere. Fix for SI-6597, implicit case class crasher. SI-6578 Harden against synthetics being added more than once. SI-6556 no assert for surprising ctor result type Removing actors-migration from main repository so it can live on elsewhere. Fixes SI-6500 by making erasure more regular. Modification to SI-6534 patch. Fixes SI-6559 - StringContext not using passed in escape function. ... Conflicts: src/actors-migration/scala/actors/migration/StashingActor.scala src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala src/compiler/scala/tools/nsc/settings/AestheticSettings.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/library/scala/Application.scala src/library/scala/collection/immutable/GenIterable.scala.disabled src/library/scala/collection/immutable/GenMap.scala.disabled src/library/scala/collection/immutable/GenSeq.scala.disabled src/library/scala/collection/immutable/GenSet.scala.disabled src/library/scala/collection/immutable/GenTraversable.scala.disabled src/library/scala/collection/mutable/GenIterable.scala.disabled src/library/scala/collection/mutable/GenMap.scala.disabled src/library/scala/collection/mutable/GenSeq.scala.disabled src/library/scala/collection/mutable/GenSet.scala.disabled src/library/scala/collection/mutable/GenTraversable.scala.disabled src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled
| * Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-11-011-2/+2
| | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
| * Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-301-3/+2
| | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
* | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2012-09-044-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Eugene Burmako (10) and others # Via Josh Suereth (10) and Paul Phillips (9) * origin/2.10.x: (32 commits) Removing duplication from Duration. Fixed positions in de-aliased special symbols and for automatically added `apply` methods. Fixes SI-6285 - ParIterableLike no longer says sequential foreach. SI-6274 Fix owners when eta-expanding function with byName param Fixes typos in the ScalaDoc of StringContext Allow nested calls to `askForResponse` in the presentation compiler. Made Dynamic extend Any. Fix for SI-6273, repl string interpolation. Formatting cleanup in def typed. Better errors for Any/AnyRef issues. Fix for SI-6263, futile adaptation. Suppressed 'possible cause' mis-warning. Fix for SI-6034, covariant value classes. Fixes SI-6290 by creating real instnaces of language features. SBT build now works with SBT 0.12. Removed previosuly uncommented code, added more diagnosis output to REPL. Made instrumenter more robust by looking at tokens Removed dead code. Two fixes for the worksheet instrumenter Fix SI-6294. ...
| * SBT build now works with SBT 0.12.Josh Suereth2012-08-314-8/+8
| | | | | | | | Also fixed partest explosion that happened after partest redesign.
* | Fix SBT sha resolution for new * in sha files.Josh Suereth2012-08-311-0/+1
|/
* some more copyright cleanup for 2012Adriaan Moors2012-08-101-1/+1
| | | | contributed by Carlo Dapor -- thanks!
* Final clean up to get the build/testing working again.Josh Suereth2012-06-184-37/+82
|
* More fixups.Josh Suereth2012-06-143-17/+22
|
* Refactoring and temporary commit before finishing the fix.Josh Suereth2012-06-138-253/+290
|
* Fix for reflection. Review/Use by @adriaanmJosh Suereth2012-06-123-14/+53
|
* Added lock by default and did a minor amount of cleanup. More to come ↵Josh Suereth2012-05-232-58/+40
| | | | hopefully.
* ASM now compiled once in the build.Josh Suereth2012-05-232-12/+15
| | | | | | | | * Moved ASM sources to src/asm * New ant task builds asm *ONCE*. Build times improve by a few seconds * Fixed SBT build for new asm location. SBT build still broken from actors-migration and partest Review by @magarciaEPFL
* Fixed issue where forkjoin analysis bombed with incompatible class change ↵Josh Suereth2012-05-221-2/+4
| | | | exception.
* Don't regenerate properties file if skip is true (i.e. locker/quick is locked)Josh Suereth2012-05-102-4/+4
|
* Everything now builds. Partest is bombing about reflection issue.Josh Suereth2012-05-103-153/+5
|
* Merge remote-tracking branch 'jsuereth/sbt-build' into sbt-build-0.11.3Josh Suereth2012-05-107-109/+303
|\
| * Added an incredibly hacky way for us to override the default sbt compiler ↵Josh Suereth2012-04-032-1/+149
| | | | | | | | interface.
| * Fixed up versioning scheme.Josh Suereth2012-04-035-114/+51
| | | | | | | | SBT build should now mimic ant build for versions.
| * Fixed build for 0.11.x again. Working on bringing version properties file ↵Josh Suereth2012-04-034-3/+112
| | | | | | | | up to par.
* | Fixed plugin dependencies.Josh Suereth2012-05-101-1/+1
| |
* | Good-bye, scala.dbc.Paul Phillips2012-04-201-7/+5
|/ | | | Another deprecated soul passes on to ether world.
* Changing URLs for svn and issue tracking.Vojin Jovanovic2012-03-231-2/+2
| | | | Review by: @jsuereth
* Making sbt build work.v2.10.0-M1Paul Phillips2012-01-182-7/+7
|
* All projects can be locked now.Josh Suereth2011-12-291-1/+6
| | | | | * Added 'lock' key to write 'compile.lock' file to target dir. * Added 'unlock' key to delete 'compile.lock' file to target dir.
* Brought version detection up-to-date.Josh Suereth2011-12-162-19/+21
| | | | * SBT's version creation is now on par with tools/get-latest-version
* Native SHA1 calculations.Josh Suereth2011-12-141-8/+52
| | | | | * SHA1 sum calculations are now done in pure Scala. * Cache jar SHAs are checked for validity.
* Fixes windows issues.Josh Suereth2011-12-141-1/+1
|
* Improved error output.Josh Suereth2011-12-141-2/+9
| | | | * One SHA resolve, now outputs lots of stack traces if parallel execution failure.
* Parallelize sha resolution.Josh Suereth2011-12-091-1/+1
| | | | | Retreiving STARR from SHA repo is now parallel by default. YAY for parallel collections.
* MSIL now part of layered compilesJosh Suereth2011-12-092-19/+8
| | | | | | | * The MSIL source code is now built at every layer as part of the compiler project. * The MSIL project is completely removed from other references.
* Fixed SHA resolver to only pull necessary JAR files and ignore other ↵Josh Suereth2011-12-081-1/+2
| | | | directories.
* Added local cache for project jars.Josh Suereth2011-12-081-10/+18
| | | | | | | .desired.sha1 files now resolve into a local repository before being copied into the main repo. If the local repository exists and has a file, then there is no download necessary.
* Fixed publish issue.Josh Suereth2011-12-062-44/+35
| | | | | | | | * Cleaned up layered build settings definition * Removed scalaVersion specification from build (not NEEDED). * Fixed a migration from build.sbt to project/Build.scala where publish settings were only being used on the root project and not also used for sub-projects which are published.
* Adding SHA resolve to the SBT build so that we don't need the push/pull ↵Josh Suereth2011-12-053-2/+61
| | | | binary libs script anymore. Only pull is implemented.
* *.properties files are now generated more oftenJosh Suereth2011-12-051-3/+11
| | | | (on git SHA change *and* clean instead of just clean)
* Fixed mechanisms which pulls scala revision for properties file.Josh Suereth2011-12-052-3/+7
|
* Step one towards using project revision to buildJosh Suereth2011-12-055-17/+31
|
* Port of SBT 0.11.x build. Things appear to be working well.Josh Suereth2011-12-0125-1875/+1020
|
* Begone t1737...Hubert Plociniczak2011-11-0215-135/+135
|
* Confusingly, I am restoring the method "getArch...Paul Phillips2011-05-141-1/+1
| | | | | | | | Confusingly, I am restoring the method "getArchive" which has been gone from trunk since February 2010 but is suddenly necessary for the sbt build (as its "compiler-interface" won't compile without it.) I am sure it all makes perfect sense. No review.
* fix get-scala-revision script for the case when...Lukas Rytz2011-03-301-1/+1
| | | | | | fix get-scala-revision script for the case when svn prints some warnings. no review
* Don't have time to fix the sbt build and can't ...Paul Phillips2011-02-041-22/+36
| | | | | | Don't have time to fix the sbt build and can't keep watching it fail. Commented test out liberally. No review.
* A bunch of work on the sbt build. No review.Paul Phillips2011-01-2711-150/+197
|
* Securing some of the blessings of whitespace fo...Paul Phillips2011-01-2714-393/+405
| | | | | | Securing some of the blessings of whitespace for the sbt build. No review.
* Updated copyright notices to 2011Antonio Cunei2011-01-201-1/+1
|
* Added 'specialized' tests.Aleksandar Pokopec2011-01-171-1/+2
| | | | | | | | | | Added a new test group - specialized. Modified partest to add a jar with instrumented classes to classpath when compiling and running tests. Added a primary version of the instrumented BoxesRuntime, and a script to produce a jar for it. Added the 'speclib' folder to partest files, which contains the jar with the instrumented classes. Review by dragos.
* Bencharking a larger program with parallel coll...Aleksandar Pokopec2010-12-211-4/+3
| | | | | | | | | Bencharking a larger program with parallel collections. Fixed a couple of bugs in parallel collections. No review.
* Added secret option to sbt build which makes it...Paul Phillips2010-12-161-1/+9
| | | | | | Added secret option to sbt build which makes it only recompile changed files. No review.
* Couldn't bear to see sbt seemingly so close but...Paul Phillips2010-09-141-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Couldn't bear to see sbt seemingly so close but still unable to run tests. Made some progress but bogged down in scalacheck when I realized things were farther from working than I'd thought. Please forgive this brief expression of frustration, because the despair is palpable: the weeks of work I did on partest was apparently of no interest, and now I'm in here having to fix the same partest bugs again, in a more virulent form. They've evolved into some kind of ant-partest-sbt artificial creature, more fearsome than any one of them could be under its own power. Did we not know we have a whole directory full of pretty code like this? List( "Scala compiler classes in: " + testBuildDir, "Scala version is: " + nsc.Properties.versionMsg, "Scalac options are: " + universe.scalacOpts, "Java binaries in: " + javaBin, "Java runtime is: " + javaInfoString, "Java runtime options: " + (Process.javaVmArguments mkString " "), "Javac options are: " + universe.javacOpts, "Java options are: " + universe.javaOpts, "Source directory is: " + src, "Selected categories: " + (selectedCategories mkString " "), "" ) mkString "\n" It's src/partest-alternative in case anyone wants to consider any of it. At the very least there are individual files or functions which could be cherry picked. -- This patch contains: -- Readability efforts. Twelve parameter functions whose last six parameters are "true,true,failedOnly,true,false,log" are pretty challenging to work with. Changes to the environment variables sbt was setting to look a bit more like what partest expects and will crash without. Sets partest.debug=true if the sbt logger level is at Debug. On my machine all test groups except scalacheck appear to run to completion. Review by moix. (Hello, moix! I am available for assistance if you are in the market for it. You have brought us long suffering ant-ers to the brink of sbt goodness: and now, we enter the fray!)
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 09:56:36 +0000