From 2a749931ba3ac9470bfd3fa7545a8df4bb587db4 Mon Sep 17 00:00:00 2001
From: Simon Clitherow <aphex@nildram.co.uk>
Date: Sun, 1 Aug 2004 21:13:41 +0000
Subject: - added missing py scripts to the non-sconsered NSIS installer script
 - uninstall files now done semi-automatic for 'scons wininst'

---
 release/windows/installer/00.blender.nsi      |  9 +++++++++
 release/windows/installer/00.sconsblender.nsi | 16 ++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'release/windows/installer')

diff --git a/release/windows/installer/00.blender.nsi b/release/windows/installer/00.blender.nsi
index 10b13f1979d..2ee972b97b9 100644
--- a/release/windows/installer/00.blender.nsi
+++ b/release/windows/installer/00.blender.nsi
@@ -268,6 +268,15 @@ Section "Blender-VERSION (required)" SecCopyUI
   File DISTDIR\.blender\scripts\disp_paint.py
   File DISTDIR\.blender\scripts\doc_browser.py
   File DISTDIR\.blender\scripts\fixfromarmature.py
+  File DISTDIR\.blender\scripts\help_getting_started.py
+  File DISTDIR\.blender\scripts\help_manual.py
+  File DISTDIR\.blender\scripts\help_py_reference.py
+  File DISTDIR\.blender\scripts\help_release_notes.py
+  File DISTDIR\.blender\scripts\help_tutorials.py
+  File DISTDIR\.blender\scripts\help_web_blender.py
+  File DISTDIR\.blender\scripts\help_web_devcomm.py
+  File DISTDIR\.blender\scripts\help_web_eshop.py
+  File DISTDIR\.blender\scripts\help_web_usercomm.py
   File DISTDIR\.blender\scripts\hotkeys.py
   File DISTDIR\.blender\scripts\kloputils.py
   File DISTDIR\.blender\scripts\knife.py
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index 68bb16a7f57..72c87c5ad37 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -296,20 +296,8 @@ Section "Uninstall"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender"
   DeleteRegKey HKLM SOFTWARE\BlenderFoundation
   ; remove files
-  Delete $INSTDIR\blender.exe
-  Delete $INSTDIR\blenderplayer.exe
-  Delete $INSTDIR\python23.dll
-  Delete $INSTDIR\python23.zip
-  Delete $INSTDIR\sdl.dll
-  Delete $INSTDIR\gnu_gettext.dll
-  Delete $INSTDIR\Copyright.txt
-  Delete $INSTDIR\Blender.html
-  Delete $INSTDIR\GPL-license.txt
-  Delete $INSTDIR\python-license.txt
-  Delete $INSTDIR\Release_SHORTVERS.txt
-  Delete $INSTDIR\Help.url
-  Delete $INSTDIR\uninstall.exe
-  Delete $INSTDIR\zlib.pyd
+  [DELROOTDIRCONTS]
+  
   Delete $INSTDIR\.blender\.bfont.ttf
   Delete $INSTDIR\.blender\.Blanguages
   ; remove shortcuts, if any.
-- 
cgit v1.2.3