[win32] rename and generalise packaging folders. also simplify NSIS installer to match package folders

4 files changed, 121 insertions, 137 deletions

diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 10eea3c282..d1c44011b9 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -95,9 +95,9 @@ set WORKSPACE=%CD%\..\..
   ECHO [1] a NEW EXE will be compiled for the BUILD_WIN32
   ECHO [2] existing EXE will be updated (quick mode compile) for the BUILD_WIN32
   ECHO ------------------------------------------------------------
-  set /P XBMC_COMPILE_ANSWER=Compile a new EXE? [1/2]:
-  if /I %XBMC_COMPILE_ANSWER% EQU 1 set buildmode=clean
-  if /I %XBMC_COMPILE_ANSWER% EQU 2 set buildmode=noclean
+  set /P APP_COMPILE_ANSWER=Compile a new EXE? [1/2]:
+  if /I %APP_COMPILE_ANSWER% EQU 1 set buildmode=clean
+  if /I %APP_COMPILE_ANSWER% EQU 2 set buildmode=noclean
 
   goto COMPILE_MINGW
   
@@ -201,20 +201,20 @@ set WORKSPACE=%CD%\..\..
   Echo addons\skin.touched\>>exclude.txt
   Echo addons\skin.confluence\>>exclude.txt
   
-  md BUILD_WIN32\Xbmc
+  md BUILD_WIN32\application
 
-  xcopy %EXE% BUILD_WIN32\Xbmc > NUL
-  xcopy ..\..\userdata BUILD_WIN32\Xbmc\userdata /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
-  copy ..\..\copying.txt BUILD_WIN32\Xbmc > NUL
-  copy ..\..\LICENSE.GPL BUILD_WIN32\Xbmc > NUL
-  copy ..\..\known_issues.txt BUILD_WIN32\Xbmc > NUL
-  xcopy dependencies\*.* BUILD_WIN32\Xbmc /Q /I /Y /EXCLUDE:exclude.txt  > NUL
+  xcopy %EXE% BUILD_WIN32\application > NUL
+  xcopy ..\..\userdata BUILD_WIN32\application\userdata /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
+  copy ..\..\copying.txt BUILD_WIN32\application > NUL
+  copy ..\..\LICENSE.GPL BUILD_WIN32\application > NUL
+  copy ..\..\known_issues.txt BUILD_WIN32\application > NUL
+  xcopy dependencies\*.* BUILD_WIN32\application /Q /I /Y /EXCLUDE:exclude.txt  > NUL
   
-  xcopy ..\..\language BUILD_WIN32\Xbmc\language /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
-  xcopy ..\..\addons BUILD_WIN32\Xbmc\addons /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
-  xcopy ..\..\system BUILD_WIN32\Xbmc\system /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
-  xcopy ..\..\media BUILD_WIN32\Xbmc\media /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
-  xcopy ..\..\sounds BUILD_WIN32\Xbmc\sounds /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
+  xcopy ..\..\language BUILD_WIN32\application\language /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
+  xcopy ..\..\addons BUILD_WIN32\application\addons /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
+  xcopy ..\..\system BUILD_WIN32\application\system /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
+  xcopy ..\..\media BUILD_WIN32\application\media /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
+  xcopy ..\..\sounds BUILD_WIN32\application\sounds /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
   
   ECHO ------------------------------------------------------------
   call buildpvraddons.bat
@@ -255,11 +255,11 @@ set WORKSPACE=%CD%\..\..
   TITLE XBMC for Windows Build Script
 
   IF EXIST exclude.txt del exclude.txt  > NUL
-  del /s /q /f BUILD_WIN32\Xbmc\*.so  > NUL
-  del /s /q /f BUILD_WIN32\Xbmc\*.h  > NUL
-  del /s /q /f BUILD_WIN32\Xbmc\*.cpp  > NUL
-  del /s /q /f BUILD_WIN32\Xbmc\*.exp  > NUL
-  del /s /q /f BUILD_WIN32\Xbmc\*.lib  > NUL
+  del /s /q /f BUILD_WIN32\application\*.so  > NUL
+  del /s /q /f BUILD_WIN32\application\*.h  > NUL
+  del /s /q /f BUILD_WIN32\application\*.cpp  > NUL
+  del /s /q /f BUILD_WIN32\application\*.exp  > NUL
+  del /s /q /f BUILD_WIN32\application\*.lib  > NUL
   
   ECHO ------------------------------------------------------------
   ECHO Build Succeeded!
