[Avida-SVN] r1769 - in development: . source/platform source/targets/avida source/tools
goingssh at myxo.css.msu.edu
goingssh at myxo.css.msu.edu
Tue Jul 10 07:09:30 PDT 2007
Author: goingssh
Date: 2007-07-10 10:09:29 -0400 (Tue, 10 Jul 2007)
New Revision: 1769
Modified:
development/SConstruct
development/source/platform/SConscript
development/source/targets/avida/SConscript
development/source/tools/SConscript
Log:
Updating scons so builds on windows even though we're probably about to remove them...
Modified: development/SConstruct
===================================================================
--- development/SConstruct 2007-07-10 03:25:41 UTC (rev 1768)
+++ development/SConstruct 2007-07-10 14:09:29 UTC (rev 1769)
@@ -1,117 +1,119 @@
-##############################################################################
-## Copyright (C) 1999-1999-2007 Michigan State University ##
-## Based on work Copyright (C) 1993-2003 California Institute of Technology ##
-## ##
-## Read the COPYING and README files, or contact 'avida at alife.org', ##
-## before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. ##
-##############################################################################
-
-import os
-import sys
-sys.path.append('support/utils')
-import AvidaUtils
-
-environment = Environment()
-environment.Export('environment')
-
-# Parse cmd line, set compiler options, generate help text.
-#
-# Per-platform build options are defined in
-# support/utils/AvidaUtils/PlatformTool.py
-#
-# Command-line build options are defined in
-# support/utils/AvidaUtils/CmdLineOpts.py
-#
-# Options for SCons are defined in
-# support/utils/AvidaUtils/SConsOpts.py
-#
-# Static help text is defined in
-# support/utils/AvidaUtils/StaticHelp.py
-#
-
-# XXX Must not use default scons signatures database; as of SCons
-# 0.96.93, default database seems to be too-easily corrupted.
-# @kgn 06-Dec-6
-import anydbm
-SConsignFile('scons-signatures', anydbm)
-AvidaUtils.Configure(ARGUMENTS, environment)
-
-if environment.subst('$enableSerialization') in ['1', 'yes']:
- environment.Append(CPPDEFINES = ['ENABLE_SERIALIZATION=1'])
-
-if environment.subst('$enablePyPkg') in ['1', 'yes']:
- environment.Append(CPPPATH = ['#/source/bindings/Boost.Python'])
-
-if environment.subst('$enableMemTracking') in ['1', 'yes']:
- #environment.SetDefault(enableSharedPtr = 1)
- environment.Append(CPPDEFINES = ['USE_tMemTrack=1'])
-
-if environment['enableTCMalloc'] in ('True', '1', 1):
- environment.Append(
- CPPPATH = [ '#/source/platform/tcmalloc', ],
- LIBPATH = [ '#$buildDir/platform/tcmalloc', ],
- )
-
-environment.Append(
- CPPPATH = [
- '#/source',
- '#/source/actions',
- '#/source/analyze',
- '#/source/archive',
- '#/source/classification',
- '#/source/cpu',
- '#/source/drivers',
- '#/source/event',
- '#/source/main',
- #'#/source/third-party/boost',
- '#/source/tools',
- ],
- LIBPATH = [
- '#$buildDir/actions',
- '#$buildDir/analyze',
- #'#$buildDir/archive',
- '#$buildDir/classification',
- '#$buildDir/cpu',
- '#$buildDir/drivers',
- #'#$buildDir/event',
- '#$buildDir/main',
- #'#$buildDir/third-party/boost/serialization',
- '#$buildDir/tools',
- ],
-)
-
-# Tell SCons where to find its subscripts.
-environment.SConscript('source/SConscript',
- build_dir = '$buildDir',
- duplicate = 0,
-)
-environment.SConscript('support/config/SConscript')
-
-# XXX beginnings of 'extras'. @kgn
-if environment.subst('$extrasDir') not in ['None', 'none', '']:
- environment.SConscript(
- os.path.join(environment.subst('$extrasDir'), 'SConscript'),
- build_dir = '$extrasBuildDir',
- duplicate = 0
- )
-
-
-if environment['PLATFORM'] == 'win32':
- environment.Import('avida_exe')
- script_to_build_avida = environment.File(
- os.path.join('#', os.path.basename(sys.argv[0]))
- ).abspath
- environment.MSVSProject(
- target = 'Avida' + environment['MSVSPROJECTSUFFIX'],
- srcs = environment['avida_msvs_project_srcs'],
- incs = environment['avida_msvs_project_incs'],
- misc = environment['avida_msvs_project_misc'],
- variant = 'Release',
- buildtarget = avida_exe,
- #runfile = avida[0].abspath,
- MSVSSCONS = '"%s" "%s"' % (sys.executable, script_to_build_avida),
- MSVSSCONSFLAGS = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f "${MSVSSCONSCRIPT.name}"'
- )
-
-# Vim modeline to tell Vim that this is a Python script.
-# vim: set ft=python:
+##############################################################################
+## Copyright (C) 1999-1999-2007 Michigan State University ##
+## Based on work Copyright (C) 1993-2003 California Institute of Technology ##
+## ##
+## Read the COPYING and README files, or contact 'avida at alife.org', ##
+## before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. ##
+##############################################################################
+
+import os
+import sys
+sys.path.append('support/utils')
+import AvidaUtils
+
+environment = Environment()
+environment.Export('environment')
+
+# Parse cmd line, set compiler options, generate help text.
+#
+# Per-platform build options are defined in
+# support/utils/AvidaUtils/PlatformTool.py
+#
+# Command-line build options are defined in
+# support/utils/AvidaUtils/CmdLineOpts.py
+#
+# Options for SCons are defined in
+# support/utils/AvidaUtils/SConsOpts.py
+#
+# Static help text is defined in
+# support/utils/AvidaUtils/StaticHelp.py
+#
+
+# XXX Must not use default scons signatures database; as of SCons
+# 0.96.93, default database seems to be too-easily corrupted.
+# @kgn 06-Dec-6
+import anydbm
+SConsignFile('scons-signatures', anydbm)
+AvidaUtils.Configure(ARGUMENTS, environment)
+
+if environment.subst('$enableSerialization') in ['1', 'yes']:
+ environment.Append(CPPDEFINES = ['ENABLE_SERIALIZATION=1'])
+
+if environment.subst('$enablePyPkg') in ['1', 'yes']:
+ environment.Append(CPPPATH = ['#/source/bindings/Boost.Python'])
+
+if environment.subst('$enableMemTracking') in ['1', 'yes']:
+ #environment.SetDefault(enableSharedPtr = 1)
+ environment.Append(CPPDEFINES = ['USE_tMemTrack=1'])
+
+if environment['enableTCMalloc'] in ('True', '1', 1):
+ environment.Append(
+ CPPPATH = [ '#/source/platform/tcmalloc', ],
+ LIBPATH = [ '#$buildDir/platform/tcmalloc', ],
+ )
+
+environment.Append(
+ CPPPATH = [
+ '#/source',
+ '#/source/actions',
+ '#/source/analyze',
+ '#/source/archive',
+ '#/source/classification',
+ '#/source/cpu',
+ '#/source/drivers',
+ '#/source/event',
+ '#/source/main',
+ #'#/source/third-party/boost',
+ '#/source/tools',
+ '#/source/platform',
+ ],
+ LIBPATH = [
+ '#$buildDir/actions',
+ '#$buildDir/analyze',
+ #'#$buildDir/archive',
+ '#$buildDir/classification',
+ '#$buildDir/cpu',
+ '#$buildDir/drivers',
+ #'#$buildDir/event',
+ '#$buildDir/main',
+ #'#$buildDir/third-party/boost/serialization',
+ '#$buildDir/tools',
+ '#$buildDir/platform',
+ ],
+)
+
+# Tell SCons where to find its subscripts.
+environment.SConscript('source/SConscript',
+ build_dir = '$buildDir',
+ duplicate = 0,
+)
+environment.SConscript('support/config/SConscript')
+
+# XXX beginnings of 'extras'. @kgn
+if environment.subst('$extrasDir') not in ['None', 'none', '']:
+ environment.SConscript(
+ os.path.join(environment.subst('$extrasDir'), 'SConscript'),
+ build_dir = '$extrasBuildDir',
+ duplicate = 0
+ )
+
+
+if environment['PLATFORM'] == 'win32':
+ environment.Import('avida_exe')
+ script_to_build_avida = environment.File(
+ os.path.join('#', os.path.basename(sys.argv[0]))
+ ).abspath
+ environment.MSVSProject(
+ target = 'Avida' + environment['MSVSPROJECTSUFFIX'],
+ srcs = environment['avida_msvs_project_srcs'],
+ incs = environment['avida_msvs_project_incs'],
+ misc = environment['avida_msvs_project_misc'],
+ variant = 'Release',
+ buildtarget = avida_exe,
+ #runfile = avida[0].abspath,
+ MSVSSCONS = '"%s" "%s"' % (sys.executable, script_to_build_avida),
+ MSVSSCONSFLAGS = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f "${MSVSSCONSCRIPT.name}"'
+ )
+
+# Vim modeline to tell Vim that this is a Python script.
+# vim: set ft=python:
Modified: development/source/platform/SConscript
===================================================================
--- development/source/platform/SConscript 2007-07-10 03:25:41 UTC (rev 1768)
+++ development/source/platform/SConscript 2007-07-10 14:09:29 UTC (rev 1769)
@@ -1,7 +1,26 @@
-
-Import('environment')
-
-if environment['enableTCMalloc'] in ('True', '1', 1):
- environment.SConscript('tcmalloc/SConscript')
-
-# vim: set ft=python:
+Import('environment')
+
+misc = ['SConscript']
+
+incs = [
+ 'cThread.h',
+ 'PlatformExpert.h'
+]
+
+srcs = [
+ 'cThread.cc',
+ 'PlatformExpert.cc'
+]
+
+if environment['enableTCMalloc'] in ('True', '1', 1):
+ environment.SConscript('tcmalloc/SConscript')
+
+environment.Library('platform', srcs)
+
+environment.AppendUnique(
+ avida_msvs_project_srcs = [File(src).srcnode().path for src in srcs],
+ avida_msvs_project_incs = [File(src).srcnode().path for src in incs],
+ avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
+)
+
+# vim: set ft=python:
Modified: development/source/targets/avida/SConscript
===================================================================
--- development/source/targets/avida/SConscript 2007-07-10 03:25:41 UTC (rev 1768)
+++ development/source/targets/avida/SConscript 2007-07-10 14:09:29 UTC (rev 1769)
@@ -1,44 +1,45 @@
-import os
-import os.path
-import sys
-
-Import('environment')
-
-misc = ['SConscript']
-
-srcs = ['primitive.cc']
-
-libs = [
- 'main',
- 'classification',
- 'cpu',
- 'analyze',
- 'drivers',
- 'cpu',
- 'actions',
- 'tools',
- 'analyze',
- #'archive',
- #'boost_serialization',
- 'main',
- ]
-if environment['PLATFORM'] not in ('win32'):
- libs = libs + ['pthread']
-if environment['enableTCMalloc'] in ('True', '1', 1):
- libs = libs + ['tcmalloc']
-
-avida_exe = environment.Program('avida',
- srcs,
- LIBS = libs,
-)
-environment.Install('$execPrefix', avida_exe)
-# Make avida_exe visible to other SConscript files by the command
-# "Import('avida_exe')"
-environment.Export('avida_exe')
-
-environment.AppendUnique(
- avida_msvs_project_srcs = [File(src).srcnode().path for src in srcs],
- avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
-)
-
-# vim: set ft=python:
+import os
+import os.path
+import sys
+
+Import('environment')
+
+misc = ['SConscript']
+
+srcs = ['primitive.cc']
+
+libs = [
+ 'main',
+ 'classification',
+ 'cpu',
+ 'analyze',
+ 'drivers',
+ 'cpu',
+ 'actions',
+ 'tools',
+ 'analyze',
+ #'archive',
+ #'boost_serialization',
+ 'main',
+ 'platform',
+ ]
+if environment['PLATFORM'] not in ('win32'):
+ libs = libs + ['pthread']
+if environment['enableTCMalloc'] in ('True', '1', 1):
+ libs = libs + ['tcmalloc']
+
+avida_exe = environment.Program('avida',
+ srcs,
+ LIBS = libs,
+)
+environment.Install('$execPrefix', avida_exe)
+# Make avida_exe visible to other SConscript files by the command
+# "Import('avida_exe')"
+environment.Export('avida_exe')
+
+environment.AppendUnique(
+ avida_msvs_project_srcs = [File(src).srcnode().path for src in srcs],
+ avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
+)
+
+# vim: set ft=python:
Modified: development/source/tools/SConscript
===================================================================
--- development/source/tools/SConscript 2007-07-10 03:25:41 UTC (rev 1768)
+++ development/source/tools/SConscript 2007-07-10 14:09:29 UTC (rev 1769)
@@ -1,131 +1,129 @@
-
-Import('environment')
-
-misc = ['SConscript']
-
-incs = [
- 'cArgContainer.h',
- 'cArgSchema.h',
- 'cBlockStruct.h',
- 'cChangeList.h',
- 'cConstSchedule.h',
- 'cCountTracker.h',
- 'cCycleCheck.h',
- 'cDataEntry.h',
- 'cDataFile.h',
- 'cDataFileManager.h',
- 'cDataManager_Base.h',
- 'cDefaultMessageDisplay.h',
- 'cDoubleSum.h',
- 'cFile.h',
- 'cFixedBlock.h',
- 'cFixedCoords.h',
- 'cGenesis.h',
- 'cHelpAlias.h',
- 'cHelpEntry.h',
- 'cHelpFullEntry.h',
- 'cHelpManager.h',
- 'cHelpType.h',
- 'cHistogram.h',
- 'cID.h',
- 'cIndexedBlockStruct.h',
- 'cInitFile.h',
- 'cIntegratedSchedule.h',
- 'cIntegratedScheduleNode.h',
- 'cIntSum.h',
- 'cMerit.h',
- 'cMessageClass.h',
- 'cMessageClosure.h',
- 'cMessageDisplay.h',
- 'cMessageDisplay_headers.h',
- 'cMessageType.h',
- 'cProbSchedule.h',
- 'cRandom.h',
- 'cRefBlock.h',
- 'cRunningAverage.h',
- 'cScaledBlock.h',
- 'cSchedule.h',
- 'cString.h',
- 'cStringIterator.h',
- 'cStringList.h',
- 'cStringUtil.h',
- 'cThread.h',
- 'cTools.h',
- 'cUInt.h',
- 'cVerifierSuiteRecurser.h',
- 'cWeightedIndex.h',
- 'functions.h',
- 'recursive_tests_decl_hdrs.hh',
- 'recursive_tests_defn_hdrs.hh',
- 'recursive_tests_macros.hh',
- 'tArgDataEntry.h',
- 'tArray.h',
- 'tBuffer.h',
- 'tDataEntry.h',
- 'tDataEntryBase.h',
- 'tDataEntryCommand.h',
- 'tDataManager.h',
- 'tDictionary.h',
- 'tHashTable.h',
- 'tList.h',
- 'tManagedPointerArray.h',
- 'tMatrix.h',
- 'tMemTrack.h',
- 'tObjectFactory.h',
- 'tSmartArray.h',
- 'tUnitTestSuite.hh',
- 'tUnitTestSuiteRecurser.hh',
- 'tVector.h',
- 'tVerifierSuite.hh',
- 'tVerifierSuiteRecurser.hh',
-]
-
-srcs = [
- #'cBlockStruct.cc',
- 'cArgContainer.cc',
- 'cArgSchema.cc',
- 'cChangeList.cc',
- 'cConstSchedule.cc',
- 'cDataEntry.cc',
- 'cDataFile.cc',
- 'cDataFileManager.cc',
- 'cDataManager_Base.cc',
- 'cDefaultMessageDisplay.cc',
- 'cDoubleSum.cc',
- #'cFixedBlock.cc',
- 'cFixedCoords.cc',
- 'cFile.cc',
- 'cHelpAlias.cc',
- 'cHelpManager.cc',
- 'cHelpType.cc',
- 'cHistogram.cc',
- 'cIndexedBlockStruct.cc',
- 'cInitFile.cc',
- 'cIntSum.cc',
- 'cIntegratedSchedule.cc',
- 'cIntegratedScheduleNode.cc',
- 'cMessageDisplay.cc',
- 'cMerit.cc',
- 'cProbSchedule.cc',
- 'cRandom.cc',
- 'cRunningAverage.cc',
- 'cSchedule.cc',
- 'cString.cc',
- 'cStringIterator.cc',
- 'cStringList.cc',
- 'cStringUtil.cc',
- 'cThread.cc',
- 'cTools.cc',
- 'cWeightedIndex.cc',
- 'cCycleCheck.cc',
-]
-
-environment.Library('tools', srcs)
-
-environment.AppendUnique(
- avida_msvs_project_srcs = [File(src).srcnode().path for src in srcs],
- avida_msvs_project_incs = [File(src).srcnode().path for src in incs],
- avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
-)
-
-# vim: set ft=python:
+
+Import('environment')
+
+misc = ['SConscript']
+
+incs = [
+ 'cArgContainer.h',
+ 'cArgSchema.h',
+ 'cBlockStruct.h',
+ 'cChangeList.h',
+ 'cConstSchedule.h',
+ 'cCountTracker.h',
+ 'cCycleCheck.h',
+ 'cDataEntry.h',
+ 'cDataFile.h',
+ 'cDataFileManager.h',
+ 'cDataManager_Base.h',
+ 'cDefaultMessageDisplay.h',
+ 'cDoubleSum.h',
+ 'cFile.h',
+ 'cFixedBlock.h',
+ 'cFixedCoords.h',
+ 'cGenesis.h',
+ 'cHelpAlias.h',
+ 'cHelpEntry.h',
+ 'cHelpFullEntry.h',
+ 'cHelpManager.h',
+ 'cHelpType.h',
+ 'cHistogram.h',
+ 'cID.h',
+ 'cIndexedBlockStruct.h',
+ 'cInitFile.h',
+ 'cIntegratedSchedule.h',
+ 'cIntegratedScheduleNode.h',
+ 'cIntSum.h',
+ 'cMerit.h',
+ 'cMessageClass.h',
+ 'cMessageClosure.h',
+ 'cMessageDisplay.h',
+ 'cMessageDisplay_headers.h',
+ 'cMessageType.h',
+ 'cProbSchedule.h',
+ 'cRandom.h',
+ 'cRefBlock.h',
+ 'cRunningAverage.h',
+ 'cScaledBlock.h',
+ 'cSchedule.h',
+ 'cString.h',
+ 'cStringIterator.h',
+ 'cStringList.h',
+ 'cStringUtil.h',
+ 'cTools.h',
+ 'cUInt.h',
+ 'cVerifierSuiteRecurser.h',
+ 'cWeightedIndex.h',
+ 'functions.h',
+ 'recursive_tests_decl_hdrs.hh',
+ 'recursive_tests_defn_hdrs.hh',
+ 'recursive_tests_macros.hh',
+ 'tArgDataEntry.h',
+ 'tArray.h',
+ 'tBuffer.h',
+ 'tDataEntry.h',
+ 'tDataEntryBase.h',
+ 'tDataEntryCommand.h',
+ 'tDataManager.h',
+ 'tDictionary.h',
+ 'tHashTable.h',
+ 'tList.h',
+ 'tManagedPointerArray.h',
+ 'tMatrix.h',
+ 'tMemTrack.h',
+ 'tObjectFactory.h',
+ 'tSmartArray.h',
+ 'tUnitTestSuite.hh',
+ 'tUnitTestSuiteRecurser.hh',
+ 'tVector.h',
+ 'tVerifierSuite.hh',
+ 'tVerifierSuiteRecurser.hh',
+]
+
+srcs = [
+ #'cBlockStruct.cc',
+ 'cArgContainer.cc',
+ 'cArgSchema.cc',
+ 'cChangeList.cc',
+ 'cConstSchedule.cc',
+ 'cDataEntry.cc',
+ 'cDataFile.cc',
+ 'cDataFileManager.cc',
+ 'cDataManager_Base.cc',
+ 'cDefaultMessageDisplay.cc',
+ 'cDoubleSum.cc',
+ #'cFixedBlock.cc',
+ 'cFixedCoords.cc',
+ 'cFile.cc',
+ 'cHelpAlias.cc',
+ 'cHelpManager.cc',
+ 'cHelpType.cc',
+ 'cHistogram.cc',
+ 'cIndexedBlockStruct.cc',
+ 'cInitFile.cc',
+ 'cIntSum.cc',
+ 'cIntegratedSchedule.cc',
+ 'cIntegratedScheduleNode.cc',
+ 'cMessageDisplay.cc',
+ 'cMerit.cc',
+ 'cProbSchedule.cc',
+ 'cRandom.cc',
+ 'cRunningAverage.cc',
+ 'cSchedule.cc',
+ 'cString.cc',
+ 'cStringIterator.cc',
+ 'cStringList.cc',
+ 'cStringUtil.cc',
+ 'cTools.cc',
+ 'cWeightedIndex.cc',
+ 'cCycleCheck.cc',
+]
+
+environment.Library('tools', srcs)
+
+environment.AppendUnique(
+ avida_msvs_project_srcs = [File(src).srcnode().path for src in srcs],
+ avida_msvs_project_incs = [File(src).srcnode().path for src in incs],
+ avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
+)
+
+# vim: set ft=python:
More information about the Avida-cvs
mailing list