From f3ea4d876fe0d62dcf63cfdcaf7657949cc4dbcf Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Thu, 6 Jan 2011 15:20:04 -0500
Subject: Add default version file for developers.

---
 nova/version.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 nova/version.py

(limited to 'nova/version.py')

diff --git a/nova/version.py b/nova/version.py
new file mode 100644
index 000000000..fc14b8401
--- /dev/null
+++ b/nova/version.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+"""This file is automatically generated by generate_version_info
+It uses the current working tree to determine the revision.
+So don't edit it. :)
+"""
+
+version_info = {'branch_nick': u'LOCALBRANCH', 'revision_id': 'LOCALREVISION',
+                'revno': 0}
+
+revisions = {}
+
+file_revisions = {}
+
+
+if __name__ == '__main__':
+    print 'revision: %(revno)d' % version_info
+    print 'nick: %(branch_nick)s' % version_info
+    print 'revision id: %(revision_id)s' % version_info
+
+# below this line automatically generated by setup.py
+
+YEAR = '2011'
+COUNT = '1-dev'
+
+
+def string():
+    return '.'.join([YEAR, COUNT])
+
+
+def vcs_version_string():
+    return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
+
+
+def string_with_vcs():
+    return "%s-%s" % (string(), vcs_version_string())
-- 
cgit 


From 8b3925e4d4b97dc28bfc903483ec4793fb38fed5 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Fri, 7 Jan 2011 15:17:03 +0100
Subject: Less code generation.

---
 nova/version.py | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'nova/version.py')

diff --git a/nova/version.py b/nova/version.py
index fc14b8401..1504a5c82 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -1,35 +1,31 @@
 #!/usr/bin/env python
-"""This file is automatically generated by generate_version_info
-It uses the current working tree to determine the revision.
-So don't edit it. :)
-"""
+try:
+    from nova.vcsversion import version_info
+except ImportError:
+    version_info = {'branch_nick': u'LOCALBRANCH',
+                    'revision_id': 'LOCALREVISION',
+                    'revno': 0}
 
-version_info = {'branch_nick': u'LOCALBRANCH', 'revision_id': 'LOCALREVISION',
-                'revno': 0}
+NOVA_VERSION = ['2011', '1']
+YEAR, COUNT = NOVA_VERSION
 
-revisions = {}
+FINAL = False   # This becomes true at Release Candidate time
 
-file_revisions = {}
 
-
-if __name__ == '__main__':
-    print 'revision: %(revno)d' % version_info
-    print 'nick: %(branch_nick)s' % version_info
-    print 'revision id: %(revision_id)s' % version_info
-
-# below this line automatically generated by setup.py
-
-YEAR = '2011'
-COUNT = '1-dev'
+def canonical_version_string():
+    return '.'.join([YEAR, COUNT])
 
 
-def string():
-    return '.'.join([YEAR, COUNT])
+def version_string():
+    if FINAL:
+        return canonical_version_string()
+    else:
+        return '%s-dev' % (canonical_version_string(),)
 
 
 def vcs_version_string():
     return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
 
 
-def string_with_vcs():
-    return "%s-%s" % (string(), vcs_version_string())
+def version_string_with_vcs():
+    return "%s-%s" % (canonical_version_string(), vcs_version_string())
-- 
cgit 


From 509c3b02f171d47ff9bc8cbbb3f0ac7cd1e888b3 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Fri, 7 Jan 2011 21:44:27 +0100
Subject: Add copyright and license info to version.py

---
 nova/version.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'nova/version.py')

diff --git a/nova/version.py b/nova/version.py
index 1504a5c82..7b27acb6a 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -1,4 +1,19 @@
-#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright 2011 OpenStack LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 try:
     from nova.vcsversion import version_info
 except ImportError:
-- 
cgit