sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cloning activity in sugar - SL #4608

Browse Source 
Probably this code was not included in the initial port from gtk2 to
gtk3, because is only used by Sugar, but now we need it.

I changed the way the parameter dist_name is used,
then a complementary patch in sugar is needed

Fixes #4608

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
This commit is contained in:
Gonzalo Odiard 2013-11-27 14:55:31 -03:00
parent cd5292881e
commit b8074549f6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sugar3/activity/bundlebuilder.py
View File

@ -64,10 +64,11 @@ def list_files(base_dir, ignore_dirs=None, ignore_files=None):
class Config(object): class Config(object):
def __init__(self, source_dir): def __init__(self, source_dir, dist_dir=None, dist_name=None):
self.source_dir = source_dir self.source_dir = source_dir
self.build_dir = os.getcwd() self.build_dir = os.getcwd()
self.dist_dir = os.path.join(self.build_dir, 'dist') self.dist_dir = dist_dir or os.path.join(self.source_dir, 'dist')
self.dist_name = dist_name
self.bundle = None self.bundle = None
self.version = None self.version = None
self.activity_name = None self.activity_name = None
@ -91,8 +92,12 @@ class Config(object):
self.bundle_name = reduce(operator.add, self.activity_name.split()) self.bundle_name = reduce(operator.add, self.activity_name.split())
self.bundle_root_dir = self.bundle_name + '.activity' self.bundle_root_dir = self.bundle_name + '.activity'
self.tar_root_dir = '%s-%s' % (self.bundle_name, self.version) self.tar_root_dir = '%s-%s' % (self.bundle_name, self.version)
self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version) if self.dist_name:
self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version) self.xo_name = '%s.xo' % self.dist_name
self.tar_name = '%s.tar.bz2' % self.dist_name
else:
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): class Builder(object):