Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- added python23.zip & zlib.pyd (bundled python modules for Win32)

Browse Source 
provided by IanWill (thanks!)

- updated build systems to suit
This commit is contained in:
Simon Clitherow
2004-07-28 18:28:17 +00:00
parent 6b1eb45dda
commit 6f30f4aaab
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -1208,6 +1208,8 @@ def preparedist():
# finally copy auxiliaries (readme, license, etc.) # finally copy auxiliaries (readme, license, etc.)
if sys.platform == 'win32': if sys.platform == 'win32':
shutil.copy("windows/extra/Help.url", "../dist/Help.url") shutil.copy("windows/extra/Help.url", "../dist/Help.url")
shutil.copy("windows/extra/Python23.zip", "../dist/Python23.zip")
shutil.copy("windows/extra/zlib.pyd", "../dist/zlib.pyd")
shutil.copy("text/copyright.txt", "../dist/copyright.txt") shutil.copy("text/copyright.txt", "../dist/copyright.txt")
shutil.copy("text/blender.html", "../dist/blender.html") shutil.copy("text/blender.html", "../dist/blender.html")
shutil.copy("text/GPL-license.txt", "../dist/GPL-license.txt") shutil.copy("text/GPL-license.txt", "../dist/GPL-license.txt")

6
release/windows/installer/00.blender.nsi
View File

@@ -238,7 +238,9 @@ Section "Blender-VERSION (required)" SecCopyUI
SetOutPath $INSTDIR SetOutPath $INSTDIR
; Put file there ; Put file there
File DISTDIR\blender.exe File DISTDIR\blender.exe
File DISTDIR\blenderplayer.exe
File DISTDIR\python23.dll File DISTDIR\python23.dll
File DISTDIR\python23.zip
File DISTDIR\sdl.dll File DISTDIR\sdl.dll
File DISTDIR\gnu_gettext.dll File DISTDIR\gnu_gettext.dll
File DISTDIR\Copyright.txt File DISTDIR\Copyright.txt
@@ -247,6 +249,7 @@ Section "Blender-VERSION (required)" SecCopyUI
File DISTDIR\Release_SHORTVERS.txt File DISTDIR\Release_SHORTVERS.txt
File DISTDIR\GPL-license.txt File DISTDIR\GPL-license.txt
File DISTDIR\Help.url File DISTDIR\Help.url
File DISTDIR\zlib.pyd
SetOutPath $BLENDERHOME\.blender SetOutPath $BLENDERHOME\.blender
File DISTDIR\.blender\.bfont.ttf File DISTDIR\.blender\.bfont.ttf
@@ -382,7 +385,9 @@ Section "Uninstall"
DeleteRegKey HKLM SOFTWARE\BlenderFoundation DeleteRegKey HKLM SOFTWARE\BlenderFoundation
; remove files ; remove files
Delete $INSTDIR\blender.exe Delete $INSTDIR\blender.exe
Delete $INSTDIR\blenderplayer.exe
Delete $INSTDIR\python23.dll Delete $INSTDIR\python23.dll
Delete $INSTDIR\python23.zip
Delete $INSTDIR\sdl.dll Delete $INSTDIR\sdl.dll
Delete $INSTDIR\gnu_gettext.dll Delete $INSTDIR\gnu_gettext.dll
Delete $INSTDIR\Copyright.txt Delete $INSTDIR\Copyright.txt
@@ -392,6 +397,7 @@ Section "Uninstall"
Delete $INSTDIR\Release_SHORTVERS.txt Delete $INSTDIR\Release_SHORTVERS.txt
Delete $INSTDIR\Help.url Delete $INSTDIR\Help.url
Delete $INSTDIR\uninstall.exe Delete $INSTDIR\uninstall.exe
Delete $INSTDIR\zlib.pyd
Delete $INSTDIR\.blender\.bfont.ttf Delete $INSTDIR\.blender\.bfont.ttf
Delete $INSTDIR\.blender\.Blanguages Delete $INSTDIR\.blender\.Blanguages
; remove shortcuts, if any. ; remove shortcuts, if any.

3
release/windows/installer/00.sconsblender.nsi
View File

@@ -297,7 +297,9 @@ Section "Uninstall"
DeleteRegKey HKLM SOFTWARE\BlenderFoundation DeleteRegKey HKLM SOFTWARE\BlenderFoundation
; remove files ; remove files
Delete $INSTDIR\blender.exe Delete $INSTDIR\blender.exe
Delete $INSTDIR\blenderplayer.exe
Delete $INSTDIR\python23.dll Delete $INSTDIR\python23.dll
Delete $INSTDIR\python23.zip
Delete $INSTDIR\sdl.dll Delete $INSTDIR\sdl.dll
Delete $INSTDIR\gnu_gettext.dll Delete $INSTDIR\gnu_gettext.dll
Delete $INSTDIR\Copyright.txt Delete $INSTDIR\Copyright.txt
@@ -307,6 +309,7 @@ Section "Uninstall"
Delete $INSTDIR\Release_SHORTVERS.txt Delete $INSTDIR\Release_SHORTVERS.txt
Delete $INSTDIR\Help.url Delete $INSTDIR\Help.url
Delete $INSTDIR\uninstall.exe Delete $INSTDIR\uninstall.exe
Delete $INSTDIR\zlib.pyd
Delete $INSTDIR\.blender\.bfont.ttf Delete $INSTDIR\.blender\.bfont.ttf
Delete $INSTDIR\.blender\.Blanguages Delete $INSTDIR\.blender\.Blanguages
; remove shortcuts, if any. ; remove shortcuts, if any.

4
release/windows/specific.sh
View File

@@ -73,6 +73,10 @@ cp -f $NAN_SDL/lib/sdl.dll $DISTDIR/sdl.dll
# Add the Help.url to the ditribution # Add the Help.url to the ditribution
cp -f extra/Help.url $DISTDIR/ cp -f extra/Help.url $DISTDIR/
# Add Python23.zip & zlib.pyd
cp -f extra/Python23.zip $DISTDIR/
cp -f extra/zlib.pyd $DISTDIR/
# Add the language files to package # Add the language files to package
cp -f -R $NAN_OBJDIR/windows/bin/.blender $DISTDIR/ cp -f -R $NAN_OBJDIR/windows/bin/.blender $DISTDIR/
# Remove the pesky CVS dirs # Remove the pesky CVS dirs