Re: [Torcs-ng-devel] Version numbering

[Mart K. <ma...@ke...>]

Hi Jean-Philippe (and others),

Op Saturday 06 December 2008 18:10:30 schreef Annick et Jean-Philippe:
> Hi, Mart, and all.
>
> > I added some code in the sdl-port branch such that CMake calculates the
> > version number for large parts by itself. It uses the $HeadURL$
> > subversion keyword for that, and the program "svnversion".
> >
> > This way, tagging a release is sufficient to set the version number in
> > config.h and version.h. I created version.h such that not everything have
> > to be recompiled after a commit (=version change).
>
> Nice. It works very well.
>
> But, I need to better test it under Windows with a command line SVN
> installed (like Slik-Subversion).
>
> Cheers,
>
> Jean-Philippe.
>
> PS: Thanks a lot, Mart, for the "dirty" work of merging trunk to sdl-port.
>      For my information, could you explain how you did it step by step,
>      and tell us of any tip you would have used ?

Brief explanation:

cd branches/sdl-port
svn merge https://torcs-ng.svn.sourceforge.net/svnroot/torcs-ng/trunk .
Postphone all conflicts.
Manual merge all conflicts, run svn resolved filename when filename is 
resolved.
With data files, using the most recent usually works.
Try to compile it; fix compile.
Commit.

Regards,

Mart