diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2013-09-02 18:14:25 +0200 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2013-09-02 19:49:17 +0200 |
| commit | 196a78dabf965a9c4edb866f5241b29b51577f0a (patch) | |
| tree | 284c3c928ba47b2d7b2d33414f0befdb127f9875 /project | |
| parent | 3490694a0375a58881e176e6dc8e0ea7ae83bd6d (diff) | |
[win32] installer: remove language checkbox and just install all languages
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/XBMC for Windows.nsi | 13 | ||||
| -rw-r--r-- | project/Win32BuildSetup/genNsisIncludes.bat | 15 |
2 files changed, 3 insertions, 25 deletions
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi index bbba04557c..70c1869ac7 100644 --- a/project/Win32BuildSetup/XBMC for Windows.nsi +++ b/project/Win32BuildSetup/XBMC for Windows.nsi @@ -105,6 +105,8 @@ Section "XBMC" SecXBMC File "${xbmc_root}\Xbmc\copying.txt" File "${xbmc_root}\Xbmc\LICENSE.GPL" File "${xbmc_root}\Xbmc\*.dll" + SetOutPath "$INSTDIR\language" + File /r /x *.so "${xbmc_root}\Xbmc\language\*.*" SetOutPath "$INSTDIR\media" File /r /x *.so "${xbmc_root}\Xbmc\media\*.*" SetOutPath "$INSTDIR\sounds" @@ -181,17 +183,6 @@ Section "XBMC" SecXBMC SectionEnd -SectionGroup "Language" SecLanguages -Section "English" SecLanguageEnglish - 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\*.*" -SectionEnd -;languages.nsi is generated by genNsisIncludes.bat -!include /nonfatal "languages.nsi" -SectionGroupEnd - SectionGroup "Skins" SecSkins Section "Confluence" SecSkinConfluence SectionIn 1 2 3 #section is in install type Full/Normal/Minimal diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat index 016cb2953a..2a87c2898d 100644 --- a/project/Win32BuildSetup/genNsisIncludes.bat +++ b/project/Win32BuildSetup/genNsisIncludes.bat @@ -8,23 +8,10 @@ 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 IF EXIST skins.nsi del skins.nsi > NUL SETLOCAL ENABLEDELAYEDEXPANSION -SET Counter=1 -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 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 - SET /A Counter = !Counter! + 1 - ) -) SET Counter=1 FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\Xbmc\xbmc-pvr-addons') DO ( |