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

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-05-31 19:30:10 -0400 (Wed, 31 May 2006)
New Revision: 726

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

Disable MSVSProject generation on non-Windows.



Modified: development/SConstruct
===================================================================
--- development/SConstruct	2006-05-31 23:18:30 UTC (rev 725)
+++ development/SConstruct	2006-05-31 23:30:10 UTC (rev 726)
@@ -69,22 +69,26 @@
 )
 
 # Tell SCons where to find its subscripts.
-environment.SConscript('source/SConscript', build_dir = "$buildDir")
+environment.SConscript('source/SConscript', build_dir = '$buildDir')
 environment.SConscript('support/config/SConscript')
 
-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',
-  #runfile = avida[0].abspath,
-  MSVSSCONS = '"%s" "%s"' % (sys.executable, script_to_build_avida),
-  MSVSSCONSFLAGS = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f "${MSVSSCONSCRIPT.name}"'
-)
+# XXX beginnings of consistency tests. @kgn
+#environment.SConscript('consistencytests/SConscript', build_dir = 'consistencytest_output')
 
+if environment['PLATFORM'] == 'win32':
+  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',
+    #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/targets/avida/SConscript
===================================================================
--- development/source/targets/avida/SConscript	2006-05-31 23:18:30 UTC (rev 725)
+++ development/source/targets/avida/SConscript	2006-05-31 23:30:10 UTC (rev 726)
@@ -26,11 +26,14 @@
 
 avida_main_source = ['primitive.cc']
 
-avida = environment.Program('avida',
+avida_exe = environment.Program('avida',
   avida_main_source,
   LIBS = avida_LIBS,
 )
-environment.Install('$execPrefix', avida)
+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.
@@ -54,7 +57,7 @@
 print "build_options_file.abspath '%s'" % build_options_file.abspath
 
 avida_command = "echo Starting Avida && "%s" -c "%s" -set DATA_DIR "%s" " % (
-  avida[0].abspath,
+  avida_exe[0].abspath,
   config_file,
   data_dir,
 )