From b58d8451b8837ccb23432e44267fff1f5844966c Mon Sep 17 00:00:00 2001
From: theuni <theuni-nospam-@xbmc.org>
Date: Sat, 5 Mar 2011 23:52:13 -0500
Subject: [PATCH] changed: prepend version string with "date-"

This is the date of the last revision  and _not_ the compile date.
Should help with sorting as well as eyeballing versions.

In addition, the Windows binary has been renamed from XBMCSetup-Rev_[revision]
to XBMCSetup-[date-revision].

Thanks to CrystalP and jcarroll for the Windows help.
---
 addons/skin.confluence/720p/SettingsSystemInfo.xml | 2 +-
 configure.in                                       | 2 +-
 project/Win32BuildSetup/BuildSetup.bat             | 3 +--
 project/Win32BuildSetup/XBMC for Windows.nsi       | 2 +-
 project/Win32BuildSetup/extract_git_rev.bat        | 2 +-
 project/Win32BuildSetup/readme.txt                 | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml
index fb04f0fc501de..aee01fbb1bef3 100644
--- a/addons/skin.confluence/720p/SettingsSystemInfo.xml
+++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml
@@ -266,7 +266,7 @@
 					<description>XBMC XBE BUILD Version</description>
 					<posx>750</posx>
 					<posy>400</posy>
-					<width>700</width>
+					<width>730</width>
 					<label>144</label>
 					<align>right</align>
 					<textcolor>blue</textcolor>
diff --git a/configure.in b/configure.in
index 9109b6f4c449b..a76aba77196de 100644
--- a/configure.in
+++ b/configure.in
@@ -1237,7 +1237,7 @@ else
 fi
 
 if test "$HAVE_GIT" = "yes"; then
-  GIT_REV=$(git rev-parse --short HEAD)
+  GIT_REV=$(git log -1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
 fi
 if test "$GIT_REV" = ""; then
   GIT_REV="Unknown"
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 27b466492ed8d..c8dde94ca077c 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -207,8 +207,7 @@ IF %comp%==vs2010 (
   call genNsisIncludes.bat
   ECHO ------------------------------------------------------------
   CALL extract_git_rev.bat
-  SET GIT_REV=_%GIT_REV%
-  SET XBMC_SETUPFILE=XBMCSetup-Rev%GIT_REV%-%target%.exe
+  SET XBMC_SETUPFILE=XBMCSetup-%GIT_REV%-%target%.exe
   ECHO Creating installer %XBMC_SETUPFILE%...
   IF EXIST %XBMC_SETUPFILE% del %XBMC_SETUPFILE% > NUL
   rem get path to makensis.exe from registry, first try tab delim
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index f9a3c6b16e7d5..1daa66d094263 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi	
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi	
@@ -15,7 +15,7 @@
 
   ;Name and file
   Name "XBMC"
-  OutFile "XBMCSetup-Rev${xbmc_revision}-${xbmc_target}.exe"
+  OutFile "XBMCSetup-${xbmc_revision}-${xbmc_target}.exe"
 
   XPStyle on
   
diff --git a/project/Win32BuildSetup/extract_git_rev.bat b/project/Win32BuildSetup/extract_git_rev.bat
index dfd3c08e017af..47ccdf4a9a4b8 100644
--- a/project/Win32BuildSetup/extract_git_rev.bat
+++ b/project/Win32BuildSetup/extract_git_rev.bat
@@ -26,7 +26,7 @@ GOTO :done
 
 SET oldCurrentDir=%CD%
 CD ..\..
-FOR /F "tokens=1 delims= " %%A IN ('%GITEXE% rev-parse --short HEAD') DO SET GIT_REV=%%A
+FOR /F "tokens=1-4 delims=-" %%A IN ('"%GITEXE% --no-pager log -1 --date=short --pretty=format:"%%cd-%%h""') DO SET GIT_REV=%%A%%B%%C-%%D
 CD %oldCurrentDir%
 
 :done
diff --git a/project/Win32BuildSetup/readme.txt b/project/Win32BuildSetup/readme.txt
index 6aaa53dd27a69..b34af5e30ad5b 100644
--- a/project/Win32BuildSetup/readme.txt
+++ b/project/Win32BuildSetup/readme.txt
@@ -8,4 +8,4 @@ Usage:
 1) Run BuildSetup.bat in project\Win32BuildSetup
 2) Watch the screen, maybe you're asked for input
 3) Wait... Wait... Wait...
-You should now have XBMCSetup-Rev<svnrevisionnr>.exe file.
+You should now have XBMCSetup-<lastcommitdate-gitrev>.exe file.