Changed revision details to be a string (an hg changeset) instead of an int.
This commit is contained in:
parent
e8beace165
commit
07cc73d801
5 changed files with 11 additions and 15 deletions
|
@ -2,14 +2,7 @@
|
||||||
#
|
#
|
||||||
# Print the current source revision, if available
|
# Print the current source revision, if available
|
||||||
|
|
||||||
srcdir=`dirname $0`/..
|
# FIXME: this prints the tip, which isn't useful if you're on a different
|
||||||
|
# branch, or just not sync'd to the tip.
|
||||||
|
hg tip --template 'hg-{rev}:{node|short}'
|
||||||
|
|
||||||
if [ -d $srcdir/.svn ]; then
|
|
||||||
cd $srcdir
|
|
||||||
(svnversion -c 2>/dev/null || svnversion .) | \
|
|
||||||
sed -e 's,\([0-9]*\)[A-Z]*,\1,' \
|
|
||||||
-e 's,[0-9]*:\([0-9]*\)[A-Z]*,\1,'
|
|
||||||
else
|
|
||||||
cd $srcdir
|
|
||||||
git svn info | grep Revision | awk '{ print $2 }'
|
|
||||||
fi
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ header=$srcdir/include/SDL_revision.h
|
||||||
|
|
||||||
rev=`sh showrev.sh`
|
rev=`sh showrev.sh`
|
||||||
if [ "$rev" != "" ]; then
|
if [ "$rev" != "" ]; then
|
||||||
echo "#define SDL_REVISION $rev" >$header.new
|
echo "#define SDL_REVISION \"$rev\"" >$header.new
|
||||||
if diff $header $header.new >/dev/null 2>&1; then
|
if diff $header $header.new >/dev/null 2>&1; then
|
||||||
rm $header.new
|
rm $header.new
|
||||||
else
|
else
|
||||||
|
|
|
@ -139,8 +139,11 @@ extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Get the code revision of SDL that is linked against your program.
|
* \brief Get the code revision of SDL that is linked against your program.
|
||||||
|
*
|
||||||
|
* This is an arbitrary string (a hash value, actually), and is only useful
|
||||||
|
* in comparing against other revisions. It is NOT an incrementing number.
|
||||||
*/
|
*/
|
||||||
extern DECLSPEC int SDLCALL SDL_GetRevision(void);
|
extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
|
||||||
|
|
||||||
/* Ends C function definitions when using C++ */
|
/* Ends C function definitions when using C++ */
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -271,7 +271,7 @@ SDL_GetVersion(SDL_version * ver)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get the library source revision */
|
/* Get the library source revision */
|
||||||
int
|
const char *
|
||||||
SDL_GetRevision(void)
|
SDL_GetRevision(void)
|
||||||
{
|
{
|
||||||
return SDL_REVISION;
|
return SDL_REVISION;
|
||||||
|
|
|
@ -20,10 +20,10 @@ main(int argc, char *argv[])
|
||||||
printf("Compiled with SDL older than 1.3\n");
|
printf("Compiled with SDL older than 1.3\n");
|
||||||
#endif
|
#endif
|
||||||
SDL_VERSION(&compiled);
|
SDL_VERSION(&compiled);
|
||||||
printf("Compiled version: %d.%d.%d-%d\n",
|
printf("Compiled version: %d.%d.%d (%s)\n",
|
||||||
compiled.major, compiled.minor, compiled.patch, SDL_REVISION);
|
compiled.major, compiled.minor, compiled.patch, SDL_REVISION);
|
||||||
SDL_GetVersion(&linked);
|
SDL_GetVersion(&linked);
|
||||||
printf("Linked version: %d.%d.%d-%d\n",
|
printf("Linked version: %d.%d.%d (%s)\n",
|
||||||
linked.major, linked.minor, linked.patch, SDL_GetRevision());
|
linked.major, linked.minor, linked.patch, SDL_GetRevision());
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
return (0);
|
return (0);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue