XBMC Media Center

Revision: 23593
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23593&view=rev
Author:   taxigps
Date:     2009-10-11 05:42:44 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
updated: delete zlib1.dll when uninstall

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-10-11 03:50:20 UTC (rev 23592)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-10-11 05:42:44 UTC (rev 23593)
@@ -318,6 +318,7 @@
   Delete "$INSTDIR\LICENSE.GPL"
   Delete "$INSTDIR\glew32.dll"
   Delete "$INSTDIR\SDL.dll"
+  Delete "$INSTDIR\zlib1.dll"
   Delete "$INSTDIR\xbmc.log"
   Delete "$INSTDIR\xbmc.old.log"
   Delete "$INSTDIR\msvcp71.dll"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24069
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24069&view=rev
Author:   charlydoes
Date:     2009-10-27 20:20:21 +0000 (Tue, 27 Oct 2009)

Log Message:
-----------
[WIN32DX] added: milkdrop presets to installer part 2.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-10-27 20:17:57 UTC (rev 24068)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-10-27 20:20:21 UTC (rev 24069)
@@ -122,6 +122,8 @@
     File /nonfatal /r "${xbmc_root}\Xbmc\visualisations\projectM\*.*"
   !else
     File "${xbmc_root}\Xbmc\visualisations\*_win32dx.vis"
+    SetOutPath "$INSTDIR\visualisations\Milkdrop"
+    File /nonfatal /r "${xbmc_root}\Xbmc\visualisations\Milkdrop\*.*"
   !endif
   SetOutPath "$INSTDIR\web"
   File /r "${xbmc_root}\Xbmc\web\*.*"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24260
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24260&view=rev
Author:   jmarshallnz
Date:     2009-11-04 02:06:40 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
changed: [WIN32 installer] - don't setup separate links for windowed + non-windowed mode.  XBMC starts fullscreen by default now anyway.  Also, distinguish the shortcuts created for portable mode.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-04 01:34:09 UTC (rev 24259)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-04 02:06:40 UTC (rev 24260)
@@ -139,21 +139,15 @@
   SetOutPath "$INSTDIR"
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   ${If} $PageProfileState == "1"
-    StrCpy $RunArgs "-fs -p"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC.lnk" "$INSTDIR\XBMC.exe" \
-      "-fs -p" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
-      "" "Start XBMC in fullscreen."
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk" "$INSTDIR\XBMC.exe" \
+    StrCpy $RunArgs "-p"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC (Portable).lnk" "$INSTDIR\XBMC.exe" \
       "-p" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
-      "" "Start XBMC in windowed mode."
+      "" "Start XBMC (Portable)."
   ${Else}
-    StrCpy $RunArgs "-fs"
+    StrCpy $RunArgs ""
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC.lnk" "$INSTDIR\XBMC.exe" \
-      "-fs" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
-      "" "Start XBMC in fullscreen."
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk" "$INSTDIR\XBMC.exe" \
       "" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
-      "" "Start XBMC in windowed mode."
+      "" "Start XBMC."
   ${EndIf}
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall XBMC.lnk" "$INSTDIR\Uninstall.exe" \
     "" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24393
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24393&view=rev
Author:   wiso
Date:     2009-11-07 21:41:12 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
[WIN32] changed: allow the user to deselect vc_redist as it clutters the root drive with install files even when nothing is to be installed. Anyone knows how to get rid of that?

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-07 21:28:03 UTC (rev 24392)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-07 21:41:12 UTC (rev 24393)
@@ -387,12 +387,13 @@
 ;vs redist installer Section
 
 Section "Microsoft Visual C++ 2008 Redistributable Package (x86)" SEC_VCREDIST
-  SectionIn RO
+
+  SectionIn 1 2
   
   SetOutPath "$TEMP"
   File "${xbmc_root}\Xbmc\vcredist_x86.exe"
   DetailPrint "Running VS Redist Setup..."
-  ExecWait '"$TEMP\vcredist_x86.exe" /Q' $VSRedistSetupError
+  ExecWait '"$TEMP\vcredist_x86.exe" /q' $VSRedistSetupError
   DetailPrint "Finished VS Redist Setup"
  
   Delete "$TEMP\vcredist_x86.exe"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24394
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24394&view=rev
Author:   wiso
Date:     2009-11-07 22:59:43 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
[WIN32] delete the old "XBMC (Windowed).lnk" if it's still there and delete "XBMC (Portable).lnk" on uninstall

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-07 21:41:12 UTC (rev 24393)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-07 22:59:43 UTC (rev 24394)
@@ -139,6 +139,10 @@
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
   ;Create shortcuts
   SetOutPath "$INSTDIR"
+  
+  ; delete old windowed link
+  Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk"
+  
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   ${If} $PageProfileState == "1"
     StrCpy $RunArgs "-p"
@@ -352,6 +356,7 @@
   
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   Delete "$SMPROGRAMS\$StartMenuFolder\XBMC.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Portable).lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall XBMC.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Visit XBMC Online.url"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24395
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24395&view=rev
Author:   wiso
Date:     2009-11-07 23:16:01 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
[WIN32] delete the msvc?90.dlls if they're found in the XBMC installation directory.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-07 22:59:43 UTC (rev 24394)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-07 23:16:01 UTC (rev 24395)
@@ -108,6 +108,10 @@
   SetOutPath "$INSTDIR\system"
   File /r /x *.so /x mplayer "${xbmc_root}\Xbmc\system\*.*"
   
+  ; delete  msvc?90.dll's in INSTDIR, we use the vcredist installer later
+  Delete "$INSTDIR\msvcr90.dll"
+  Delete "$INSTDIR\msvcp90.dll"
+  
   ;Turn off overwrite to prevent files in xbmc\userdata\ from being overwritten
   SetOverwrite off
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24491
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24491&view=rev
Author:   charlydoes
Date:     2009-11-10 19:26:45 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
[WIN32DX] fixed: directx setup asking to reboot halfway the installation.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-10 17:39:11 UTC (rev 24490)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-10 19:26:45 UTC (rev 24491)
@@ -382,7 +382,7 @@
   SetOutPath "$TEMP"
   File "${xbmc_root}\Xbmc\dxwebsetup.exe"
   DetailPrint "Running DirectX Setup..."
-  ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
+  ExecWait '"$TEMP\dxwebsetup.exe" /Q /r:n' $DirectXSetupError
   DetailPrint "Finished DirectX Setup"
  
   Delete "$TEMP\dxwebsetup.exe"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24820
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24820&view=rev
Author:   jmarshallnz
Date:     2009-11-21 07:49:21 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
changed: cleaned up some strings in the win32 installer.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-21 07:30:41 UTC (rev 24819)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-21 07:49:21 UTC (rev 24820)
@@ -14,7 +14,7 @@
 ;General
 
   ;Name and file
-  Name "XBMC Media Center"
+  Name "XBMC"
   OutFile "XBMCSetup-Rev${xbmc_revision}-${xbmc_target}.exe"
 
   XPStyle on
@@ -168,7 +168,7 @@
   
   ;add entry to add/remove programs
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
-                 "DisplayName" "XBMC Media Center"
+                 "DisplayName" "XBMC"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
                  "UninstallString" "$INSTDIR\uninstall.exe"
   WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
@@ -182,10 +182,8 @@
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
                  "Publisher" "Team XBMC"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
-                 "HelpLink" "http://xbmc.org/forum/index.php"
+                 "HelpLink" "http://xbmc.org/support"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
-                 "HelpLink" "http://xbmc.org/forum/index.php"
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\XBMC" \
                  "URLInfoAbout" "http://xbmc.org"
 SectionEnd
 
@@ -231,7 +229,7 @@
 ;Descriptions
 
   ;Language strings
-  LangString DESC_SecXBMC ${LANG_ENGLISH} "XBMC Media Center."
+  LangString DESC_SecXBMC ${LANG_ENGLISH} "XBMC"
 
   ;Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -290,7 +288,7 @@
 Var UnPageProfileEditBox
 
 Function un.UnPageProfile
-    !insertmacro MUI_HEADER_TEXT "Uninstall XBMC Media Center" "Remove XBMC's profile folder from your computer."
+    !insertmacro MUI_HEADER_TEXT "Uninstall XBMC" "Remove XBMC's profile folder from your computer."
   nsDialogs::Create /NOUNLOAD 1018
   Pop $UnPageProfileDialog
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 25075
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25075&view=rev
Author:   wiso
Date:     2009-11-26 20:53:49 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
[WIN32] renamed the directx entry to webinstall to reflect that we need an internet connection (maybe not enough :/
changed vc redist to be read only again.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-26 20:50:25 UTC (rev 25074)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-11-26 20:53:49 UTC (rev 25075)
@@ -379,7 +379,7 @@
 ;DirectX webinstaller Section
 
 !if "${xbmc_target}" == "dx"
-Section "DirectX Install" SEC_DIRECTX
+Section "DirectX WebInstall" SEC_DIRECTX
  
   SectionIn RO
  
@@ -401,7 +401,7 @@
 
 Section "Microsoft Visual C++ 2008 Redistributable Package (x86)" SEC_VCREDIST
 
-  SectionIn 1 2
+  SectionIn RO
   
   SetOutPath "$TEMP"
   File "${xbmc_root}\Xbmc\vcredist_x86.exe"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 25554
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25554&view=rev
Author:   wiso
Date:     2009-12-11 19:21:14 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
[WIN32] make pm3.hd optional in the installer

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-12-11 19:13:33 UTC (rev 25553)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-12-11 19:21:14 UTC (rev 25554)
@@ -207,7 +207,6 @@
 SectionEnd
 Section "PM3.HD" SecSkinPM3.HD
   SectionIn 1 2 #section is in installtype Full and Minimal
-  SectionIn RO
   SetOutPath "$INSTDIR\skin\PM3.HD"
   File /r "${xbmc_root}\Xbmc\skin\PM3.HD\*.*"
 SectionEnd


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 25979
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25979&view=rev
Author:   wiso
Date:     2009-12-22 17:13:44 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
[WIN32] changed: make redist and DirectX optional. Already hear users complaining about why XBMC doesn't work even though they have DirectX 11 installed. 

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-12-22 16:55:40 UTC (rev 25978)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-12-22 17:13:44 UTC (rev 25979)
@@ -380,7 +380,7 @@
 !if "${xbmc_target}" == "dx"
 Section "DirectX WebInstall" SEC_DIRECTX
  
-  SectionIn RO
+  SectionIn 1 2
  
   SetOutPath "$TEMP"
   File "${xbmc_root}\Xbmc\dxwebsetup.exe"
@@ -400,7 +400,7 @@
 
 Section "Microsoft Visual C++ 2008 Redistributable Package (x86)" SEC_VCREDIST
 
-  SectionIn RO
+  SectionIn 1 2
   
   SetOutPath "$TEMP"
   File "${xbmc_root}\Xbmc\vcredist_x86.exe"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 26016
          http://xbmc.svn.sourceforge.net/xbmc/?rev=26016&view=rev
Author:   wiso
Date:     2009-12-23 22:01:36 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
[WIN32] changed: known_issues.txt isn't in svn any longer

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-12-23 21:42:50 UTC (rev 26015)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2009-12-23 22:01:36 UTC (rev 26016)
@@ -97,7 +97,6 @@
   File "${xbmc_root}\Xbmc\XBMC.exe"
   File "${xbmc_root}\Xbmc\copying.txt"
   File "${xbmc_root}\Xbmc\LICENSE.GPL"
-  File "${xbmc_root}\Xbmc\known_issues.txt"
   File "${xbmc_root}\Xbmc\*.dll"
   SetOutPath "$INSTDIR\credits"
   File /r /x *.so "${xbmc_root}\Xbmc\credits\*.*"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 26758
          http://xbmc.svn.sourceforge.net/xbmc/?rev=26758&view=rev
Author:   wiso
Date:     2010-01-13 17:51:57 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
[WIN32] check for D3DX9_42.dll and if file not exists popup a message.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-01-13 17:44:17 UTC (rev 26757)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-01-13 17:51:57 UTC (rev 26758)
@@ -374,6 +374,24 @@
 SectionEnd
 
 ;--------------------------------
+;vs redist installer Section
+
+Section "Microsoft Visual C++ 2008 Redistributable Package (x86)" SEC_VCREDIST
+
+  SectionIn 1 2
+  
+  SetOutPath "$TEMP"
+  File "${xbmc_root}\Xbmc\vcredist_x86.exe"
+  DetailPrint "Running VS Redist Setup..."
+  ExecWait '"$TEMP\vcredist_x86.exe" /q' $VSRedistSetupError
+  DetailPrint "Finished VS Redist Setup"
+ 
+  Delete "$TEMP\vcredist_x86.exe"
+ 
+  SetOutPath "$INSTDIR"
+SectionEnd
+
+;--------------------------------
 ;DirectX webinstaller Section
 
 !if "${xbmc_target}" == "dx"
@@ -390,24 +408,13 @@
   Delete "$TEMP\dxwebsetup.exe"
  
   SetOutPath "$INSTDIR"
- 
+  
 SectionEnd
-!endif
 
-;--------------------------------
-;vs redist installer Section
+Section "-Check DirectX installation" SEC_DIRECTXCHECK
 
-Section "Microsoft Visual C++ 2008 Redistributable Package (x86)" SEC_VCREDIST
+  IfFileExists $SYSDIR\D3DX9_42.dll +2 0
+    MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "DirectX9 wasn't installed properly.$\nPlease download the DirectX End-User Runtimes from Microsoft and install it again."
 
-  SectionIn 1 2
-  
-  SetOutPath "$TEMP"
-  File "${xbmc_root}\Xbmc\vcredist_x86.exe"
-  DetailPrint "Running VS Redist Setup..."
-  ExecWait '"$TEMP\vcredist_x86.exe" /q' $VSRedistSetupError
-  DetailPrint "Finished VS Redist Setup"
- 
-  Delete "$TEMP\vcredist_x86.exe"
- 
-  SetOutPath "$INSTDIR"
-SectionEnd
\ No newline at end of file
+SectionEnd
+!endif
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 27649
          http://xbmc.svn.sourceforge.net/xbmc/?rev=27649&view=rev
Author:   taxigps
Date:     2010-02-11 14:26:35 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
fixed: build install package error

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-02-11 13:58:19 UTC (rev 27648)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-02-11 14:26:35 UTC (rev 27649)
@@ -98,8 +98,6 @@
   File "${xbmc_root}\Xbmc\copying.txt"
   File "${xbmc_root}\Xbmc\LICENSE.GPL"
   File "${xbmc_root}\Xbmc\*.dll"
-  SetOutPath "$INSTDIR\credits"
-  File /r /x *.so "${xbmc_root}\Xbmc\credits\*.*"
   SetOutPath "$INSTDIR\media"
   File /r /x *.so "${xbmc_root}\Xbmc\media\*.*"
   SetOutPath "$INSTDIR\sounds"
@@ -331,7 +329,6 @@
   Delete "$INSTDIR\xbmc.old.log"
   Delete "$INSTDIR\msvcp71.dll"
   Delete "$INSTDIR\msvcr71.dll"
-  RMDir /r "$INSTDIR\credits"
   RMDir /r "$INSTDIR\language"
   RMDir /r "$INSTDIR\media"
   RMDir /r "$INSTDIR\plugins"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 29560
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29560&view=rev
Author:   wiso
Date:     2010-04-27 19:58:31 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
[WIN32] removed the profile page from installer.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-04-27 19:38:42 UTC (rev 29559)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-04-27 19:58:31 UTC (rev 29560)
@@ -50,7 +50,7 @@
   !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\XBMC.exe"
-  !define MUI_FINISHPAGE_RUN_PARAMETERS $RunArgs
+  ;!define MUI_FINISHPAGE_RUN_PARAMETERS $RunArgs
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_ABORTWARNING  
 ;--------------------------------
@@ -60,7 +60,6 @@
   !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE.GPL"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
-  Page custom ProfileSettings ProfileSettingsLeave
   
   ;Start Menu Folder Page Configuration
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
@@ -137,17 +136,9 @@
   Delete "$SMPROGRAMS\$StartMenuFolder\XBMC (Windowed).lnk"
   
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  ${If} $PageProfileState == "1"
-    StrCpy $RunArgs "-p"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC (Portable).lnk" "$INSTDIR\XBMC.exe" \
-      "-p" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
-      "" "Start XBMC (Portable)."
-  ${Else}
-    StrCpy $RunArgs ""
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC.lnk" "$INSTDIR\XBMC.exe" \
-      "" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
-      "" "Start XBMC."
-  ${EndIf}
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\XBMC.lnk" "$INSTDIR\XBMC.exe" \
+    "" "$INSTDIR\XBMC.exe" 0 SW_SHOWNORMAL \
+    "" "Start XBMC."
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall XBMC.lnk" "$INSTDIR\Uninstall.exe" \
     "" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \
     "" "Uninstall XBMC."
@@ -223,50 +214,7 @@
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecXBMC} $(DESC_SecXBMC)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
-  
-;--------------------------------
-; Profile settings
 
