[Avida-cvs] [Avida2-svn] r208 - in branches/brysonda: Avida2.xcodeproj source

brysonda@myxo.css.msu.edu brysonda at myxo.css.msu.edu
Mon Jun 13 10:20:39 PDT 2005


Author: brysonda
Date: 2005-06-13 13:20:39 -0400 (Mon, 13 Jun 2005)
New Revision: 208

Added:
   branches/brysonda/source/LEVELS.txt
   branches/brysonda/source/MAP.txt
Removed:
   branches/brysonda/source/LEVELS
   branches/brysonda/source/MAP.renamed_to_avoid_naming_conflict_with_stl
Modified:
   branches/brysonda/Avida2.xcodeproj/project.pbxproj
Log:
Xcode Project now supports building the viewer.  Also renamed horribly long MAP extension to a more sensible .txt.

Modified: branches/brysonda/Avida2.xcodeproj/project.pbxproj
===================================================================
--- branches/brysonda/Avida2.xcodeproj/project.pbxproj	2005-06-13 17:08:52 UTC (rev 207)
+++ branches/brysonda/Avida2.xcodeproj/project.pbxproj	2005-06-13 17:20:39 UTC (rev 208)
@@ -661,7 +661,6 @@
 		DCC310000762539D008F7A48 /* population_event.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population_event.hh; sourceTree = "<group>"; };
 		DCC310010762539D008F7A48 /* population_event_factory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_event_factory.cc; sourceTree = "<group>"; };
 		DCC310020762539D008F7A48 /* population_event_factory.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population_event_factory.hh; sourceTree = "<group>"; };
-		DCC310030762539D008F7A48 /* LEVELS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LEVELS; sourceTree = "<group>"; };
 		DCC310900762539E008F7A48 /* analyze.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze.cc; sourceTree = "<group>"; };
 		DCC310910762539E008F7A48 /* analyze.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze.hh; sourceTree = "<group>"; };
 		DCC310920762539E008F7A48 /* analyze_command.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_command.hh; sourceTree = "<group>"; };
@@ -798,7 +797,6 @@
 		DCC3112B0762539E008F7A48 /* task_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = task_entry.hh; sourceTree = "<group>"; };
 		DCC3112C0762539E008F7A48 /* task_lib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_lib.cc; sourceTree = "<group>"; };
 		DCC3112D0762539E008F7A48 /* task_lib.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = task_lib.hh; sourceTree = "<group>"; };
-		DCC311380762539E008F7A48 /* MAP.renamed_to_avoid_naming_conflict_with_stl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MAP.renamed_to_avoid_naming_conflict_with_stl; sourceTree = "<group>"; };
 		DCC311390762539E008F7A48 /* modules.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = modules.pri; sourceTree = "<group>"; };
 		DCC3114B0762539E008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
 		DCC3114C0762539E008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
@@ -1270,21 +1268,19 @@
 			isa = PBXGroup;
 			children = (
 				DCC30C710762539A008F7A48 /* bindings */,
-				DCC30F7B0762539D008F7A48 /* CMakeLists.txt */,
 				DCC30F7C0762539D008F7A48 /* cpu */,
-				DCC30FCE0762539D008F7A48 /* defs.hh */,
-				DCC30FCF0762539D008F7A48 /* Doxyfile */,
 				DCC30FD00762539D008F7A48 /* event */,
-				DCC310030762539D008F7A48 /* LEVELS */,
 				DCC310040762539D008F7A48 /* main */,
-				DCC311380762539E008F7A48 /* MAP.renamed_to_avoid_naming_conflict_with_stl */,
-				DCC311390762539E008F7A48 /* modules.pri */,
 				DCC3113A0762539E008F7A48 /* support */,
 				DCC311990762539F008F7A48 /* testsuites */,
 				DCC31340076253A0008F7A48 /* third-party */,
 				DCC314D8076253A2008F7A48 /* tools */,
 				DCC315B6076253A5008F7A48 /* utils */,
 				DCC315D2076253A5008F7A48 /* viewers */,
+				DCC30F7B0762539D008F7A48 /* CMakeLists.txt */,
+				DCC30FCE0762539D008F7A48 /* defs.hh */,
+				DCC30FCF0762539D008F7A48 /* Doxyfile */,
+				DCC311390762539E008F7A48 /* modules.pri */,
 			);
 			name = Source;
 			path = source;

Deleted: branches/brysonda/source/LEVELS
===================================================================
--- branches/brysonda/source/LEVELS	2005-06-13 17:08:52 UTC (rev 207)
+++ branches/brysonda/source/LEVELS	2005-06-13 17:20:39 UTC (rev 208)
@@ -1,95 +0,0 @@
-Pure headers:
-  defs.hh
-  cpu_defs.hh
-
-A '*' indicates dependency is in the header, otherwise body is assumed.
-
---Component--	--Dependencies--
-LEVEL 0
-config		[none]
-cpu_stats	[none]
-cpu_stack	[none]
-inst		[none]
-label		[none]
-mutations	[none]
-pop_interface	[none]
-reaction	[none]
-reaction_result [none]
-resource	[none]
-resource_count  [none]
-tasks		[none]
-
-LEVEL 1
-genome		*inst
-inst_lib	*inst
-stats		config
-
-LEVEL 2
-environment	*reaction  *resource  *tasks  *inst_lib  *mutations
-		*reaction_result
-cpu_memory	*genome
-genome_util	genome
-hardware_base	*inst  inst_lib
-inst_util	inst_lib  genome
-
-LEVEL 3
-phenotype	*environment  config
-head		*inst  inst_lib  hardware_base  cpu_memory  label
-
-LEVEL 4
-organism	*mutations  *pop_interface  *cpu_stats  *phenotype
-		config  inst_lib  inst_util  genome  genome_util  hardware_base
-
-LEVEL 5
-population_cell *mutations  organism
-test_cpu	config  hardware_base  inst_lib  inst_util  organism
-		phenotype  pop_interface  resource_count  tasks
-
-LEVEL 6
-fitness_matrix	*stats  *organism  test_cpu  config  inst_lib
-genotype	*genome  config  genome_util  organism  phenotype  stats
-		test_cpu
-hardware_cpu	*cpu_memory  *cpu_stack  *label  *head
-		config  inst_lib  genome_util  organism  phenotype  test_cpu
-
-LEVEL 7
-hardware_factory  hardware_base  hardware_cpu
-hardware_util	inst_lib  inst_util  hardware_base  hardware_cpu config
-lineage		genotype  stats
-species		*genome  stats  genotype  genome_util  test_cpu
-test_util	genome  genotype  inst_util  organism  phenotype  stats
-		hardware_base  test_cpu
-
-LEVEL 8
-genebank	species  genotype  config  stats  test_util
-landscape	*genome  *test_cpu  cpu_memory  stats  inst_lib  organism
-		phenotype  test_util
-
-LEVEL 9
-analyze		*genome  config  species  fitness_matrix  inst_lib  inst_util
-		landscape  phenotype  genome_util  test_cpu  hardware_util
-		test_util  environment
-birth_chamber	label  genome  organism  genotype  genebank
-lineage_control	stats  config  lineage  genome  genome_util  genebank
-                genotype  organism
-
-LEVEL 10
-population	*resource_count  *inst_lib  *pop_interface  *mutations  config 
-		genebank  genome_util  genotype  hardware_base
-		hardware_factory  hardware_util  inst_util  lineage
-		lineage_control  organism  phenotype  population_cell
-		species  stats  tasks  birth_chamber
-
-
-LEVEL 11
-analyze_util	config  genebank  genome  genome_util  genotype  inst_lib
-		inst_util  landscape  organism  phenotype  population
-		population_cell  species  stats  test_cpu  test_util
-callback_util   avida  config  genotype  organism  population  population_cell
-		pop_interface  hardware_base  hardware_factory  test_cpu
-                birth_chamber
-
-LEVEL 12
-avida		*stats  environment genotype  genebank  analyze  config
-		species  genome_util  test_cpu  callback_util  population
-		{events}  {viewers}

Copied: branches/brysonda/source/LEVELS.txt (from rev 203, branches/brysonda/source/LEVELS)

