[Avida-cvs] [avida-svn] r959 - in trunk: Avida.xcodeproj documentation/notes source support/config

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2006-09-13 22:32:35 -0400 (Wed, 13 Sep 2006)
New Revision: 959

Modified:
   trunk/Avida.xcodeproj/project.pbxproj
   trunk/documentation/notes/release-milestones.txt
   trunk/source/defs.h
   trunk/support/config/avida.cfg
Log:
Bump trunk version number.

Modified: trunk/Avida.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida.xcodeproj/project.pbxproj	2006-09-14 02:19:09 UTC (rev 958)
+++ trunk/Avida.xcodeproj/project.pbxproj	2006-09-14 02:32:35 UTC (rev 959)
@@ -930,7 +930,7 @@
 		DCC315CF076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
 		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
-		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

Modified: trunk/documentation/notes/release-milestones.txt
===================================================================
--- trunk/documentation/notes/release-milestones.txt	2006-09-14 02:19:09 UTC (rev 958)
+++ trunk/documentation/notes/release-milestones.txt	2006-09-14 02:32:35 UTC (rev 959)
@@ -11,10 +11,10 @@
      --2.1--
             --2.2----
               --2.3--
-                     --2.4---*---------
-                       --2.5-*
+                     --2.4-------------
+                       --2.5--
                               --2.6----------------------
-                                --2.7--
+                                *-2.7--
                                        --2.8----------------------
                                          --2.9--
                                                 --3.0-------------
@@ -27,44 +27,21 @@
                                                                            --3.6--
 
 
-Version 2.0 - stable      - Target: Unspecified    - Status: End of Life
-Version 2.1 - development - Target: Unspecified    - Status: Completed
-Version 2.2 - stable      - Target: Unspecified    - Status: End of Life
-Version 2.3 - development - Target: Unspecified    - Status: Completed
+Version 2.0 - stable      - Status: End of Life
+Version 2.1 - development - Status: Completed
+Version 2.2 - stable      - Status: End of Life
+Version 2.3 - development - Status: Completed
+Version 2.4 - stable      - Status: End of Life
+Version 2.5 - development - Status: Completed
 
 
-Version 2.4 - stable      - Target: < Version 2.6  - Status: Active Maintaince
+Version 2.6 - stable      - Target: < Mid 2007     - Status: Active Maintenance
 
-Currently at 2.4.3.
+Currently at 2.6.0
 
 
-Version 2.5 - development - Target: July 2006      - Status: Active Development
+Version 2.7 - development - Target: July 2007      - Status: Active Development
 
-* New configuration framework
-* World Object based structure
-* Specifiable Data output directory
-* Transition all output files to use DataFileManager
-* Improved driver object framework
-* SMT Hardware
-* Basic multithreaded analyze mode support
-* TCMalloc OS X
-* TCMalloc Linux
-* Actions framework
-* Merge (meaningful) events and analyze commands into actions framework
-* Consistency test support
-* Framework for unit testing
-* Move UnitTest functions from classes to namespaces
-* Update documentation
-+ Code release cleanup
-
-
-Version 2.6 - stable      - Target: < Mid 2007     - Status: Pending version 2.5 completion
-
-- Stable maintenance
-
-
-Version 2.7 - development - Target: July 2007      - Status: Planned
-
 + Transition all applicable output files to cDataFile objects, as opposed to raw ostream
 + Serialization
 - environment named regions

Modified: trunk/source/defs.h
===================================================================
--- trunk/source/defs.h	2006-09-14 02:19:09 UTC (rev 958)
+++ trunk/source/defs.h	2006-09-14 02:32:35 UTC (rev 959)
@@ -11,7 +11,7 @@
 #ifndef defs_h
 #define defs_h
 
-#define VERSION "2.5.0"
+#define VERSION "2.6.0"
 #define VERSION_TAG "Jedi"
 
 // -= Various view modes

Modified: trunk/support/config/avida.cfg
===================================================================
--- trunk/support/config/avida.cfg	2006-09-14 02:19:09 UTC (rev 958)
+++ trunk/support/config/avida.cfg	2006-09-14 02:32:35 UTC (rev 959)
@@ -3,7 +3,7 @@
 # For more information, see doc/config.html
 #############################################################################
 
-VERSION_ID 2.5.0   # Do not change this value.
+VERSION_ID 2.6.0   # Do not change this value.
 
 ### GENERAL_GROUP ###
 # General Settings