@@ -272,10 +272,10 @@ set WORKSPACE=%CD%\..\..
   ECHO ------------------------------------------------------------
   call getdeploydependencies.bat
   CALL extract_git_rev.bat > NUL
-  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
+  SET APP_SETUPFILE=XBMCSetup-%GIT_REV%-%BRANCH%.exe
+  SET APP_PDBFILE=XBMCSetup-%GIT_REV%-%BRANCH%.pdb
+  ECHO Creating installer %APP_SETUPFILE%...
+  IF EXIST %APP_SETUPFILE% del %APP_SETUPFILE% > NUL
   rem get path to makensis.exe from registry, first try tab delim
   FOR /F "tokens=2* delims=	" %%A IN ('REG QUERY "HKLM\Software\NSIS" /ve') DO SET NSISExePath=%%B
 
@@ -312,15 +312,15 @@ set WORKSPACE=%CD%\..\..
   )
 
   SET NSISExe=%NSISExePath%\makensis.exe
-  "%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?
+  "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /Dapp_revision="%GIT_REV%" /Dapp_target="%target%" /Dapp_branch="%BRANCH%" "XBMC for Windows.nsi"
+  IF NOT EXIST "%APP_SETUPFILE%" (
+	  set DIETEXT=Failed to create %APP_SETUPFILE%. NSIS installed?
 	  goto DIE
   )
-  copy %PDB% %XBMC_PDBFILE% > nul
+  copy %PDB% %APP_PDBFILE% > nul
   ECHO ------------------------------------------------------------
   ECHO Done!
-  ECHO Setup is located at %CD%\%XBMC_SETUPFILE%
+  ECHO Setup is located at %CD%\%APP_SETUPFILE%
   ECHO ------------------------------------------------------------
   GOTO VIEWLOG_EXE
   
@@ -345,8 +345,8 @@ set WORKSPACE=%CD%\..\..
   goto END
   )
 
-  set /P XBMC_BUILD_ANSWER=View the build log in your HTML browser? [y/n]
-  if /I %XBMC_BUILD_ANSWER% NEQ y goto END
+  set /P APP_BUILD_ANSWER=View the build log in your HTML browser? [y/n]
+  if /I %APP_BUILD_ANSWER% NEQ y goto END
   
   SET log="%CD%\..\vs2010express\XBMC\%buildconfig%\objs\" XBMC.log
   
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index 39d1a0f459..2e810512d3 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi
@@ -1,4 +1,4 @@
-;XBMC for Windows install script
+;Application for Windows install script
 ;Copyright (C) 2005-2013 Team XBMC
 ;http://xbmc.org
 
@@ -19,7 +19,7 @@
 
   ;Name and file
   Name "${APP_NAME}"
-  OutFile "${APP_NAME}Setup-${xbmc_revision}-${xbmc_branch}.exe"
+  OutFile "${APP_NAME}Setup-${app_revision}-${app_branch}.exe"
 
   XPStyle on
   
@@ -91,7 +91,7 @@ InstType "Minimal" ; 3.
 ;--------------------------------
 ;Installer Sections
 
-Section "XBMC" SecXBMC
+Section "XBMC" SecAPP
   SetShellVarContext current
   SectionIn RO
   SectionIn 1 2 3 #section is in install type Normal/Full/Minimal
@@ -105,26 +105,23 @@ Section "XBMC" SecXBMC
   
   ;Start copying files
   SetOutPath "$INSTDIR"
-  File "${xbmc_root}\Xbmc\XBMC.exe"
-  File "${xbmc_root}\Xbmc\copying.txt"
-  File "${xbmc_root}\Xbmc\LICENSE.GPL"
-  File "${xbmc_root}\Xbmc\*.dll"
+  File "${app_root}\application\*.*"
   SetOutPath "$INSTDIR\addons"
-  File /r /x skin.touched ${xbmc_root}\Xbmc\addons\*.*
+  File /r "${app_root}\application\addons\*.*"
   SetOutPath "$INSTDIR\language"
-  File /r "${xbmc_root}\Xbmc\language\*.*"
+  File /r "${app_root}\application\language\*.*"
   SetOutPath "$INSTDIR\media"
-  File /r "${xbmc_root}\Xbmc\media\*.*"
+  File /r "${app_root}\application\media\*.*"
   SetOutPath "$INSTDIR\sounds"
-  File /r "${xbmc_root}\Xbmc\sounds\*.*"
+  File /r "${app_root}\application\sounds\*.*"
   SetOutPath "$INSTDIR\system"
