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.
theuni · Mar 6, 2011 · b58d845 · b58d845
1 parent 82cba87
commit b58d845
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.