| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\ \
| | |
| | |
| | | |
'VladUreche/issue/5248' and 'VladUreche/issue/5054-usecase-cleanup2' into develop
|
| | | |
|
| |/
|/| |
|
|/
|
|
|
| |
This fixes the git commit drift issue and gives us enough granularity
to make releases at any time that are cronologically increasing.
|
|
|
|
|
|
|
|
|
| |
Scala actors are now in scala-actors.jar. Changes that were done are:
- Fixed partest to include actors library for various test usages
- Created the entry for the new jar in build.xml
- Added maven entries for scala actors
Review by: @jsuereth
|
|
|
|
| |
git describe is useless in that situation, afaict.
|
|\ \ \
| | | |
| | | |
| | | | |
'acruise/t1118', 'hubertp/issue/5572', 'hubertp/topic/nightly-checkinit', 'axel22/feature/pc-ctrie', 'jsuereth/master-version-fixin' and 'axel22/feature/checkinit-transient' into develop
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Swapped 'r' to 'v' now that I've had more coffee and sleep.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
build.xml
tools/get-scala-revision.bat
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
build.xml
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
build.number
build.xml
|
| |/
| |
| |
| | |
optimise params
|
|/ |
|
|
|
|
|
|
| |
* SHA1's are deleted when creating new STARR builds.
* SHA1's are also deleted if new fjbg/forkjoin/jline jars are made.
* Normal push/pull flow should continue as normal with less frustration.
|
|
|
|
|
|
|
| |
You see shelling to other ant builds doesn't let us declare dependencies
on the primary build, so to ensure all tasks are run when needed,
and that we don't slow everyone down with javadocs, we wind up
with a bit of spaghetti.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Actually not a fix, only a workaround. Package objects strike
again: you don't want to have existentials in there, like this:
private val resolverFunction: PartialFunction[Throwable, Try[_]] = ...
There are a few irrelevant-to-that-bug changes included which I
did while debugging and figured I'd keep them. With this patch I
can merge/am merging the scala.concurrent work.
|
| |
|
|
|
|
|
| |
Use mappers with uptodate and touch tasks to detect if any jars need to
be downloaded based on the modification time of the desired.sha1 files
|
|
|
|
| |
This reverts commit e34098b7f6e37420198fa5c7c2820d0443b46cc4.
|
| |
|
|
|
|
|
|
|
|
| |
Version number turning up more than once. Looking at the situation
I could only see the former mechanism as trouble. I deleted
build.number and in ant am generating the build string only from
tools/get-scala-revision. We may need to revisit when the time comes to
build a release.
|
|
|
|
|
| |
If your compiler .desired.sha1 is newer than the jar, it will
go download it.
|
|\
| |
| |
| | |
'soc/SI-4627' into develop
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Deprecate scala/xml/include/sax/Main.scala.
Move scala/swing/test/* to docs/examples.
Saves 160KB in scala-swing.jar.
Fixes SI-4627.
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This new command is more or less equivalent to regular "build".
It is capable of:
1) automatically unlocking locker
2) not building stuff that hasn't changed
3) packing locker classes into JARs at build\palo\lib
4) populating bin directory at build\palo\bin
All in all, buildlocker lets one work with locker as if it were quick.
Except that it is rebuilds quicker than quick by a factor of 2x.
Fastlocker does exactly the same, but without packing stuff into JARs.
This makes things even faster.
Of course, both targets don't build anything except library and compiler,
so they aren't appropriate for all workflows, but, it was useful for me!
P.S. Good news: you can use partest with locker, but it's not obvious.
First, you need to transplant missing stuff that is necessary to run partest.
I did it by maintaining a parallel clone of my repository that is used only
to produce partest dependencies (partest itself, scalap and library/actors).
Second, partest has to be switched into "testClasses" mode, which is tricky.
I honestly tried to find out how to do this, but then fell back to a hack:
https://gist.github.com/1525721.
Finally, you need a special launcher (I haven't made friends with std script).
The launcher is quite simple and looks as follows: https://gist.github.com/1525720
|
| | | | |
| \ \ | |
|\ \ \ \
| |_|/ /
|/| | |
| | | | |
'kepler/topic/reifyclosuretests', 'kepler/topic/antscalacheck', 'szabolcsberecz/SI-5104', 'kepler/ticket/5334' and 'kepler/topic/miscfixes' into develop
|
| |/ / |
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
build.xml
|
| | |
| | |
| | |
| | |
| | | |
Backporting auto starr download to 2.8.x and 2.9.x build.xmls.
Trying to get build strings consistent.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Decided to stop guessing at what ant was doing.
% ant -Dscalac.args="-Xcheckinit" init
init:
[echo] build time: 9 December 2011, 21:47:22
[echo] java version: Java HotSpot(TM) 64-Bit Server VM 1.6.0_29
[echo] java args: -Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC
[echo] javac args:
[echo] scalac args: -Xcheckinit
[echo] build number: 2.10.0.dev-1340-ga890d60
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
This commit filters out the sha files that have been going into the
docs area of a distribution. Really, I think examples might
belong in a separate project moreso than in the distro, but
for now just preventing the build information from leaking
into the distro is helpful.
Review by: @soundrabbit
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Created dev tag which is the merge-base of master and 2.9.1 (merge-base
is the last common commit), and told ant to generate build strings based
on that. So distributions look like
scala-2.10.0.dev-1289-gbba3918
Where the 1289 means you are 1289 commits ahead of "dev" and
the last segment (minus the g) is the sha-1 hash.
This no doubt breaks windows even further. Help getting it
back on its feet greatly appreciated.
|
| |
| |
| |
| |
| |
| | |
We're not buying anything with it off by default. Added a
-P:continuations:disable option to disable. -P:continuations:enable
lives on as a no-op. Review by @odersky.
|
| | |
|
| |
| |
| |
| | |
This probably doesn't work on windows, help appreciated.
|
| |
| |
| |
| |
| | |
Added better warning message if you've forgotten to run
pull-binary-libs.sh after initial checkout.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| | |
Lots of fiddling in the interests of a better classloading future.
|