-  File /r "${xbmc_root}\Xbmc\system\*.*"
+  File /r "${app_root}\application\system\*.*"
   
   ;Turn off overwrite to prevent files in APPDATA\xbmc\userdata\ from being overwritten
   SetOverwrite off
   IfFileExists $INSTDIR\userdata\*.* 0 +2
     SetOutPath "$APPDATA\${APP_NAME}\userdata"
-    File /r "${xbmc_root}\Xbmc\userdata\*.*"
+    File /r "${app_root}\application\userdata\*.*"
   
   ;Turn on overwrite for rest of install
   SetOverwrite on
@@ -172,36 +169,20 @@ Section "XBMC" SecXBMC
                  
 SectionEnd
 
-SectionGroup "Skins" SecSkins
-Section "Confluence" SecSkinConfluence
-  SectionIn 1 2 3 #section is in install type Full/Normal/Minimal
-  SectionIn RO
-  SetOutPath "$INSTDIR\addons\skin.confluence\"
-  File /r "${xbmc_root}\Xbmc\addons\skin.confluence\*.*"
-SectionEnd
-;skins.nsi is generated by genNsisIncludes.bat
-!include /nonfatal "skins.nsi"
-SectionGroupEnd
-
-SectionGroup "PVR Addons" SecPvrAddons
-;xbmc-pvr-addons.nsi is generated by genNsisIncludes.bat
-!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
+;*-addons.nsi are generated by genNsisIncludes.bat
+!include /nonfatal "audioencoder-addons.nsi"
+!include /nonfatal "pvr-addons.nsi"
+!include /nonfatal "skin-addons.nsi"
 
 ;--------------------------------
 ;Descriptions
 
   ;Language strings
-  LangString DESC_SecXBMC ${LANG_ENGLISH} "${APP_NAME}"
+  LangString DESC_SecAPP ${LANG_ENGLISH} "${APP_NAME}"
 
   ;Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXBMC} $(DESC_SecXBMC)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAPP} $(DESC_SecAPP)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -278,62 +259,53 @@ SectionEnd
 
 ;--------------------------------
 ;vs redist installer Section
-
-Section "Microsoft Visual C++ 2008/2010/2013 Redistributable Package (x86)" SEC_VCREDIST
-
-  SectionIn 1 2 #section is in install type Full/Normal and when not installed
-  
-  DetailPrint "Running VS Redist Setup..."
-
+SectionGroup "Microsoft Visual C++ packages" SEC_VCREDIST
+Section "VS2008 C++ re-distributable Package (x86)" SEC_VCREDIST1
   ;vc90 for python
+  DetailPrint "Running VS2008 re-distributable setup..."
+  SectionIn 1 2 #section is in install type Full 
   SetOutPath "$TEMP\vc2008"
-  File "${xbmc_root}\..\dependencies\vcredist\2008\vcredist_x86.exe"
+  File "${app_root}\..\dependencies\vcredist\2008\vcredist_x86.exe"
   ExecWait '"$TEMP\vc2008\vcredist_x86.exe" /q' $VSRedistSetupError
   RMDir /r "$TEMP\vc2008"
-  
-  ;vc100
+  DetailPrint "Finished VS2008 re-distributable setup"
+SectionEnd
+
+Section "VS2010 C++ re-distributable Package (x86)" SEC_VCREDIST2
+  DetailPrint "Running VS2010 re-distributable setup..."
+  SectionIn 1 2 #section is in install type Full 
   SetOutPath "$TEMP\vc2010"
-  File "${xbmc_root}\..\dependencies\vcredist\2010\vcredist_x86.exe"
-  DetailPrint "Running VS Redist Setup..."
+  File "${app_root}\..\dependencies\vcredist\2008\vcredist_x86.exe"
   ExecWait '"$TEMP\vc2010\vcredist_x86.exe" /q' $VSRedistSetupError
   RMDir /r "$TEMP\vc2010"
-  
-  ;vc120
+  DetailPrint "Finished VS2010 re-distributable setup"
+SectionEnd
+
+Section "VS2013 C++ re-distributable Package (x86)" SEC_VCREDIST3
+DetailPrint "Running VS2013 re-distributable setup..."
+  SectionIn 1 2 #section is in install type Full
   SetOutPath "$TEMP\vc2013"
-  File "${xbmc_root}\..\dependencies\vcredist\2013\vcredist_x86.exe"
-  DetailPrint "Running VS Redist Setup..."
+  File "${app_root}\..\dependencies\vcredist\2013\vcredist_x86.exe"
   ExecWait '"$TEMP\vc2013\vcredist_x86.exe" /q' $VSRedistSetupError
   RMDir /r "$TEMP\vc2013"
