Permalink
Browse files

Cleans up exponent_version file to better work with development, pre-…

…release, and releases, esp, using git-flow
  • Loading branch information...
1 parent e233062 commit 7e61382618c46c9459f4f534294a7bc55bdacd19 @dleffler dleffler committed Apr 2, 2011
Showing with 12 additions and 9 deletions.
  1. +12 −9 exponent_version.php
View
@@ -1,7 +1,7 @@
<?php
##################################################
#
-# Copyright (c) 2004-2006 OIC Group, Inc.
+# Copyright (c) 2004-2011 OIC Group, Inc.
# Written and Designed by James Hunt
#
# This file is part of Exponent
@@ -32,34 +32,37 @@
/* exdoc
* This is the major version number of Exponent; the 0 in 0.96.2-beta3
*/
- //define('EXPONENT_VERSION_MAJOR','%%MAJOR%%');
- define('EXPONENT_VERSION_MAJOR','2');
+ define('EXPONENT_VERSION_MAJOR','%%MAJOR%%');
/* exdoc
* This is the minor version number of Exponent; the 96 in 0.96.2-beta3
*/
- //define('EXPONENT_VERSION_MINOR','%%MINOR%%');
- define('EXPONENT_VERSION_MINOR','0');
+ define('EXPONENT_VERSION_MINOR','%%MINOR%%');
/* exdoc
* This is the revision version number of Exponent; the 2 in 0.96.2-beta3
*/
- //define('EXPONENT_VERSION_REVISION','%%REVISION%%');
- define('EXPONENT_VERSION_REVISION','0');
+ define('EXPONENT_VERSION_REVISION','%%REVISION%%');
/* exdoc
* This is the date that this version of Exponent was exported from BZR and built.
*/
define('EXPONENT_VERSION_BUILDDATE','%%BUILDDATE%%');
/* exdoc
* This specifies the type of release, either 'alpha','beta','rc' or '' (for stable).
*/
- //define('EXPONENT_VERSION_TYPE','%%TYPE%%');
- define('EXPONENT_VERSION_TYPE','beta1.1');
+ define('EXPONENT_VERSION_TYPE','%%TYPE%%');
/* exdoc
* This number is bumped each time a distribution of a single version is
* released. For instance, the 3rd beta has an version type iteration of 3.
*/
define('EXPONENT_VERSION_ITERATION','%%ITERATION%%'); // only applies to betas/alphas / rcs
}
+if (EXPONENT_VERSION_MAJOR == '%%MAJOR%%') {
+ define('EXPONENT_VERSION_MAJOR','2');
+ define('EXPONENT_VERSION_MINOR','0');
+ define('EXPONENT_VERSION_REVISION','0');
+ define('EXPONENT_VERSION_TYPE','develop');
+ define('EXPONENT_VERSION_ITERATION','');
+}
//return '0.96'; uncomment this when full deprecation of exponent is complete
?>

0 comments on commit 7e61382

Please sign in to comment.