[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30022] trunk/blender: === Windows Installer ===

[Nathan Letwory]

Revision: 30022
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30022
Author:   jesterking
Date:     2010-07-06 11:19:52 +0200 (Tue, 06 Jul 2010)

Log Message:
-----------
=== Windows Installer ===
* add info about bitness: 32bit, 64bit or mingw-build

Modified Paths:
--------------
    trunk/blender/release/windows/installer/00.sconsblender.nsi
    trunk/blender/tools/btools.py

Modified: trunk/blender/release/windows/installer/00.sconsblender.nsi
===================================================================
--- trunk/blender/release/windows/installer/00.sconsblender.nsi	2010-07-06 09:15:33 UTC (rev 30021)
+++ trunk/blender/release/windows/installer/00.sconsblender.nsi	2010-07-06 09:19:52 UTC (rev 30022)
@@ -65,7 +65,7 @@
 ;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"

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2010-07-06 09:15:33 UTC (rev 30021)
+++ trunk/blender/tools/btools.py	2010-07-06 09:19:52 UTC (rev 30022)
@@ -457,6 +457,12 @@
     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 @@
     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 = []