Skip to content
Browse files

[WIN32] fixed: setup file name got the branch name back.

  • Loading branch information...
1 parent 74fa128 commit 9eaf1cd020a71b1a0495737f576a99f33aaf58b2 wsoltys committed Apr 14, 2013
Showing with 7 additions and 5 deletions.
  1. +7 −5 project/Win32BuildSetup/BuildSetup.bat
View
12 project/Win32BuildSetup/BuildSetup.bat
@@ -25,6 +25,7 @@ SET promptlevel=prompt
SET buildmingwlibs=true
SET exitcode=0
SET useshell=rxvt
+SET BRANCH=na
FOR %%b in (%1, %2, %3, %4, %5) DO (
IF %%b==vs2010 SET comp=vs2010
IF %%b==dx SET target=dx
@@ -58,6 +59,7 @@ IF %comp%==vs2010 (
set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /clean "%buildconfig%"
set EXE= "..\VS2010Express\XBMC\%buildconfig%\XBMC.exe"
set PDB= "..\VS2010Express\XBMC\%buildconfig%\XBMC.pdb"
+ for /f "tokens=* delims= " %%a in ('git rev-parse --abbrev-ref HEAD') do set BRANCH=%%a
rem CONFIG END
rem -------------------------------------------------------------
@@ -112,7 +114,7 @@ IF %comp%==vs2010 (
ECHO ------------------------------------------------------------
ECHO Cleaning Solution...
%NET% %CLEAN_EXE%
- ECHO Compiling XBMC...
+ ECHO Compiling XBMC branch %BRANCH%...
%NET% %OPTS_EXE%
IF NOT EXIST %EXE% (
set DIETEXT="XBMC.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
@@ -129,7 +131,7 @@ IF %comp%==vs2010 (
:COMPILE_NO_CLEAN_EXE
ECHO Wait while preparing the build.
ECHO ------------------------------------------------------------
- ECHO Compiling Solution...
+ ECHO Compiling XBMC branch %BRANCH%...
%NET% %OPTS_EXE%
IF NOT EXIST %EXE% (
set DIETEXT="XBMC.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
@@ -240,8 +242,8 @@ IF %comp%==vs2010 (
ECHO ------------------------------------------------------------
call getdeploydependencies.bat
CALL extract_git_rev.bat > NUL
- SET XBMC_SETUPFILE=XBMCSetup-%GIT_REV%-%target%.exe
- SET XBMC_PDBFILE=XBMCSetup-%GIT_REV%-%target%.pdb
+ SET XBMC_SETUPFILE=XBMCSetup-%GIT_REV%-%BRANCH%.exe
+ SET XBMC_PDBFILE=XBMCSetup-%GIT_REV%-%BRANCH%.pdb
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
@@ -280,7 +282,7 @@ IF %comp%==vs2010 (
)
SET NSISExe=%NSISExePath%\makensis.exe
- "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%target%" "XBMC for Windows.nsi"
+ "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%BRANCH%" "XBMC for Windows.nsi"
IF NOT EXIST "%XBMC_SETUPFILE%" (
set DIETEXT=Failed to create %XBMC_SETUPFILE%. NSIS installed?
goto DIE

0 comments on commit 9eaf1cd

Please sign in to comment.
Something went wrong with that request. Please try again.