Commit Graph

491 Commits

Author SHA1 Message Date
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
extempore 34402a8e36 Bash completion! The file is automatically created as
part of the build process and placed in $pack/etc.

% scala -Xprint
-Xprint-icode  -Xprint-pos    -Xprint-types  -Xprint:

% scala -Xprint:
all             flatten         mixin           tailcalls
cleanup         icode           namer           terminal
closelim        inliner         packageobjects  typer
constructors    jvm             parser          uncurry
dce             lambdalift      pickler
erasure         lazyvals        refchecks
explicitouter   liftcode        superaccessors

% scala -g:
line         none         notailcalls  source       vars

% scala -Ystruct-dispatch:
invoke-dynamic  mono-cache      no-cache        poly-cache

Review by community.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20978 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-02-24 23:17:30 +00:00
extempore 81b5655dbc Updated scalacheck jar to current trunk. Tracked down why it's
not being used.  Updated partest with a --scalacheck option.
Added scalacheck tests to the ant build target.  Still struggling
with ant/partest/classpaths so it's not on by default yet, but
at least ./partest --scalacheck works.  We... will... use...
scalacheck.  And we will like it! No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20973 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-02-24 02:27:03 +00:00
dubochet 524440deee [scaladoc] Optional link to source (set parameter "-doc-source-url"). Support for commenting packages (using package objects). Contributed by Perdo Furlanetto. Also: small performance improvements, short comment extraction is more robust (but no HTML tags allowed in first sentence), small code clean-ups. Checked by dubochet, no review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20778 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-02-03 17:03:58 +00:00
rytz 022fb536ec small improvements in building newlibs / newforkjoin. no review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20655 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-25 10:44:16 +00:00
plocinic 933b81f15d Fix ant task for build manager partest. no review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20654 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-25 10:28:11 +00:00
rytz 9552a7ae20 fix several issues in .net backend / type parsing. allow re-building forkjoin.jar separately. no review
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20635 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-22 16:55:23 +00:00
milessabin d2510e0077 Renamed new bin directory to "tools" to avoid conflict with Eclipse incremental build output directory.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20615 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-20 09:12:10 +00:00
extempore 817c14e480 Took a slightly different tack on parsing the svn version.
No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20611 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-20 04:38:32 +00:00
extempore 0604b0b23e Removed some debugging echoes I let slip through.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20610 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-20 02:36:51 +00:00
extempore edc74fc6e4 Until now all scala builds performed not in an svn tree were
given no version number, because the version was extracted from
"svn info".  Now it tries git style if svn info is unrevealing.
Review by community.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20602 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-01-19 19:28:17 +00:00
cunei 2a5cb5d3d2 Adding target distpack-opt.
Review by rytz.


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20178 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-12-17 11:16:58 +00:00
cunei 03072c33cb Updated copyright notices to 2010
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@20028 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-12-07 11:49:19 +00:00
rytz a2a28e3ae3 moved forkjoin sources out of the library folder
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19982 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-12-02 16:08:53 +00:00
extempore 1ba42cc9c1 Added a line to build.xml to echo the value of $ANT_OPTS after
being burned one too many times by having it already set in my
environment.  What was the motivation for that change again?
In any case this should make it easier to notice.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19925 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-28 21:11:43 +00:00
dubochet 2b834fab29 Scaladoc 2.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19844 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-24 19:27:10 +00:00
extempore 5bc70d7ec4 Fixes and test cases for #2087 and #2400. This required
fixing a long-standing bug in fjbg and recompiling fjbg.jar,
which had the side effect of revealing that the current
fjbg jar had never been recompiled with target 1.5, so now
it's smaller and (I imagine) faster.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19651 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-14 18:02:10 +00:00
rytz f769656d8d use scalacfork for strap build, should make windows build work. Rename RichWindow so that ant does not always re-compile it.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19465 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-09 15:25:40 +00:00
phaller aca86d568a Increased partest timeout, since it seems we are hitting it in some hudson configs.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19455 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-09 10:31:13 +00:00
rytz fbb0f1f062 removed wrong .optimise targets
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19416 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-06 13:03:21 +00:00
rytz 6205cc62a6 fix cyclic reference errors in scaladoc. package objects are now compiled first. two-phase compile for library (Predef) no longer required.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19398 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-04 18:25:19 +00:00
odersky 8bfe94c595 Fixed #2545. Fixed problem with cyclic dependcies when adding package objects. Prepared for module expansion to lazy vals.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19375 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-11-02 16:48:56 +00:00
milessabin b4f031e71d Added -Ybuilder-debug:[none,simple,refined] option for testing the interactive build manager; added support for reporting comments during compilation; unbroke the test.positions build target.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19355 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2009-10-30 13:05:17 +00:00