Commit Graph

513 Commits

Author SHA1 Message Date
extempore 7d8efa7feb Switched from ignoring nonexistent directory to creating an empty
one to accomodate old underpowered versions of ant.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23524 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-11-16 06:01:44 +00:00
extempore 5344437581 ant, build.xml and classpath issues. It looks like everyone has
been ignoring their painstakingly set classpaths and using whatever
they can find in the vicinity of the scala script, which works OK
for pack but not so well for quick.

I also added a build.xml feature so you can drop jars into a dir and
have them automatically used everywhere.  The directory is lib/extra.
Pro tip: add lib/extra to .gitignore and put jars like
yjp-controller-api-redist.jar in there.

Closes #3706, no review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23523 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-11-16 05:03:50 +00:00
plocinic 9ee168931f Enable test directories for 'run'. Review by phaller
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23436 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-11-02 00:15:24 +00:00
prokopec 9a2266d582 Added more complete output if tests fail.
Log file is printed now right away if:
- test fails due to an exception thrown in the a test
- test fails due to a ScalaCheck test fail
- test fails due to compiler errors in ScalaCheck tests
Review by extempore.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23216 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-10-08 14:42:45 +00:00
extempore 06126218dd Fixed build.xml so scalacheck won't fail to compile anytime there
are partial build artifacts.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23211 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-10-07 06:47:00 +00:00
prokopec 7cd12014a7 Adding immutable parallel hashsets.
Fixing an issue with hashset splitters where the splitting does not work if some elements have already been iterated.
Added parallel collections exception handling.
Added parallel collections break control.
Renaming ParHashTrie -> ParHashMap.
The part with immutable.{HashSet, HashMap} - review by rompf

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23200 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-10-05 16:22:21 +00:00
prokopec 93253a1b8a Fixed a scalacheck test group "test entire subdirectory" problem. It's now possible to add scalacheck tests consisting of multiple files. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23183 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-10-04 14:05:35 +00:00
extempore b6421898b4 While trying to come to an understanding with #3869 I had one of
those "what are we doing" moments regarding the reams of output
generated under -Ydebug.  We have all these places where extra
info is logged under -Ydebug -- like "if (debug) log(...)" -- and if
you try for those you are also saddled with all these irrelevant places
which instead say if (debug) Console.println(...).

I changed about every one of them to send it to log() instead.
So if you were enjoying that 600 MB of debugging output when you compile
"goodbye world", you can have it back and then some with -Ylog:all.
Until then, enjoy the calm, quiet competence of the new -Ydebug.

Also herein: raised default ANT_OPTS permgen because I can no longer
build a dist with the former defaults, and gave some synthetics a better
home in StdNames.

No review (but if anyone just can't live without some particular
piece of output every single time -Ydebug is given, I can put it back.)

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23158 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-09-30 20:52:47 +00:00
dubochet aa5c51fba7 [scaladoc] Adds some simple tests for Scaladoc (using Scalacheck). Contributed by Kato Kazuyosh. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23051 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-09-21 12:42:12 +00:00
rytz ba4299f606 updated default ANT_OPTS for more speed. no review
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22930 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-09-03 14:20:04 +00:00
prokopec b3b27e5b88 Added ant tasks for strap that build scalacheck.
No review yet.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22873 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-08-31 15:53:11 +00:00
prokopec 43aa9d7593 Added scalacheck folder, scalacheck source update script, and scalacheck ant tasks.
Build process will now generate a scalacheck jar in the build/pack/lib directory. It generates it from the scalacheck source in the src/scalacheck dir. If the source there gets out of date, it is to be updated manually using the tools/updatescalacheck script.

