From: JF Ding Date: Mon, 28 Nov 2011 02:01:50 +0000 (+0800) Subject: add shell script wrapper support X-Git-Tag: v0.1~70 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0d20d9f1bd9bd9b9d24cbf4eb36c67620fa76f8;p=tools%2Fgbs.git add shell script wrapper support --- diff --git a/Makefile b/Makefile index ba09813..58a4282 100644 --- a/Makefile +++ b/Makefile @@ -25,12 +25,16 @@ dist-gz: git archive --format=tar --prefix=tizenpkg-$(TAGVER)/ $(TAG) | \ gzip > tizenpkg-$(TAGVER).tar.gz -install: all +install: all install-data python setup.py install --prefix=${PREFIX} dev: all python setup.py develop --prefix=${PREFIX} +install-data: + install -d ${DESTDIR}/usr/share/tizenpkg/ + install -m 644 data/* ${DESTDIR}/usr/share/tizenpkg/ + clean: rm -rf build/ rm -rf dist/ diff --git a/data/packaging.sh b/data/packaging.sh new file mode 100755 index 0000000..0af3cf9 --- /dev/null +++ b/data/packaging.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo 'Do the work with the args:' +echo $* diff --git a/data/tizenpkg-packaging.sh b/data/tizenpkg-packaging.sh deleted file mode 100644 index b3a5bc1..0000000 --- a/data/tizenpkg-packaging.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo 'Do the work' diff --git a/tizenpkg/runner.py b/tizenpkg/runner.py index d7a5bd4..b18f624 100644 --- a/tizenpkg/runner.py +++ b/tizenpkg/runner.py @@ -19,7 +19,7 @@ import os from subprocess import * -from mic import msger +import msger def runtool(cmdln_or_args, catch=1): """ wrapper for most of the subprocess calls @@ -104,3 +104,16 @@ def outs(cmdln_or_args): def quiet(cmdln_or_args): return runtool(cmdln_or_args, catch=0)[0] +def embed(cmdln_or_args): + # show all the message using msger.verbose + + rc, out = runtool(cmdln_or_args, catch=3) + + if isinstance(cmdln_or_args, list): + cmd = ' '.join(cmdln_or_args) + else: + cmd = cmdln_or_args + + msger.debug('running command: "%s"' % cmd) + msger.raw(out) + return rc diff --git a/tizenpkg/utils.py b/tizenpkg/utils.py index f43d72b..662e49e 100644 --- a/tizenpkg/utils.py +++ b/tizenpkg/utils.py @@ -18,7 +18,7 @@ import os -import .msger +import msger def which(cmd): def is_exe(fpath): @@ -45,3 +45,7 @@ def strip_end(text, suffix): if not text.endswith(suffix): return text return text[:-len(suffix)] + +def get_share_dir(): + # TODO need to be better + return '/usr/share/tizenpkg/' diff --git a/tools/tizenpkg b/tools/tizenpkg index 0624919..8070459 100755 --- a/tools/tizenpkg +++ b/tools/tizenpkg @@ -21,7 +21,7 @@ import io import ConfigParser from tizenpkg.__version__ import VERSION -from tizenpkg import msger, cmdln, errors +from tizenpkg import msger, cmdln, errors, utils, runner class TizenPkg(cmdln.Cmdln): """ @@ -64,6 +64,20 @@ class TizenPkg(cmdln.Cmdln): from tizenpkg import build build.do() + @cmdln.alias("pk") + def do_packaging(self, argv): + """${cmd_name}: prepare packaging files for current pkg + + Usage: + tizenpkg packaging + + ${cmd_option_list} + """ + + # this command is a shell script wrapper + shpath = os.path.join(utils.get_share_dir(), 'packaging.sh') + runner.embed(['sh', shpath] + argv) + if __name__ == '__main__': try: mic = TizenPkg()