-Var PageProfileDialog
-Var PageProfileRadioButton1
-Var PageProfileRadioButton2
-
-Function ProfileSettings
-  !insertmacro MUI_HEADER_TEXT "Choose Profile path" "Choose where XBMC should store it's data."
-  nsDialogs::Create /NOUNLOAD 1018
-  Pop $PageProfileDialog
-
-  ${If} $PageProfileDialog == error
-    Abort
-  ${EndIf}
-  
-  ${NSD_CreateRadioButton} 0 10u 100% 32u "Store data in $APPDATA\XBMC\ $\nDefault mode. XBMC stores all data and plugins in the user profile directory."
-  Pop $PageProfileRadioButton1
-  
-  ${NSD_CreateRadioButton} 0 40u 100% 32u "Store data in $INSTDIR\ $\nPortable mode. XBMC stores everything in the XBMC installation directory. $\nNote: This will require XBMC started with administrator rights."
-  Pop $PageProfileRadioButton2
-  
-  ${If} $PageProfileState == "1"
-    ${NSD_SetState} $PageProfileRadioButton2 ${BST_CHECKED} 
-  ${Else}
-    ${NSD_SetState} $PageProfileRadioButton1 ${BST_CHECKED} 
-  ${EndIf}
-
-
-  nsDialogs::Show
-FunctionEnd
-
-Function ProfileSettingsLeave
-  ${NSD_GetState} $PageProfileRadioButton1 $0
-  ${If} $0 == ${BST_CHECKED}
-    StrCpy $PageProfileState  "0"
-  ${EndIf}
-  ${NSD_GetState} $PageProfileRadioButton2 $0
-  ${If} $0 == ${BST_CHECKED}
-    StrCpy $PageProfileState  "1"
-  ${EndIf} 
-FunctionEnd
-
 ;--------------------------------
 ;Uninstaller Section
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 29687
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29687&view=rev
Author:   wiso
Date:     2010-04-30 15:56:36 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
[WIN32] fixed some wrong skin paths (thanks malmis)

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-04-30 15:47:36 UTC (rev 29686)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-04-30 15:56:36 UTC (rev 29687)
@@ -182,13 +182,13 @@
 Section "Confluence" SecSkinConfluence
   SectionIn 1 2 #section is in installtype Full and Minimal
   SectionIn RO