Review by phaller.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22868 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-08-31 09:51:23 +00:00
extempore 9aefab8491 Alterations so the sbt build will run under git-svn.
Review by moix.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22649 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-29 17:36:23 +00:00
dubochet 090d6f3c53 [scaladoc] Setting for link to source URLs is much more flexible and should allow satisfying Toni's exacting demands. Review by cunei.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22634 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-27 16:33:35 +00:00
extempore 5a1c405936 Fix for stability failure introduced in build.xml change.
Review by malayeri (as an FYI.)

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22609 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-20 18:14:54 +00:00
malayeri b5a8fa32fa [scaladoc] Modify build script to copy html resources to output directory; display template in a frame rather than an iframe; change title of main page when new frame is loaded. Review by dubochet.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22604 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-20 16:13:28 +00:00
extempore 03a6a8eb42 Abandoned any pretense of selectivity and put forkjoin.jar on
every compilation path from locker to strap.  Review postponed
until the afterlife.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22464 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-01 21:39:38 +00:00
extempore 5c284ffa55 Since the buildbots won't meet me in the middle, am putting the
forkjoin.jar everywhere with the hope/expectation we will see a
restoral of order.  Someone should definitely figure out how it
is we developed this non-deterministic dependency.  Review by phaller.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22462 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-01 20:43:32 +00:00
extempore 8c3bb7fa79 Although everything now builds for me, the buildbot still fails
on src/dbc for lack of forkjoin.jar.  We apparently have invented
non-deterministic jar dependencies.  Added forkjoin.jar in
another spot, no review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22450 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-07-01 00:16:32 +00:00
extempore e46ee0f9f3 Added forkjoin to partest's classpath to unbreak the build. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22445 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-06-30 20:51:18 +00:00
prokopec d5d44befa1 Moved parallel collections to library dir, changed sabbus script. Added `par` to some of the classes. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22357 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-06-18 15:06:17 +00:00
prokopec 0ffded4f5d Adding parallel collections to trunk.
sabbus also edited to add parallel collections to the library jar - review by phaller

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22182 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-06-07 10:15:32 +00:00
extempore 8c3a4da708 Rolled partest back to r21328. Attempted to make the minimum
changes necessary to plug it back in while preserving everything
which has happened since then in tests and such, but we should
be the lookout for overreversion.  Review by phaller (but as a
formality, I don't think it requires direct review.)

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21829 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-05-06 16:37:13 +00:00
phaller f04daa09b6 Some more, hopefully temporary, partest timeout tweaks. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21795 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-05-04 14:54:57 +00:00
phaller ba0404e0ba Increased partest per-test timeout in an attempt to fix the windows nightly.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21784 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-05-03 09:35:13 +00:00
extempore 00ae581f0f Kicked the partest timeouts way up since apparently even 6 hours
isn't enough for windows to complete.  Don't know what the deal
is there, let's see if 10 hours is enough.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21771 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-05-01 17:17:56 +00:00
extempore aa04400314 Kicked partest up to a 6 hour timeout. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21765 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-30 14:41:33 +00:00
extempore 7956b40400 Took advantage of the sophisticated abstractions available in ant
to cut and paste the entirety of r21723 a little further down the
build file.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21753 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-29 15:29:44 +00:00
extempore bc421b0b69 Added classes/continuations-plugin to the plugin build classpath.
Explanation: as things stood the plugin step of the overall build
fails constantly even when no files have been touched.  The reason
is that if one checks out an older version of the repository and
then returns to the master, a subset of continuation source files
will have more recent modification dates than their corresponding
classes, and ant sees that as a reason to rebuild them.  But without
continuations-plugin on the classpath, it cannot see the classfiles
of those which were not changed.

IOW, if a project has A.scala B.scala C.scala and tries to rebuild
only A.scala and C.scala, B.class must be somewhere it can be seen.
We can resolve this differently if desired but this is how the rest
of the compiler does it.  (Try removing quick from quick's classpath
and rebuilding after some changes.)

Review by rompf.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21723 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-28 15:31:17 +00:00
extempore f85809e42f Raised some partest timeouts, I think with these we might see
the windows nightly pass.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21616 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-18 19:10:58 +00:00
rytz bac05ffe07 fix stability. jar is not stable. no review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21525 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-13 11:53:50 +00:00
extempore 0320595bdc Still working on partest. Added ant targets which can be
temporary if considered clutter.

  ant test.partest
  ant test.partest-opt

They run some recently troublesome partest tests with a low timeout.
Logged some more exceptions where the compiler has been dying.
Review by phaller.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21510 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-12 21:36:33 +00:00
rytz e1f441a666 moved plugin folder back to 'misc/scala-devel/plugins'. moved bash completion to scala-tool-support (see r21449). include continuations in compiler sbaz package. replaced some tabs by spaces. review by extempore.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21452 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-11 19:11:40 +00:00
extempore ead2b57328 Restores the passing of scalac.args and javac.args from
ant to partest for use on all tests, which rytz had
astutely pointed out I made disappear.  Long term I think one
ought to be able to specify different arguments for building
the compiler and for partest, but now is not the moment for
such grand ambition.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21439 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-11 00:32:20 +00:00
rytz 0f672295a1 minor cleanup in build script. no review
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21401 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-09 12:05:11 +00:00
extempore e6db5217a0 Created a test.suite.clean.checkinit ant target which:
runs ant all.clean
  builds with -Xcheckinit
  runs the test suite with -Xcheckinit

Review by cunei? If the nightly is trying to do the above
sequence with command line options, I suggest it be changed
to run this target or a similar one so the logic is not
separated from the buildfile.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21374 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-07 19:06:52 +00:00
extempore 61673baf53 Typo patrol, no review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21333 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-05 17:40:59 +00:00
extempore 8d51dac0cb The code part of the partest patch. If anyone wants to review
it they can be my guest (reviewbot: review by community!) More
realistically: more than likely I have unwittingly altered or
impaired some piece of functionality used by someone somewhere.
Please alert me if this is the case and I will remedy it.  I
have to call it at this point as the best interests of 2.8 cannot
be served by me nursing this patch along any further.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21330 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-05 06:25:16 +00:00
extempore 96b243ddbe Mostly IO tweaks related to my upcoming partest patch, which to
my chagrin is being held up by windows.  Also updates the default
ANT_OPTS to be the same as the ones the nightlies override it with.
(If we know you can't build scala with those settings it seems kind
of uncool to leave them for everyone else.) No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21323 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-04-02 21:09:34 +00:00
rompf bf8688554f fixed double-loading of plugins. reinstated not-enabled error msg for cps plugin. review by community.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21271 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-25 16:14:56 +00:00
milessabin d38951fd72 Continuations support classes are included in scala-library.jar so their sources should be in scala-library-src.jar. Also export scala.util.continuations from the scala-library bundle.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21206 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-17 13:16:09 +00:00
rytz 1e2f71e25c minor cleanup to build.xml. review by rompf
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21178 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-15 13:54:23 +00:00
rompf 8506a865b8 moved the continuations plugin into trunk. it is now part of the distributions under /plugins/continuations.jar which should make scalac load it by default. actual use however must be enabled by passing -P:continuations:enable as command line arg. supporting library code is in package scala.util.continuations and is compiled into scala-library.jar. review by rytz, cunei, odersky.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21140 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-11 16:55:38 +00:00
extempore cdba29c6f3 Some windows oriented fixes for build.xml. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21123 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-10 15:33:14 +00:00
extempore cf1ad6b61d Added test.debug target to build.xml. This will run whatever
tests you have placed in the test/debug directories - critically
for those of us stuck debugging ant, this lets one run a small
selection of tests by way of ant instead of the console runner.

(Sorry about the empty .gitignore files, but one of git's quirks
is that it won't acknowledge the existence of an empty directory.)
No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21111 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-08 19:58:10 +00:00
extempore 87ea1aa955 Changed partest ant task not to use reflection, instead using
the path with which scala was invoked.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21109 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-08 18:46:35 +00:00
extempore ae4523fb45 Enabled scalacheck tests. Renamed the super confusing and
what must be legacy scalatest.* properties to partest.*, boldly
assuming that the fact that partest is pretty much unusable
outside of scalac means there are no users outside of scalac
who might be disrupted by eliminating old property names.
Review by community.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21014 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-03-01 05:59:11 +00:00
extempore 001b5da564 More partest cleanups, and putting back a couple lines in build.xml
which were left a little too commented out.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20992 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-02-25 19:50:28 +00:00
extempore 51136ada46 Working on making the bootstrap process transparent and consistent.
And removed a bunch of what is now cruft in partest.  No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20990 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-02-25 18:24:58 +00:00
extempore 2848f7e543 The build file wasn't quite all the way on the bash completion
commit.  Now it should work, and also be copied into the
distribution.  Review by anyone who may be cruel enough to
oppose including completion in the distribution.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20979 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-02-25 00:14:04 +00:00