Commit Graph

541 Commits

Author SHA1 Message Date
extempore 71835ea33c Fix for build.xml classpaths.
Found the cause of plugin build failures which have long haunted me at
inopportune times.  It's all built against locker instead of quick.
Kind of a buzzkill to be fixing this during the "Ant End Times" but
better now than never.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26089 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-29 18:10:11 +00:00
michelou 98622693e4 added support for ant tests to partest
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26075 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-27 15:57:15 +00:00
szeiger b531620b9c Enabling the use of 'compilerarg' with 'scalacfork' task in the build process.
'compilerarg' was added in r26030 and pushed into starr with r26055. No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26057 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-23 12:03:50 +00:00
szeiger 4659eb0fa1 Make partest work with spaces in the path (from batch script and ant task).
- The 'partest' ant task gets a new 'compilerargs' element for scalac options (like in scalacfork and javac).
- Fixed argument list handling in partest task.
- Further improvements to argument list handling for all ant tasks.
- Fixed argument list handling in DirectTest (used by partest shell scripts)
- Fixed path handling in several test cases.

Closes SI-622. Review by phaller.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26047 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-22 18:44:00 +00:00
szeiger fefd99a858 Enable the use of spaces in paths for the Scala build on Windows -- take 2.
(The original commit in r26026, reverted in r26027, used the new compilerargs
element in the Scala build -- we cannot do this until it's in starr.)

- Revert r25995 which was fixing it only partly and in the wrong place.
- Properly encode argument files for scalac in scalac ant task.
- Allow 'compilerarg' elements in scalac ant task (like in ant's built-in
  javac task) to allow passing extra parameters like plugindir path with
  proper encoding of spaces and file names.
- Fix space handling in get-scala-revision.bat.

Closes SI-3047.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26030 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-18 18:54:24 +00:00
extempore 813438575a Revert "Enable the use of spaces in paths for the Scala build on Windows."
This reverts the previous commit due to failure to build:

BUILD FAILED
/scratch/trunk1/build.xml:639: scalacfork doesn't support the nested "compilerarg" element.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26027 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-18 16:53:09 +00:00
extempore 32d40a03dd Enable the use of spaces in paths for the Scala build on Windows.
Revert r25995 which was fixing it only partly and in the wrong place.
Properly encode argument files for scalac in scalac ant task.
Allow 'compilerarg' elements in scalac ant task (like in ant's built-in
javac task) to allow passing extra parameters like plugindir path with
proper encoding of spaces and file names, and use it in the Scala build.
Fix space handling in get-scala-revision.bat.

(Patch by Stefan Zeiger.) Closes SI-3047.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26026 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-18 15:16:26 +00:00
extempore d251c5884b ScalaClassLoader changes.
Lots of fiddling in the interests of a better classloading future.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25931 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-11-03 04:51:52 +00:00
kzys cbe4220571 Add some basic tests for Scaladoc. Review by ureche.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25786 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-10-04 12:24:45 +00:00
michelou 03b02c025b fixed svn props and scaladoc tags, did some cleanup
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25699 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-20 17:15:33 +00:00
heathermiller cd34c648d3 Fixes build issue involving missing rootdoc.txt in strap build. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25678 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-17 23:51:48 +00:00
heathermiller 0101df9cc3 Adds ability to document root package, as well the first cut of an introduction to the API. Contributed by Iain McGinniss during the September doc spree.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25674 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-17 20:24:26 +00:00
michelou ce2f6c25f6 Removed leading tabs in build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25671 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-17 09:12:48 +00:00
michelou b40b2457ac Get svn revision on Windows
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25670 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-17 09:06:25 +00:00
michelou 357463498f updated scaladoc comments, did some cleanup
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25651 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-13 18:50:08 +00:00
extempore 69a284150b Fixing the optimized build.
Continuations suddenly needs fjbg.jar on its classpath due
to transitive dependency, no review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25640 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-10 00:11:26 +00:00
heathermiller 895a5b1808 Added footer command line option to ScalaDoc so ScalaDoc users aren't forced to have the EPFL/Typesafe copyright notice in their API docs. Now comes with the ability for users to add their own footer. Review by ureche.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25616 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-09-07 05:18:37 +00:00
Joshua.Suereth a9b2192b6f Added extraneous test where classes are verified by loading them in non-boot classloaders one at a time. These are not wired into the standard workflow, but available optionally. Review by rytz
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25586 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-08-29 20:24:39 +00:00
malayeri dbec308f2e [scaladoc] Improve visual design and layout of Scaladoc, using contributions from Heather Miller. No review.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24730 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-04-11 12:20:07 +00:00
extempore 86969d4816 Deleted SourcelessComments. Created source files for Any, AnyRef,
Nothing and Null with improved documentation of their particulars and
convinced scaladoc to parse them without leaving scalac institutionalized.
Now rather than seeing our hardcoded documentation strings bitrot in a
shadowy flight from classes which do not exist, we are championing the cause
of the innocent and powerless.  Nothing and Null aren't above the law!

So now any responsible party can fire up their text editor and go to
town on Nothing.scala.  As I'm sure they will.  Review by malayeri.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24702 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-04-07 07:31:02 +00:00
extempore 937425dade Removed some bitrotted ant directives which were keeping us from
getting Manifest docs.  Thanks to dmharrah.  Also removed RichUnit,
fare thee well.  Closes #4404, no review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24621 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-03-28 21:53:12 +00:00
kzys d16531d140 [scaladoc] Add HtmlFactoryTest and reorganize directory structure. Reviewed by pedrofurla.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24525 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-03-21 12:24:48 +00:00
dragos 9c215faff7 Added presentation compiler tests. review by phaller, extempore.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24075 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-01-24 19:17:32 +00:00
cunei eb642f6633 Updated copyright notices to 2011
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24032 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-01-20 15:32:51 +00:00
prokopec 4725aaf6eb Added specialized test to ant build, and ported old specialized 'run' tests to check the number of boxings.
No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23999 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-01-17 15:18:08 +00:00
prokopec 2c98a10eea Adapted specialization tests to track number of boxings.
Review by dragos

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23998 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2011-01-17 15:18:06 +00:00
extempore 60a01c9f4d Moved the painful-in-ant git/svn revision getting logic
into bash where it's at least somewhat less painful.  Made
it more flexible for easy use in more places since we presently
have all kinds of revision figuring logic variations in other
build files (sbaz, installer, scala-documentation, scala-tool-support,
etc.) No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23604 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-11-26 23:53:37 +00:00
extempore 4028f83c6d Some profiling infrastructure. With no small amount of fiddling
I avoided creating any dependency on yourkit.  In addition, there
was no way to give arguments to the JVM without losing the ones
defined in ANT_OPTS, which has been a massive pain for a while.
So there is now "jvm.opts" which is simply appended to ANT_OPTS, e.g.

  % ant -Djvm.opts=-verbose
  [echo] Forking with JVM opts: -Xms1536M -Xmx2g -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC -verbose

There is a minimal stub defining a profiler interface:

  scala.tools.util.Profiling

Then the yourkit wrapper implements that interface.  Once your
locker has been rebuilt once, you can do this:

  ant yourkit.run

And it will build quick.lib/comp with profiling enabled, assuming
it can find the necessary files.  See the yourkit.init target for
values to change: or ant -Dyourkit.home=/path/to/it might be enough.

Review by dragos.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23528 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2010-11-16 23:08:45 +00:00
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