Add new numbering scheme #2425

- add class NormalizedVersion to parse and compare the new activity versions
- change the bundlebuilder and activitybundle to use the new scheme, instead
of an int version we expect a string that matches the format defined in
NormalizedVersion

1 files changed, 3 insertions, 3 deletions

diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
index fc8ebc8..d9dd96d 100644
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar/activity/bundlebuilder.py
@@ -86,13 +86,13 @@ class Config(object):
         self.bundle_id = bundle.get_bundle_id()
         self.bundle_name = reduce(lambda x, y: x+y, self.activity_name.split())
         self.bundle_root_dir = self.bundle_name + '.activity'
-        self.tar_root_dir = '%s-%d' % (self.bundle_name, self.version)
+        self.tar_root_dir = '%s-%s' % (self.bundle_name, self.version)
 
         if self.dist_name:
             self.xo_name = self.tar_name = self.dist_name
         else:
-            self.xo_name = '%s-%d.xo' % (self.bundle_name, self.version)
-            self.tar_name = '%s-%d.tar.bz2' % (self.bundle_name, self.version)
+            self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version)
+            self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version)
 
 
 class Builder(object):