- added missing py scripts to the non-sconsered NSIS installer script
authorSimon Clitherow <aphex@nildram.co.uk>
Sun, 1 Aug 2004 21:13:41 +0000 (21:13 +0000)
committerSimon Clitherow <aphex@nildram.co.uk>
Sun, 1 Aug 2004 21:13:41 +0000 (21:13 +0000)
- uninstall files now done semi-automatic for 'scons wininst'

SConstruct
release/windows/installer/00.blender.nsi
release/windows/installer/00.sconsblender.nsi

index 7491d6114e78ed5d7cbaee12b8a14a4c2c072a7f..79d45f3c653a5c440e074cdf5a688f120e4dcac2 100644 (file)
@@ -1492,6 +1492,15 @@ def donsis(env, target, source):
        rootstring += "\n\n"
        nsis_cnt = string.replace(nsis_cnt, "[ROOTDIRCONTS]", rootstring)
        
+       # do delete items
+       delrootlist = []
+       for rootitem in rootdir:
+               if os.path.isdir(startdir + "\\dist\\" + rootitem) == 0:
+                       delrootlist.append("Delete $INSTDIR\\" + rootitem)
+       delrootstring = string.join(delrootlist, "\n ")
+       delrootstring += "\n"
+       nsis_cnt = string.replace(nsis_cnt, "[DELROOTDIRCONTS]", delrootstring)
+       
        # do scripts
        scriptlist = []
        scriptdir = os.listdir(startdir + "\\dist\\.blender\\scripts")
index 10b13f1979d502517298851139f9332a2d041e0c..2ee972b97b93510acb07f3ec2d5f59557020db89 100644 (file)
@@ -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
index 68bb16a7f579149c17365fd5d2a5a333ec865048..72c87c5ad3779cd77e5f5438775cc0e8a6dd929e 100644 (file)
@@ -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.