From 0779020f47fb4b9f0648a33bfa725f7ca890857d Mon Sep 17 00:00:00 2001
From: Martijn Kaijser <mcm.kaijser@gmail.com>
Date: Wed, 21 Aug 2013 17:51:01 +0200
Subject: [win32]installer changes: add normal install mode without PVR and
 touched. Make languages manditory on all install types.

---
 project/Win32BuildSetup/XBMC for Windows.nsi | 20 ++++++++++++--------
 project/Win32BuildSetup/genNsisIncludes.bat  |  5 +++--
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'project/Win32BuildSetup')

diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index e15edf76ba..bbba04557c 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi	
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi	
@@ -86,15 +86,19 @@
   !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
-;Installer Sections
+;Install levels
+
+InstType "Full"    ; 1.
+InstType "Normal"  ; 2.
+InstType "Minimal" ; 3.
 
-InstType "Full"
-InstType "Minimal" 
+;--------------------------------
+;Installer Sections
 
 Section "XBMC" SecXBMC
   SetShellVarContext current
   SectionIn RO
-  SectionIn 1 2 #section is in installtype Full and Minimal
+  SectionIn 1 2 3 #section is in install type Normal/Full/Minimal
   ;ADD YOUR OWN FILES HERE...
   SetOutPath "$INSTDIR"
   File "${xbmc_root}\Xbmc\XBMC.exe"
@@ -179,7 +183,7 @@ SectionEnd
 
 SectionGroup "Language" SecLanguages
 Section "English" SecLanguageEnglish
-  SectionIn 1 2 #section is in installtype Full and Minimal
+  SectionIn 1 2 3 #section is in install type Full/Normal/Minimal
   SectionIn RO
   SetOutPath "$INSTDIR\language\English"
   File /r "${xbmc_root}\Xbmc\language\English\*.*"
@@ -190,7 +194,7 @@ SectionGroupEnd
 
 SectionGroup "Skins" SecSkins
 Section "Confluence" SecSkinConfluence
-  SectionIn 1 2 #section is in installtype Full and Minimal
+  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\*.*"
@@ -327,7 +331,7 @@ SectionEnd
 
 Section "Microsoft Visual C++ 2008/2010 Redistributable Package (x86)" SEC_VCREDIST
 
-  SectionIn 1 2
+  SectionIn 1 2 #section is in install type Full/Normal and when not installed
   
   DetailPrint "Running VS Redist Setup..."
 
@@ -356,7 +360,7 @@ SectionEnd
 
 Section "DirectX Install" SEC_DIRECTX
  
-  SectionIn 1 2
+  SectionIn 1 2 #section is in install type Full/Normal and when not installed
 
   DetailPrint "Running DirectX Setup..."
 
diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat
index a03d633968..016cb2953a 100644
--- a/project/Win32BuildSetup/genNsisIncludes.bat
+++ b/project/Win32BuildSetup/genNsisIncludes.bat
@@ -6,7 +6,7 @@ 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 1. Full / 2. Normal  / 3. Minimal
 rem languages
 IF EXIST languages.nsi del languages.nsi > NUL
 IF EXIST xbmc-pvr-addons.nsi del xbmc-pvr-addons.nsi > NUL
@@ -17,7 +17,8 @@ FOR /F "tokens=*" %%S IN ('dir /B /AD BUILD_WIN32\Xbmc\language') DO (
   rem English is already included as default language
   IF "%%S" NEQ "English" (
     ECHO Section "%%S" SecLanguage!Counter! >> languages.nsi
-    ECHO SectionIn 1 #section is in installtype Full >> languages.nsi
+    ECHO SectionIn 1 2 3 #section is in installtype Full/Normal >> languages.nsi
+    ECHO SectionIn RO #section is in installtype Manditory >> languages.nsi
     ECHO SetOutPath "$INSTDIR\language\%%S" >> languages.nsi
     ECHO File /r "${xbmc_root}\Xbmc\language\%%S\*.*" >> languages.nsi
     ECHO SectionEnd >> languages.nsi
-- 
cgit v1.2.3