summaryrefslogtreecommitdiff
path: root/tools/get-scala-revision.bat
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'szeiger/fix/windows-git-revision'Paul Phillips2011-12-051-1/+0
|\ | | | | | | | | | | 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.
| * Fix build on Windows.Stefan Zeiger2011-12-051-1/+0
| | | | | | | | a289465c70630719cbd3a74edf5502a156ef83c4 broke get-scala-revision.bat.
* | Tweaks to get-scala-revision.Paul Phillips2011-12-051-1/+1
|/ | | | | | | | 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.
* Use git-describe to create build string.Paul Phillips2011-12-041-23/+4
| | | | | | | | | | | | | | 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...Stefan Zeiger2011-11-181-2/+2
| | | | | | | | | | | | | | | | | | | 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 t...Paul Phillips2011-11-181-2/+2
| | | | | | | | | | | 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...Paul Phillips2011-11-181-2/+2
| | | | | | | | | | | | | | 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.
* Get svn revision on Windowsmichelou2011-09-171-0/+42