[Avida-cvs] [avida-svn] r949 - in development: source/platform support/utils/AvidaUtils

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2006-09-13 13:53:45 -0400 (Wed, 13 Sep 2006)
New Revision: 949

Modified:
   development/source/platform/SConscript
   development/support/utils/AvidaUtils/CmdLineOpts.py
   development/support/utils/AvidaUtils/PlatformTool.py
Log:
Making scons work for windows

Modified: development/source/platform/SConscript
===================================================================
--- development/source/platform/SConscript	2006-09-13 02:17:13 UTC (rev 948)
+++ development/source/platform/SConscript	2006-09-13 17:53:45 UTC (rev 949)
@@ -1,7 +1,8 @@
 
 Import('environment')
-
+    
 if environment['enableTCMalloc'] in ('True', '1', 1):
+  print "I am descending into tcmalloc."
   environment.SConscript('tcmalloc/SConscript')
-
+  
 # vim: set ft=python:

Modified: development/support/utils/AvidaUtils/CmdLineOpts.py
===================================================================
--- development/support/utils/AvidaUtils/CmdLineOpts.py	2006-09-13 02:17:13 UTC (rev 948)
+++ development/support/utils/AvidaUtils/CmdLineOpts.py	2006-09-13 17:53:45 UTC (rev 949)
@@ -41,7 +41,7 @@
     SCons.Options.BoolOption(
       'enableTCMalloc',
       """Set to "1" to enable TCMalloc""",
-      1,
+       '$plat_default_enableTCMalloc',
   ) )
   opts.Add(
     SCons.Options.BoolOption(

Modified: development/support/utils/AvidaUtils/PlatformTool.py
===================================================================
--- development/support/utils/AvidaUtils/PlatformTool.py	2006-09-13 02:17:13 UTC (rev 948)
+++ development/support/utils/AvidaUtils/PlatformTool.py	2006-09-13 17:53:45 UTC (rev 949)
@@ -30,10 +30,8 @@
     _PLATFORM_RELEASE_DEBUG_BUILD_FLAGS = "-O2 -ffast-math -g $COMPILER_WARNING_FLAGS -pedantic -DDEBUG",
     _PLATFORM_RELEASE_BUILD_FLAGS = "-O3 -ffast-math -DNDEBUG",
     _PLATFORM_MINIMUM_RELEASE_BUILD_FLAGS = "-Os -DNDEBUG",
+    plat_default_enableTCMalloc = 1,
   )
-  env.SetDefault(
-    enableTCMalloc = 1,
-  )
 
 def darwin_generate(env):
   """
@@ -352,6 +350,7 @@
     plat_default_enableTestCode = 0,
     plat_default_enablePyPkg = 0,
     plat_default_enableSharedPtr = 0,
+    plat_default_enableTCMalloc = 0,
     plat_default_pythonCommand = sys.executable,
     plat_default_boostIncludeDir = None,
     plat_default_boostPythonLibDir = None,
@@ -360,12 +359,8 @@
     plat_default_pysteScriptPath = os.path.join(sys.path[0], '${AvidaUtils_path}', 'AvidaPyste.py'),
     plat_default_pysteScriptCommand = SCons.Util.CLVar('$pythonCommand $pysteScriptPath'),
   )
-  env.SetDefault(
-    enableTCMalloc = 0,
-  )
 
 
-
 platform_generators = {
   'darwin': darwin_generate,
   'linux': linux_generate,