-  SetOutPath "$INSTDIR\skin\Confluence"
-  File /r "${xbmc_root}\Xbmc\skin\Confluence\*.*"
+  SetOutPath "$INSTDIR\addons\skin.confluence\"
+  File /r "${xbmc_root}\Xbmc\addons\skin.confluence\*.*"
 SectionEnd
 Section "PM3.HD" SecSkinPM3.HD
   SectionIn 1 2 #section is in installtype Full and Minimal
-  SetOutPath "$INSTDIR\skin\PM3.HD"
-  File /r "${xbmc_root}\Xbmc\skin\PM3.HD\*.*"
+  SetOutPath "$INSTDIR\addons\skin.pm3-hd"
+  File /r "${xbmc_root}\Xbmc\addons\skin.pm3-hd\*.*"
 SectionEnd
 ;skins.nsi is generated by genNsisIncludes.bat
 !include /nonfatal "skins.nsi"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 33699
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33699&view=rev
Author:   blinkseb
Date:     2010-09-12 15:21:55 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[WIN] fixed: don't try to copy the "web" folder as it was removed.

Modified Paths:
--------------
    trunk/project/Win32BuildSetup/XBMC for Windows.nsi

Modified: trunk/project/Win32BuildSetup/XBMC for Windows.nsi
===================================================================
--- trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-09-12 13:08:32 UTC (rev 33698)
+++ trunk/project/Win32BuildSetup/XBMC for Windows.nsi	2010-09-12 15:21:55 UTC (rev 33699)
@@ -119,8 +119,8 @@
   
   SetOutPath "$INSTDIR\addons"
   File /r "${xbmc_root}\Xbmc\addons\*.*"
-  SetOutPath "$INSTDIR\web"
-  File /r "${xbmc_root}\Xbmc\web\*.*"
+  ;SetOutPath "$INSTDIR\web"
+  ;File /r "${xbmc_root}\Xbmc\web\*.*"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\XBMC" "" $INSTDIR


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.