sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

=== Windows Installer ===

Browse Source 
* add info about bitness: 32bit, 64bit or mingw-build
This commit is contained in:
Nathan Letwory 2010-07-06 09:19:52 +00:00
parent b0cee52ecc
commit f38511cbed
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ UninstallIcon "[RELDIR]\00.installer.ico"
;Data
Caption "Blender [VERSION] Installer"
OutFile "[DISTDIR]\..\blender-[VERSION]-windows.exe"
OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"
InstallDir "$PROGRAMFILES\Blender Foundation\Blender"
BrandingText "Blender Foundation | http://www.blender.org"

7
tools/btools.py
View File

@ -457,6 +457,12 @@ def NSIS_Installer(target=None, source=None, env=None):
if env['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc'):
print "NSIS installer is only available on Windows."
Exit()
if env['OURPLATFORM'] == 'win32-vc':
bitness = '32'
elif env['OURPLATFORM'] == 'win64-vc':
bitness = '64'
else:
bitness = '-mingw'
start_dir = os.getcwd()
rel_dir = os.path.join(start_dir,'release','windows','installer')
@ -507,6 +513,7 @@ def NSIS_Installer(target=None, source=None, env=None):
ns_cnt = string.replace(ns_cnt, "[VERSION]", version)
ns_cnt = string.replace(ns_cnt, "[SHORTVERSION]", VERSION)
ns_cnt = string.replace(ns_cnt, "[RELDIR]", os.path.normpath(rel_dir))
ns_cnt = string.replace(ns_cnt, "[BITNESS]", bitness)
# do root
rootlist = []