From b40373367e6803349470ecabc3ef646f50353139 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Tue, 22 Mar 2011 16:12:34 +0000 Subject: Merged revisions 24525-24539 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24525 | kzys | 2011-03-21 13:24:48 +0100 (Mon, 21 Mar 2011) | 1 line [scaladoc] Add HtmlFactoryTest and reorganize directory structure. Reviewed by pedrofurla. ........ r24526 | kzys | 2011-03-21 13:44:20 +0100 (Mon, 21 Mar 2011) | 2 lines [scaladoc] Add a test for #4361. ........ r24527 | plocinic | 2011-03-21 14:37:53 +0100 (Mon, 21 Mar 2011) | 1 line Closes #4202 again, closes #4363. if someone can enlighten me why we actually had that exclusion for companion objects in the first place I would be grateful. review by odersky ........ r24528 | kzys | 2011-03-21 14:47:57 +0100 (Mon, 21 Mar 2011) | 2 lines [scaladoc] Add a test for #4306. Review by pedrofurla. ........ r24529 | extempore | 2011-03-21 17:19:33 +0100 (Mon, 21 Mar 2011) | 2 lines One hundred! One hundred times slower on windows! Ah, ha, ha! Adjusted test case, no review. ........ r24530 | cunei | 2011-03-21 18:08:00 +0100 (Mon, 21 Mar 2011) | 2 lines license files ........ r24531 | cunei | 2011-03-21 18:13:20 +0100 (Mon, 21 Mar 2011) | 2 lines license files. ........ r24532 | cunei | 2011-03-21 18:47:44 +0100 (Mon, 21 Mar 2011) | 5 lines removed gpl Some javascript utils are dual licensed under gpl and mit. We already include the mit ones. ........ r24533 | extempore | 2011-03-21 23:25:40 +0100 (Mon, 21 Mar 2011) | 20 lines [I'm laptop only so there's some chance this will incur temporary breakage, but it needs committing.] Heading off gratuitous complications which haven't yet shipped, I eliminated the -jar startup option in favor of doing what we already do, figuring it out. So now all these things work. scala foo/bar.scala // if file is a script or has one main method scala foo.Bar // if it has a legal main method scala foo.jar // if it has a legal MainClass attribute Also changed "-savecompiled" to "-save" and given scala source called foo.scala, generate foo.jar rather than foo.scala.jar. Cleaned up a bunch of related code and further polished the scala startup message. And unbroke choice settings and improved that error too, which closes #3849. While trying to write a test for the choice setting, was reminded that partest just discards invalid flags files. Made it fail instead, which closes #3712. Fixed the new failures that revealed. No review. ........ r24534 | extempore | 2011-03-21 23:46:53 +0100 (Mon, 21 Mar 2011) | 2 lines We need a successful build, not sure why this hasn't been disabled yet. Disabled failing coder test, no review. ........ r24535 | extempore | 2011-03-22 01:06:44 +0100 (Tue, 22 Mar 2011) | 3 lines Oh the irony, disabling the failing test made the build fail, because another test is hardcoded to use its paths. Disabled that test too. We'll put humpty back together again. No review. ........ r24536 | extempore | 2011-03-22 05:28:21 +0100 (Tue, 22 Mar 2011) | 6 lines Not yet learned my lesson about partest and empty directories. Rather than reapply that bandaid, went after partest. Attempts to make partest ignore empty directories. Discover directory tests aren't run when the command line tool is used, make them run like everyone else. Find more tests which due to misplacement are silently ignored, move them into tested locations. No review. ........ r24537 | kzys | 2011-03-22 15:10:25 +0100 (Tue, 22 Mar 2011) | 2 lines [scaladoc] Closes #4366. Review by pedrofurla. ........ r24538 | moors | 2011-03-22 15:31:36 +0100 (Tue, 22 Mar 2011) | 1 line closes #4205: quick&dirty fix to force loading of info's and thus avoid order-dependency until we fix unsafeTypeParams for good. no review ........ r24539 | moors | 2011-03-22 16:43:28 +0100 (Tue, 22 Mar 2011) | 1 line closes #4345. skip variance checks for calls to super accessor. no review ........ --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.xml') diff --git a/build.xml b/build.xml index 8189f68ef2..c375c87df5 100644 --- a/build.xml +++ b/build.xml @@ -1598,8 +1598,8 @@ BOOTRAPING TEST AND TEST SUITE - - + + -- cgit v1.2.3