[win32] new installer artwork

[vuplus_xbmc] / project / Win32BuildSetup / XBMC for Windows.nsi

diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index bbba045..3c993e9 100644 (file)
--- a/project/Win32BuildSetup/XBMC for Windows.nsi
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi
@@ -46,12 +46,10 @@
 ;Interface Settings
 
   !define MUI_HEADERIMAGE
-  !define MUI_ICON "..\..\xbmc\win32\xbmc.ico"
-  ;!define MUI_HEADERIMAGE_BITMAP "xbmc-banner.bmp"
-  ;!define MUI_HEADERIMAGE_RIGHT
-  !define MUI_WELCOMEFINISHPAGE_BITMAP "xbmc-left.bmp"
+  !define MUI_ICON "..\..\tools\windows\packaging\media\xbmc.ico"
+  !define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp"
+  !define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp"
   !define MUI_COMPONENTSPAGE_SMALLDESC
-  ;!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
   !define MUI_FINISHPAGE_LINK "Please visit http://xbmc.org for more information."
   !define MUI_FINISHPAGE_LINK_LOCATION "http://xbmc.org"
   !define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_NAME}.exe"
@@ -105,17 +103,23 @@ 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"
   File /r /x *.so "${xbmc_root}\Xbmc\sounds\*.*"
-  SetOutPath "$INSTDIR\system"
-  
+
+  RMDir /r $INSTDIR\addons
+  SetOutPath "$INSTDIR\addons"
+  File /r /x skin.touched ${xbmc_root}\Xbmc\addons\*.*
+
   ; delete system/python if its there
+  SetOutPath "$INSTDIR\system"
   IfFileExists $INSTDIR\system\python 0 +2
     RMDir /r $INSTDIR\system\python
   
-  File /r /x *.so /x mplayer /x *_d.* /x tcl85g.dll /x tclpip85g.dll /x tk85g.dll "${xbmc_root}\Xbmc\system\*.*"
+  File /r /x *.so /x *_d.* /x tcl85g.dll /x tclpip85g.dll /x tk85g.dll "${xbmc_root}\Xbmc\system\*.*"
   
   ; delete  msvc?90.dll's in INSTDIR, we use the vcredist installer later
   Delete "$INSTDIR\msvcr90.dll"
@@ -129,11 +133,6 @@ Section "XBMC" SecXBMC
   
   ;Turn on overwrite for rest of install
   SetOverwrite on
-  RMDir /r $INSTDIR\addons
-  SetOutPath "$INSTDIR\addons"
-  File /r /x skin.touched ${xbmc_root}\Xbmc\addons\*.*
-  ;SetOutPath "$INSTDIR\web"
-  ;File /r "${xbmc_root}\Xbmc\web\*.*"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\${APP_NAME}" "" $INSTDIR
@@ -145,9 +144,6 @@ Section "XBMC" SecXBMC
   ;Create shortcuts
   SetOutPath "$INSTDIR"
   
-  ; delete old windowed link
-  Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk"
-  
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_NAME}.exe" \
     "" "$INSTDIR\${APP_NAME}.exe" 0 SW_SHOWNORMAL \
@@ -181,17 +177,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
@@ -203,16 +188,6 @@ SectionEnd
 !include /nonfatal "skins.nsi"
 SectionGroupEnd
 
-;SectionGroup "Scripts" SecScripts
-;scripts.nsi is generated by genNsisIncludes.bat
-!include /nonfatal "scripts.nsi"
-;SectionGroupEnd
-
-;SectionGroup "Plugins" SecPlugins
-;plugins.nsi is generated by genNsisIncludes.bat
-!include /nonfatal "plugins.nsi"
-;SectionGroupEnd
-
 SectionGroup "PVR Addons" SecPvrAddons
 ;xbmc-pvr-addons.nsi is generated by genNsisIncludes.bat
 !include /nonfatal "xbmc-pvr-addons.nsi"
@@ -282,8 +257,11 @@ Section "Uninstall"
   Delete "$INSTDIR\xbmc.log"
   Delete "$INSTDIR\xbmc.old.log"
   Delete "$INSTDIR\python26.dll"
+  Delete "$INSTDIR\python27.dll"
   Delete "$INSTDIR\libcdio-*.dll"
   Delete "$INSTDIR\libiconv-2.dll"
+  Delete "$INSTDIR\libxml2.dll"
+  Delete "$INSTDIR\iconv.dll"
   RMDir /r "$INSTDIR\language"
   RMDir /r "$INSTDIR\media"
   RMDir /r "$INSTDIR\plugins"
@@ -315,8 +293,6 @@ Section "Uninstall"
   
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   Delete "$SMPROGRAMS\$StartMenuFolder\${APP_NAME}.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Portable).lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall ${APP_NAME}.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url"
   RMDir "$SMPROGRAMS\$StartMenuFolder"