Rockbox

Tasklist

FS#9630 - Improvements for tools/svnversion.sh for git users

Attached to Project: Rockbox
Opened by Andrew Mahone (Unhelpful) - Saturday, 13 December 2008, 00:52 GMT
Last edited by Andrew Mahone (Unhelpful) - Monday, 19 January 2009, 16:54 GMT
Task Type Patches
Category Build environment
Status Closed
Assigned To No-one
Operating System All players
Severity Low
Priority Normal
Reported Version Release 3.0
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Votes 0
Private No

Details

This patch modifies tools/svnversion.sh to work with git repositories that lack git-svn information. It will still work with git-svn repos, as it extract the svn revision from the most recent git log entry that originates in svn. Also added is support for a docs/LOCALVERSION file to be appended to the version, useful because most git users will probably want to add a .gitignore, which would cause attempts to detect local modification to always return true.

EDIT: corrected testing junk that did not belong in patch.
This task depends upon

Closed by  Andrew Mahone (Unhelpful)
Monday, 19 January 2009, 16:54 GMT
Reason for closing:  Fixed
Additional comments about closing:  r19799 committed the patch from  FS#9758 , with equivalent functionality
Comment by Dominik Riebeling (bluebrother) - Saturday, 13 December 2008, 10:28 GMT
nice, but I don't get the reason for the LOCALVERSION -- the VERSION file that gets checked isn't in svn anyway, so one could use that instead. Or am I missing something here?
Comment by Andrew Mahone (Unhelpful) - Saturday, 13 December 2008, 11:40 GMT
As I read it, using VERSION gets a version that reads as <VERSION>-<DATE>. LOCALVERSION is instead appended after <REVISION>-<DATE>, so that the final version displayed gives the SVN revision, the build date, and whatever local version tag you've added. Perhaps it would be more sensible to remove LOCALVERSION, and make VERSION work this way? Another option, if git is detected, is to append the branch being built from, but the label may not be meaningful, or may contain characters that need to be sanitized, etc.

Loading...