[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33530] trunk/blender/build_files/scons/ tools/btools.py: Remove redundant VC_REDIST code, since it' s not used anymore.

[Nathan Letwory]

Revision: 33530
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33530
Author:   jesterking
Date:     2010-12-07 09:37:00 +0100 (Tue, 07 Dec 2010)

Log Message:
-----------
Remove redundant VC_REDIST code, since it's not used anymore.

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2010-12-07 08:27:20 UTC (rev 33529)
+++ trunk/blender/build_files/scons/tools/btools.py	2010-12-07 08:37:00 UTC (rev 33530)
@@ -92,8 +92,7 @@
             'WITH_BF_RAYOPTIMIZATION',
             'BF_RAYOPTIMIZATION_SSE_FLAGS',
             'BF_NO_ELBEEM',
-	    'WITH_BF_CXX_GUARDEDALLOC',
-            'BF_VCREDIST' # Windows-only, and useful only when creating installer
+	    'WITH_BF_CXX_GUARDEDALLOC'
             ]
     
     # Have options here that scons expects to be lists
@@ -454,8 +453,7 @@
         
         (BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)),
         ('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''),
-        (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
-        ('BF_VCREDIST', 'Full path to vcredist', '')
+        (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False))
     ) # end of opts.AddOptions()
 
     return localopts
@@ -547,12 +545,6 @@
 
     ns_cnt = string.replace(ns_cnt, "[DODATAFILES]", datafiles)
 
-    # Setup vcredist part
-    vcredist = "File \""+env['BF_VCREDIST'] + "\"\n"
-    vcredist += "  ExecWait '\"$TEMP\\" + os.path.basename(env['BF_VCREDIST']) + "\" /q'\n"
-    vcredist += "  Delete \"$TEMP\\" + os.path.basename(env['BF_VCREDIST'])+"\""
-    ns_cnt = string.replace(ns_cnt, "[VCREDIST]", vcredist)
-
     tmpnsi = os.path.normpath(install_base_dir+os.sep+env['BF_BUILDDIR']+os.sep+"00.blender_tmp.nsi")
     new_nsis = open(tmpnsi, 'w')
     new_nsis.write(ns_cnt)