| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| | |
Running this script will transform tabs into a pair of spaces and will
eliminate trailing spaces. Use at your own risk!
|
| | |
|
| |
| |
| |
| |
| | |
This fixes the git commit drift issue and gives us enough granularity
to make releases at any time that are cronologically increasing.
|
| | |
|
| |
| |
| |
| | |
git describe is useless in that situation, afaict.
|
| |
| |
| |
| | |
Swapped 'r' to 'v' now that I've had more coffee and sleep.
|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
build.xml
tools/get-scala-revision.bat
|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
build.number
build.xml
|
|/ |
|
|
|
|
| |
And for removing corrupt files.
|
|\ |
|
| |
| |
| |
| |
| |
| | |
In practice, this removes the 'v' in v2.10.0-M1-0168-g99844ebc10-2012-02-08. Why is this important, you ask?
Many tools assume the version number to be composed of 3 numbers and a string qualifier. Eclipse is one of the
tools that validates version numbers, and this string is used to stamp Scala IDE builds against Scala nightlies.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
tools/get-scala-revision
|
| |
| |
| |
| | |
So we can turn out a build string regardless of local conditions.
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
tools/epfl-publish
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Backporting auto starr download to 2.8.x and 2.9.x build.xmls.
Trying to get build strings consistent.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Easier ways to invoke scala/scalac based on starr, locker, or quick.
% tools/starr_scalac -version
Scala compiler version 2.10.0.r26060-b20111123092602 -- Copyright 2002-2011, LAMP/EPFL
% tools/locker_scalac -version
Scala compiler version v2.10.0-M1-0140-g4619a48c1e-2012-02-02 -- Copyright 2002-2011, LAMP/EPFL
% tools/quick_scalac -version
Scala compiler version v2.10.0-M1-0144-g0c59a25a81-2012-02-02 -- Copyright 2002-2011, LAMP/EPFL
|
| | |
|
| |
| |
| |
| | |
No leading zeros for %016s on some platforms, yes on others.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Hopefully this will satisfy all version-interesting parties.
Version string now looks like this:
v2.10.0-M1-0098-gbda61bb7e5-2012-02-01
Review by @dragos and anyone who uses windows (where it
definitely won't produce that string, but hopefully it produces
some usable string.)
|
| |
| |
| |
| |
| |
| | |
* Duplicated binary repo cache in ~/.sbt/cache/scala/
* Resolved to cache before copying to local dir if jar is misisng
* Does *not* check SHA in cache currently
|
| | |
|
| |
| |
| |
| | |
This is done by the separate scala-nightly-maven-deploy jenkins job, doing it here fails depending on the build machine (/home/linuxsoft/... is not available everywhere).
|
|\| |
|
| |
| |
| |
| |
| |
| | |
Reintroduced date and an "r" to meet IDE needs. Moved reference
commit backward to accomodate 2.8.x. Merging changes into 2.8.x,
2.9.x, and master.
|
| |
| |
| |
| |
| |
| | |
Now that I've resorted to building git 1.5.4, I can stop trying
to reverse engineer it through jenkins. This implementation feels
winnerish.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reimplementing without git-describe to harden against old
gits and make any kind of reference tag unnecessary.
Conflicts:
tools/get-scala-revision
|
| |
| |
| |
| |
| |
| | |
Now that I've resorted to building git 1.5.4, I can stop trying
to reverse engineer it through jenkins. This implementation feels
winnerish.
|
| |
| |
| |
| |
| | |
Reimplementing without git-describe to harden against old
gits and make any kind of reference tag unnecessary.
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Environment variable maven_settings.
|
|\| | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Offer explicit settings.xml path for maven if some specific
hardcoded path exists, don't otherwise. At least it's in one
place where we can keep an eye on it.
|
|\| | |
|
| | |
| | |
| | |
| | | |
Configuring via environment variables.
|
|\| | |
|
| | |
| | |
| | |
| | | |
Unified further with build options.
|
| | | |
|
| |/
| |
| |
| | |
Out of jenkins and into version control.
|
| |
| |
| |
| |
| |
| | |
Binary library pull/push is limited to:
- test/files
- lib
|
|\ \
| | |
| | |
| | |
| | |
| | | |
tools/get-scala-revision.bat should have the same logic as
tools/get-scala-revision, but I'm afraid to try to implement
an if/then/else in a windows batch file. Contributions welcome.
|
| | |
| | |
| | |
| | | |
a289465c70630719cbd3a74edf5502a156ef83c4 broke get-scala-revision.bat.
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Reference to git head is supposed to be HEAD, not head.
Also apparently [[ <test> ]] is a bashism so it's [ <test> ].
Made name generation robust against the absence of the dev
tag; it will generate a similar name even if it's not there,
minus the part it can't determine without it.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|