- 
-  DetailPrint "Finished VS Redist Setup"
+  DetailPrint "Finished VS2013 re-distributable setup"
   SetOutPath "$INSTDIR"
 SectionEnd
 
-;--------------------------------
-;DirectX webinstaller Section
+SectionGroupEnd
 
+;--------------------------------
+;DirectX web-installer Section
 !define DXVERSIONDLL "$SYSDIR\D3DX9_43.dll"
-
 Section "DirectX Install" SEC_DIRECTX
-
   SectionIn 1 2 #section is in install type Full/Normal and when not installed
-
   DetailPrint "Running DirectX Setup..."
-
   SetOutPath "$TEMP\dxsetup"
-  File "${xbmc_root}\..\dependencies\dxsetup\dsetup32.dll"
-  File "${xbmc_root}\..\dependencies\dxsetup\DSETUP.dll"
-  File "${xbmc_root}\..\dependencies\dxsetup\dxdllreg_x86.cab"
-  File "${xbmc_root}\..\dependencies\dxsetup\DXSETUP.exe"
-  File "${xbmc_root}\..\dependencies\dxsetup\dxupdate.cab"
-  File "${xbmc_root}\..\dependencies\dxsetup\Jun2010_D3DCompiler_43_x86.cab"
-  File "${xbmc_root}\..\dependencies\dxsetup\Jun2010_d3dx9_43_x86.cab"
+  File "${app_root}\..\dependencies\dxsetup\*.*"
   ExecWait '"$TEMP\dxsetup\dxsetup.exe" /silent' $DirectXSetupError
   RMDir /r "$TEMP\dxsetup"
   SetOutPath "$INSTDIR"
-
   DetailPrint "Finished DirectX Setup"
-  
 SectionEnd
 
 Section "-Check DirectX installation" SEC_DIRECTXCHECK
@@ -348,4 +320,8 @@ Function .onInit
     MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Windows Vista or above required.$\nThis program can not be run on Windows XP"
     Quit
   ${EndIf}
+  # set section 'SEC_DIRECTX' as selected and read-only if required dx version not found
+  IfFileExists ${DXVERSIONDLL} +3 0
+  IntOp $0 ${SF_SELECTED} | ${SF_RO}
+  SectionSetFlags ${SEC_DIRECTX} $0
 FunctionEnd
\ No newline at end of file
diff --git a/project/Win32BuildSetup/buildpvraddons.bat b/project/Win32BuildSetup/buildpvraddons.bat
index 81380b2697..acbe066b85 100644
--- a/project/Win32BuildSetup/buildpvraddons.bat
+++ b/project/Win32BuildSetup/buildpvraddons.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 
-REM Batch file to download and build xbmc-pvr-addons and place them in xbmc's addons folder
+REM Batch file to download and build pvr-addons and place them in application's add-ons folder
 
 SET CUR_DIR=%CD%
 SET EXITCODE=0
@@ -55,7 +55,7 @@ REM get the proper revision
 CALL %GITEXE% checkout %VERSION% > NUL 2>&1
 
 :build
-REM run DownloadBuildDeps.bat of xbmc-pvr-addons
+REM run DownloadBuildDeps.bat of pvr-addons
 CD "project\BuildDependencies"
 CALL DownloadBuildDeps.bat > NUL 2>&1
 CD "%CUR_DIR%"