Deleted: branches/brysonda/source/MAP.renamed_to_avoid_naming_conflict_with_stl
===================================================================
--- branches/brysonda/source/MAP.renamed_to_avoid_naming_conflict_with_stl	2005-06-13 17:08:52 UTC (rev 207)
+++ branches/brysonda/source/MAP.renamed_to_avoid_naming_conflict_with_stl	2005-06-13 17:20:39 UTC (rev 208)
@@ -1,112 +0,0 @@
-These dependencies do not include built-in libraries, files from the
-tools directory in avida, or defs.hh.  It is further assumed that a *.ii
-file has the corresponding *.hh as its first include, and likewise *.cc
-has both *.hh and *.ii.  Files with nothing listed have no additional
-dependencies.
-
-There is a seperate tools MAP in the 'source/tools/' directory.
-
-DIRECTORY: source/main/
-
-analyze.hh		: data_entry.hh  genome.hh
-analyze.cc		: config.hh    species.hh    fitness_matrix.hh
-			  inst_lib.hh  landscape.hh  phenotype.hh  test_cpu.hh
-
-avida.hh		: 
-avida.cc		: population.hh  genotype.hh  genebank.hh  analyze.hh
-			  config.hh      test_cpu.hh  tasks.hh     stats.hh
-                          species.hh
-
-config.hh		: 
-config.cc		: 
-
-fitness_matrix.hh	: cpu.hh test_cpu.hh stats.hh
-fitness_matrix.cc	: config.hh inst_lib.hh
-
-genebank.hh		: 
-genebank.cc		: species.hh  population.hh  genotype.hh  config.hh
-			  stats.hh    test_cpu.hh 
-
-genome.hh		: inst.hh
-genome.cc		: 
-
-genome_util.hh		:
-genome_util.cc		: genome.hh
-
-genotype.hh		: genome.hh
-genotype.cc		: stats.hh  config.hh  test_cpu.hh
-
-inst.hh			: 
-inst.cc			:
-
-inst_lib.hh		: inst.hh
-inst_lib.cc		: cpu.hh
-
-landscape.hh		: test_cpu.hh
-landscape.cc		: stats.hh       inst_lib.hh
-
-lineage.hh		: 
-lineage.cc		: stats.hh  genotype.hh
-
-lineage_control.hh	: 
-lineage_control.cc	: lineage.hh    stats.hh     config.hh  genebank.hh
-			  landscape.hh  genotype.hh  cpu.hh
-
-phenotype.hh		: tasks.hh
-phenotype.cc		: config.hh  cpu.hh
-
-population.hh		: cpu.hh
-population.cc		: avida.hh      stats.hh     genebank.hh    inst_lib.hh
-			  species.hh    genotype.hh  landscape.hh   tasks.hh  
-                          config.hh     environment.hh
-			  phenotype.hh  lineage.hh   lineage_control.hh
-
-species.hh		: genome.hh
-species.cc		: stats.hh       genotype.hh  test_cpu.hh
-
-stats.hh		:
-stats.cc		: config.hh   genotype.hh  lineage_control.hh
-			  lineage.hh  test_cpu.hh
-
-task_buffer.hh		:
-task_buffer.cc		:
-
-tasks.hh		: task_buffer.hh
-tasks.cc		: stats.hh        config.hh
-
-
-DIRECTORY: source/cpu/
-
-cpu.hh			: cpu_defs.hh   cpu_stats.hh  cpu_memory.hh
-			  head.hh       creature.hh   hardware.hh
-cpu.cc			: environment.hh  phenotype.hh  inst_lib.hh
-			  genotype.hh     landscape.hh  config.hh
-			  stats.hh        genome.hh     genome_util.hh
-
-cpu_memory.hh		: genome.hh
-cpu_memory.cc		: 
-
-cpu_defs.hh		:
-cpu_stats.hh		:
-creature.hh		:
-
-environment.hh		: head.hh
-environment.cc		: population.hh  genebank.hh  stats.hh  genotype.hh
-
-hardware.hh		: task_buffer.hh  cpu_defs.hh    label.hh
-			  head.hh         cpu_memory.hh
-hardware.cc		: config.hh  phenotype.hh  inst_lib.hh
-
-head.hh			: inst.hh
-head.cc			: environment.hh  inst_lib.hh  cpu.hh
-
-label.hh		: cpu_defs.hh
-label.cc		: 
-
-test_cpu.hh		: cpu.hh
-test_cpu.cc		: hardware.hh   genotype.hh  config.hh
-			  phenotype.hh  stats.hh     inst_lib.hh
-
-
-DIRECTORY: source/viewers/
-

Copied: branches/brysonda/source/MAP.txt (from rev 203, branches/brysonda/source/MAP.renamed_to_avoid_naming_conflict_with_stl)




More information about the Avida-cvs mailing list