[win32] update BuildSetup.bat and installer

diff --git a/.gitignore b/.gitignore
index 1a39ec6..90b4a63 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -349,6 +349,7 @@ lib/cpluff/stamp-h1
 /project/Win32BuildSetup/XBMCSetup*.exe
 /project/Win32BuildSetup/languages.nsi
 /project/Win32BuildSetup/skins.nsi
+/project/Win32BuildSetup/xbmc-audioencoder-addons.nsi
 /project/Win32BuildSetup/xbmc-pvr-addons.nsi
 /project/Win32BuildSetup/bgprocess
 /project/Win32BuildSetup/makeclean

diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index f096fc6..10eea3c 100644 (file)
--- 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 6c66860..364e080 100644 (file)
--- 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 2a87c28..5a146db 100644 (file)
--- 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.=!