@@ -70,7 +70,7 @@ IF %errorlevel%==1 (
 
 REM copy the built pvr addons into ADDONS_DIR
 CD "%BUILT_ADDONS_DIR%"
-SET ADDONS_DIR=..\..\..\..\Win32BuildSetup\BUILD_WIN32\Xbmc\xbmc-pvr-addons
+SET ADDONS_DIR=..\..\..\..\Win32BuildSetup\BUILD_WIN32\addons\
 
 REM exclude some files
 ECHO addon.xml.in >  exclude.txt
@@ -92,7 +92,7 @@ RMDIR "%TMP_DIR%" /S /Q > NUL
 GOTO done
 
 :error
-ECHO No git command available. Unable to fetch and build xbmc-pvr-addons.
+ECHO No git command available. Unable to fetch and build pvr-addons.
 SET EXITCODE=1
 
 :fail
diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat
index 5a146db075..61b5bc935c 100644
--- a/project/Win32BuildSetup/genNsisIncludes.bat
+++ b/project/Win32BuildSetup/genNsisIncludes.bat
@@ -1,55 +1,63 @@
 @ECHO OFF
-rem XBMC for Windows install script
+rem Application for Windows install script
 rem Copyright (C) 2005-2013 Team XBMC
 rem http://xbmc.org
 
 rem Script by chadoe
-rem This script generates nullsoft installer include files for xbmc's languages
+rem This script generates NullSoft NSIS installer include files for application's add-ons
 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
+IF EXIST *-addons.nsi del *-addons.nsi > NUL
 SETLOCAL ENABLEDELAYEDEXPANSION
 
 SET Counter=1
-FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\Xbmc\xbmc-pvr-addons') DO (
-  SET "output=%%P"
-  SET output=!output:pvr.=!
-  ECHO Section !output! SecPvrAddons!Counter! >> xbmc-pvr-addons.nsi
-  ECHO SectionIn 1 #section is in installtype Full >> xbmc-pvr-addons.nsi
-  ECHO SetOutPath "$INSTDIR\addons\%%P" >> xbmc-pvr-addons.nsi
-  ECHO File /r "${xbmc_root}\Xbmc\xbmc-pvr-addons\%%P\*.*" >> xbmc-pvr-addons.nsi
-  ECHO SectionEnd >> xbmc-pvr-addons.nsi
-  SET /A Counter = !Counter! + 1
+IF EXIST BUILD_WIN32\addons\pvr.* (
+  ECHO SectionGroup "PVR Add-ons" SecPvrAddons >> pvr-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\pvr.*') DO (
+    SET "output=%%P"
+    SET output=!output:pvr.=!
+    ECHO Section "!output!" SecPvrAddons!Counter! >> pvr-addons.nsi
+    ECHO SectionIn 1 #section is in installtype Full >> pvr-addons.nsi
+    ECHO SetOutPath "$INSTDIR\addons\%%P" >> pvr-addons.nsi
+    ECHO File /r "${app_root}\addons\%%P\*.*" >> pvr-addons.nsi
+    ECHO SectionEnd >> pvr-addons.nsi
+    SET /A Counter = !Counter! + 1
+    )
+  ECHO SectionGroupEnd >> pvr-addons.nsi
 )
 
 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
+IF EXIST BUILD_WIN32\addons\audioencoder.* (
+  ECHO SectionGroup "Audio Encoder Add-ons" SecAudioEncoderAddons >> audioencoder-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\audioencoder.*') DO (
+    SET "output=%%P"
+    SET output=!output:audioencoder.=!
+    ECHO Section "!output!" SecAudioEncoderAddons!Counter! >> audioencoder-addons.nsi
+    ECHO SectionIn 1 2 3 #section is in installtype Full >> audioencoder-addons.nsi
+    ECHO SetOutPath "$INSTDIR\addons\%%P" >> audioencoder-addons.nsi
+    ECHO File /r "${app_root}\addons\%%P\*.*" >> audioencoder-addons.nsi
+    ECHO SectionEnd >> audioencoder-addons.nsi
+    SET /A Counter = !Counter! + 1
+    )
+  ECHO SectionGroupEnd >> audioencoder-addons.nsi
 )
 
 SET Counter=1
-FOR /F "tokens=*" %%R IN ('dir /B /AD BUILD_WIN32\Xbmc\addons\skin*') DO (
-  SET "output=%%R"
-  SET output=!output:skin.=!
-  rem Confluence is already included as default skin
-  IF "%%R" NEQ "skin.confluence" (
-    ECHO Section !output! SecSkins!Counter! >> skins.nsi
-    ECHO SectionIn 1 #section is in installtype Full >> skins.nsi
-    ECHO SetOutPath "$INSTDIR\addons\%%R" >> skins.nsi
-    ECHO File /r "${xbmc_root}\Xbmc\addons\%%R\*.*" >> skins.nsi
-    ECHO SectionEnd >> skins.nsi
+IF EXIST BUILD_WIN32\addons\skin.* (
+  ECHO SectionGroup "Skin Add-ons" SecSkinAddons >> skin-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\skin.*') DO (
+    SET "output=%%P"
+    SET output=!output:skin.=!
+    ECHO Section "!output!" SecSkinAddons!Counter! >> skin-addons.nsi
+    ECHO SectionIn 1 #section is in installtype Full >> skin-addons.nsi
+    ECHO SetOutPath "$INSTDIR\addons\%%P" >> skin-addons.nsi
+    ECHO File /r "${app_root}\addons\%%P\*.*" >> skin-addons.nsi
+    ECHO SectionEnd >> skin-addons.nsi
     SET /A Counter = !Counter! + 1
-  )
+    )
+  ECHO SectionGroupEnd >> skin-addons.nsi
 )
+
 ENDLOCAL
\ No newline at end of file