Added support for MANIFEST-OLPC files in bundlebuilder

This commit is contained in:
Owen Williams 2006-12-04 15:44:15 -05:00 committed by Marco Pesenti Gritti
parent 37853ad836
commit b8f44c00c7

View File

@ -42,6 +42,12 @@ class _GitFileList(list):
self.append(filename) self.append(filename)
f.close() f.close()
class _ManifestFileList(list):
def __init__(self):
f = open('MANIFEST-OLPC','r')
for line in f.readlines():
self.append(line[:-1])
def _extract_bundle(source_file, dest_dir): def _extract_bundle(source_file, dest_dir):
if not os.path.exists(dest_dir): if not os.path.exists(dest_dir):
os.mkdir(dest_dir) os.mkdir(dest_dir)
@ -83,6 +89,10 @@ def _get_package_name():
zipname = '%s-%d.xo' % (bundle.get_name(), bundle.get_activity_version()) zipname = '%s-%d.xo' % (bundle.get_name(), bundle.get_activity_version())
return zipname return zipname
def _get_bundle_name():
bundle = Bundle(_get_source_path())
return bundle.get_name()
def _delete_backups(arg, dirname, names): def _delete_backups(arg, dirname, names):
for name in names: for name in names:
if name.endswith('~') or name.endswith('pyc'): if name.endswith('~') or name.endswith('pyc'):
@ -108,18 +118,24 @@ def cmd_dev():
print 'ERROR - A bundle with the same name is already installed.' print 'ERROR - A bundle with the same name is already installed.'
def cmd_dist(): def cmd_dist():
try:
os.stat('MANIFEST-OLPC')
file_list = _ManifestFileList()
except:
if os.path.isdir('.git'): if os.path.isdir('.git'):
file_list = _GitFileList() file_list = _GitFileList()
elif os.path.isdir('.svn'): elif os.path.isdir('.svn'):
file_list = _SvnFileList() file_list = _SvnFileList()
else: else:
print 'ERROR - The command works only with git or svn repositories.' print 'ERROR - The command works only with git or svn\
repositories, or MANIFEST-OLPC file lists.'
return
zipname = _get_package_name() zipname = _get_package_name()
bundle_zip = zipfile.ZipFile(zipname, 'w', zipfile.ZIP_DEFLATED) bundle_zip = zipfile.ZipFile(zipname, 'w', zipfile.ZIP_DEFLATED)
for filename in file_list: for filename in file_list:
arcname = os.path.join(_get_bundle_dir(), filename) arcname = os.path.join(_get_bundle_name()+'.activity', filename)
bundle_zip.write(filename, arcname) bundle_zip.write(filename, arcname)
bundle_zip.close() bundle_zip.close()
@ -154,3 +170,6 @@ def start():
cmd_clean() cmd_clean()
else: else:
cmd_help() cmd_help()
if __name__ == '__main__':
start()