Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 9eaf1cd020a71b1a0495737f576a99f33aaf58b2 1 parent 74fa128
wsoltys wsoltys authored

Showing 1 changed file with 7 additions and 5 deletions. Show diff stats Hide diff stats

  1. +7 5 project/Win32BuildSetup/BuildSetup.bat
12 project/Win32BuildSetup/BuildSetup.bat
@@ -25,6 +25,7 @@ SET promptlevel=prompt
25 25 SET buildmingwlibs=true
26 26 SET exitcode=0
27 27 SET useshell=rxvt
  28 +SET BRANCH=na
28 29 FOR %%b in (%1, %2, %3, %4, %5) DO (
29 30 IF %%b==vs2010 SET comp=vs2010
30 31 IF %%b==dx SET target=dx
@@ -58,6 +59,7 @@ IF %comp%==vs2010 (
58 59 set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /clean "%buildconfig%"
59 60 set EXE= "..\VS2010Express\XBMC\%buildconfig%\XBMC.exe"
60 61 set PDB= "..\VS2010Express\XBMC\%buildconfig%\XBMC.pdb"
  62 + for /f "tokens=* delims= " %%a in ('git rev-parse --abbrev-ref HEAD') do set BRANCH=%%a
61 63
62 64 rem CONFIG END
63 65 rem -------------------------------------------------------------
@@ -112,7 +114,7 @@ IF %comp%==vs2010 (
112 114 ECHO ------------------------------------------------------------
113 115 ECHO Cleaning Solution...
114 116 %NET% %CLEAN_EXE%
115   - ECHO Compiling XBMC...
  117 + ECHO Compiling XBMC branch %BRANCH%...
116 118 %NET% %OPTS_EXE%
117 119 IF NOT EXIST %EXE% (
118 120 set DIETEXT="XBMC.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
@@ -129,7 +131,7 @@ IF %comp%==vs2010 (
129 131 :COMPILE_NO_CLEAN_EXE
130 132 ECHO Wait while preparing the build.
131 133 ECHO ------------------------------------------------------------
132   - ECHO Compiling Solution...
  134 + ECHO Compiling XBMC branch %BRANCH%...
133 135 %NET% %OPTS_EXE%
134 136 IF NOT EXIST %EXE% (
135 137 set DIETEXT="XBMC.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
@@ -240,8 +242,8 @@ IF %comp%==vs2010 (
240 242 ECHO ------------------------------------------------------------
241 243 call getdeploydependencies.bat
242 244 CALL extract_git_rev.bat > NUL
243   - SET XBMC_SETUPFILE=XBMCSetup-%GIT_REV%-%target%.exe
244   - SET XBMC_PDBFILE=XBMCSetup-%GIT_REV%-%target%.pdb
  245 + SET XBMC_SETUPFILE=XBMCSetup-%GIT_REV%-%BRANCH%.exe
  246 + SET XBMC_PDBFILE=XBMCSetup-%GIT_REV%-%BRANCH%.pdb
245 247 ECHO Creating installer %XBMC_SETUPFILE%...
246 248 IF EXIST %XBMC_SETUPFILE% del %XBMC_SETUPFILE% > NUL
247 249 rem get path to makensis.exe from registry, first try tab delim
@@ -280,7 +282,7 @@ IF %comp%==vs2010 (
280 282 )
281 283
282 284 SET NSISExe=%NSISExePath%\makensis.exe
283   - "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%target%" "XBMC for Windows.nsi"
  285 + "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%BRANCH%" "XBMC for Windows.nsi"
284 286 IF NOT EXIST "%XBMC_SETUPFILE%" (
285 287 set DIETEXT=Failed to create %XBMC_SETUPFILE%. NSIS installed?
286 288 goto DIE

0 comments on commit 9eaf1cd

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