[Avida-cvs] [avida-svn] r756 - in development/source: . analyze targets targets/avida

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-06-19 14:39:07 -0400 (Mon, 19 Jun 2006)
New Revision: 756

Modified:
   development/source/SConscript
   development/source/analyze/SConscript
   development/source/targets/SConscript
   development/source/targets/avida/SConscript
Log:

- Visual Studio build: added some missing files to the generated
  project.



Modified: development/source/SConscript
===================================================================
--- development/source/SConscript	2006-06-19 17:37:19 UTC (rev 755)
+++ development/source/SConscript	2006-06-19 18:39:07 UTC (rev 756)
@@ -24,5 +24,11 @@
 if environment['enablePyPkg'] in ('True', '1', 1):
   environment.SConscript('bindings/Boost.Python/SConscript')
 
+incs = ['defs.h']
+misc = ['SConscript']
+environment.AppendUnique(
+  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/analyze/SConscript
===================================================================
--- development/source/analyze/SConscript	2006-06-19 17:37:19 UTC (rev 755)
+++ development/source/analyze/SConscript	2006-06-19 18:39:07 UTC (rev 756)
@@ -1,19 +1,17 @@
 
 Import('environment')
 
-sources = [
+misc = ['SConscript']
+
+srcs = [
   'cAnalyze.cc',
   'cAnalyzeGenotype.cc',
   'cAnalyzeUtil.cc',
   'cAnalyzeJobQueue.cc',
   'cAnalyzeJobWorker.cc',
 ]
-environment.AppendUnique(
-  avida_msvs_project_srcs = [File(src).srcnode().path for src in sources])
 
-environment.Library('analyze', sources) 
-
-headers = [
+hdrs = [
   'cAnalyze.h',
   'cAnalyzeCommand.h',
   'cAnalyzeCommandAction.h',
@@ -30,8 +28,13 @@
   'cGenotypeBatch.h',
   'tAnalyzeJob.h',
 ]
+
+environment.Library('analyze', srcs) 
+
 environment.AppendUnique(
-  avida_msvs_project_incs = [File(src).srcnode().path for src in headers])
+  avida_msvs_project_srcs = [File(src).srcnode().path for src in srcs],
+  avida_msvs_project_incs = [File(src).srcnode().path for src in hdrs],
+  avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
+)
 
-  
 # vim: set ft=python:

Modified: development/source/targets/SConscript
===================================================================
--- development/source/targets/SConscript	2006-06-19 17:37:19 UTC (rev 755)
+++ development/source/targets/SConscript	2006-06-19 18:39:07 UTC (rev 756)
@@ -1,5 +1,10 @@
 Import('environment')
 
+misc = ['SConscript']
+environment.AppendUnique(
+  avida_msvs_project_misc = [File(src).srcnode().path for src in misc],
+)
+
 if environment['enablePrimitive'] in ('True', '1', 1):
   environment.SConscript('avida/SConscript')
 if environment['enableGuiNcurses'] in ('True', '1', 1):

Modified: development/source/targets/avida/SConscript
===================================================================
--- development/source/targets/avida/SConscript	2006-06-19 17:37:19 UTC (rev 755)
+++ development/source/targets/avida/SConscript	2006-06-19 18:39:07 UTC (rev 756)
@@ -4,7 +4,11 @@
 
 Import('environment')
 
-avida_LIBS = [
+misc = ['SConscript']
+
+srcs = ['primitive.cc']
+
+libs = [
     'main',
     'classification',
     'cpu',
@@ -20,56 +24,22 @@
     'main',
   ]
 if environment['PLATFORM'] not in ('win32'):
-  avida_LIBS = avida_LIBS + ['pthread']
+  libs = libs + ['pthread']
 if environment['enableTCMalloc'] in ('True', '1', 1):
-  avida_LIBS = avida_LIBS + ['tcmalloc']
+  libs = libs + ['tcmalloc']
 
-avida_main_source = ['primitive.cc']
-
 avida_exe = environment.Program('avida',
-  avida_main_source,
-  LIBS = avida_LIBS,
+  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')
 
-# This assumes that the script to build Avida is in the top-level directory
-# of the Avida package; but it doesn't assume the script's name.
-script_to_build_avida = environment.File(
-  os.path.join('#', os.path.basename(sys.argv[0]))
-).abspath
-
-data_dir = environment.Dir(
-  os.path.join(environment['execPrefix'], 'data')
-).abspath
-
-config_file = environment.File(
-  os.path.join(
-    environment['configPrefix'],
-    'avida.cfg'
-) ).abspath
-
-work_directory = environment.Dir(environment['execPrefix'])
-
-build_options_file = environment.File(environment['customOptions'])
-print "build_options_file.abspath '%s'" % build_options_file.abspath
-
-avida_command = "echo Starting Avida && "%s" -c "%s" -set DATA_DIR "%s" " % (
-  avida_exe[0].abspath,
-  config_file,
-  data_dir,
+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],
 )
 
-#environment.MSVSProject(
-#  target = 'Avida' + environment['MSVSPROJECTSUFFIX'],
-#  misc = '#/README',
-#  variant = 'Release',
-#  runfile = avida[0].abspath,
-#  MSVSSCONS = '"%s" "%s"' % (sys.executable, script_to_build_avida),
-#  MSVSSCONSFLAGS = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f "${MSVSSCONSCRIPT.name}"'
-#)
-#
-
 # vim: set ft=python: