Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[win32] fixed: DX runtime setup was not included after 9eaf1cd #2615

Merged
merged 1 commit into from

4 participants

a11599 Memphiz wsoltys Martijn Kaijser
a11599
Collaborator

@wsoltys: This worked in my tests. If you are OK with this then merge please.

a11599 a11599 merged commit 4ffa7d5 into from
a11599 a11599 deleted the branch
Martijn Kaijser

Jenkins now builds it like

XBMCSetup-20130414-4ffa7d5-HEAD.exe 

This is because it doesn't use branches and just builds straight from head.

Collaborator

can we issue a command to make it the current branch @Memphiz ?

Owner

We are using git for determining the branch we are building from. AFAIK there is no way for jenkins to tell us which branch a revision belongs to. We get that info from the command:

git branch -r --contains HEAD | head -n1 | awk '{gsub(".*/","");print $1}'

That is all i know :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
2  project/Win32BuildSetup/BuildSetup.bat
View
@@ -282,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="%BRANCH%" "XBMC for Windows.nsi"
+ "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%target%" /Dxbmc_branch="%BRANCH%" "XBMC for Windows.nsi"
IF NOT EXIST "%XBMC_SETUPFILE%" (
set DIETEXT=Failed to create %XBMC_SETUPFILE%. NSIS installed?
goto DIE
2  project/Win32BuildSetup/XBMC for Windows.nsi
View
@@ -15,7 +15,7 @@
;Name and file
Name "XBMC"
- OutFile "XBMCSetup-${xbmc_revision}-${xbmc_target}.exe"
+ OutFile "XBMCSetup-${xbmc_revision}-${xbmc_branch}.exe"
XPStyle on
Something went wrong with that request. Please try again.