diff options
| author | montellese <montellese@xbmc.org> | 2014-06-07 19:08:11 +0200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-07-10 19:18:05 +1200 |
| commit | 6283cb78a68cc4526884bae1cca28c314055f8c7 (patch) | |
| tree | 30e0f806092bd59859fba5d322ad353161023568 /project/Win32BuildSetup | |
| parent | 3dc239a1615b943922aa2b28535f4786b286c437 (diff) | |
[win32] update BuildSetup.bat and installer
Diffstat (limited to 'project/Win32BuildSetup')
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 12 | ||||
| -rw-r--r-- | project/Win32BuildSetup/XBMC for Windows.nsi | 5 | ||||
| -rw-r--r-- | project/Win32BuildSetup/genNsisIncludes.bat | 15 |
3 files changed, 31 insertions, 1 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index f096fc6a97..10eea3c282 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -226,6 +226,18 @@ set WORKSPACE=%CD%\..\.. IF EXIST error.log del error.log > NUL SET build_path=%CD% ECHO ------------------------------------------------------------ + ECHO Building addons... + cd ..\..\tools\buildsteps\win32 + call make-addons.bat + IF %errorlevel%==1 ( + set DIETEXT="failed to build addons" + cd %build_path% + goto DIE + ) + + cd %build_path% + IF EXIST error.log del error.log > NUL + ECHO ------------------------------------------------------------ ECHO Building Confluence Skin... cd ..\..\addons\skin.confluence call build.bat > NUL diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi index 6c668603a4..364e080826 100644 --- a/project/Win32BuildSetup/XBMC for Windows.nsi +++ b/project/Win32BuildSetup/XBMC for Windows.nsi @@ -188,6 +188,11 @@ SectionGroup "PVR Addons" SecPvrAddons !include /nonfatal "xbmc-pvr-addons.nsi" SectionGroupEnd +SectionGroup "Audio Encoder Addons" SecAudioEncoderAddons +;xbmc-audioencoder-addons.nsi is generated by genNsisIncludes.bat +!include /nonfatal "xbmc-audioencoder-addons.nsi" +SectionGroupEnd + ;-------------------------------- ;Descriptions diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat index 2a87c2898d..5a146db075 100644 --- a/project/Win32BuildSetup/genNsisIncludes.bat +++ b/project/Win32BuildSetup/genNsisIncludes.bat @@ -5,11 +5,12 @@ rem http://xbmc.org rem Script by chadoe rem This script generates nullsoft installer include files for xbmc's languages -rem and pvr addons +rem and addons rem 1. Full / 2. Normal / 3. Minimal rem languages IF EXIST xbmc-pvr-addons.nsi del xbmc-pvr-addons.nsi > NUL +IF EXIST xbmc-audioencoder-addons.nsi del xbmc-audioencoder-addons.nsi > NUL IF EXIST skins.nsi del skins.nsi > NUL SETLOCAL ENABLEDELAYEDEXPANSION @@ -26,6 +27,18 @@ FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\Xbmc\xbmc-pvr-addons') DO ( ) SET Counter=1 +FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\Xbmc\xbmc-addons\audioencoder.*') DO ( + SET "output=%%P" + SET output=!output:audioencoder.=! + ECHO Section !output! SecAudioEncoderAddons!Counter! >> xbmc-audioencoder-addons.nsi + ECHO SectionIn 1 #section is in installtype Full >> xbmc-audioencoder-addons.nsi + ECHO SetOutPath "$INSTDIR\addons\%%P" >> xbmc-audioencoder-addons.nsi + ECHO File /r "${xbmc_root}\Xbmc\xbmc-addons\%%P\*.*" >> xbmc-audioencoder-addons.nsi + ECHO SectionEnd >> xbmc-audioencoder-addons.nsi + SET /A Counter = !Counter! + 1 +) + +SET Counter=1 FOR /F "tokens=*" %%R IN ('dir /B /AD BUILD_WIN32\Xbmc\addons\skin*') DO ( SET "output=%%R" SET output=!output:skin.=! |