X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cdist;h=f36bdfd819b18f97f210384a7f9d0f0985a93776;hb=32bc904578b7bc5957da453c777c1b091a6d7f34;hp=da87f8473986e64d866b2ae7fc8dbe9ce3a635f1;hpb=dd494941b8214c08d2d7f019a948c569583f3fa5;p=cdist.git diff --git a/cdist b/cdist index da87f84..f36bdfd 100755 --- a/cdist +++ b/cdist @@ -891,7 +891,7 @@ class OSXUniversalTarget(OSXTarget): self._copy_packages(tree, p, output_dir) class SourceTarget(Target): - """Build a source .tar.bz2""" + """Build a source .tar.bz2 and .zst""" def __init__(self): super(SourceTarget, self).__init__('source') @@ -907,8 +907,12 @@ class SourceTarget(Target): with TreeDirectory(tree): name = read_wscript_variable(os.getcwd(), 'APPNAME') command('./waf dist') - p = os.path.abspath('%s-%s.tar.bz2' % (name, tree.version)) - copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, p)))) + bz2 = os.path.abspath('%s-%s.tar.bz2' % (name, tree.version)) + copyfile(bz2, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, bz2)))) + command('tar xjf %s' % bz2) + command('tar --zstd -cf %s-%s.zst %s-%s' % (name, tree.version, name, tree.version)) + zstd = os.path.abspath('%s-%s.zst' % (name, tree.version)) + copyfile(zstd, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, zstd)))) # @param s Target string: # windows-{32,64}