projects.py: Add option --os

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-11 10:20:16 +00:00
commit 2e3f046477

View file

@ -195,7 +195,7 @@ class Build(object):
self.run_make(m, target, cur_project, num_projects) self.run_make(m, target, cur_project, num_projects)
def run(self, args_): def run(self, args_):
global do_debug global opt_debug
visited = {} visited = {}
glob_order = [] glob_order = []
projs_root=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/jw.dev/proj" projs_root=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/jw.dev/proj"
@ -216,7 +216,7 @@ class Build(object):
args=parser.parse_args(args_) args=parser.parse_args(args_)
if args.debug: if args.debug:
do_debug = True opt_debug = True
debug("----------------------------------------- running ", ' '.join(args_)) debug("----------------------------------------- running ", ' '.join(args_))
@ -262,7 +262,7 @@ class Build(object):
print(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) print(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
def debug(*objs): def debug(*objs):
if do_debug: if opt_debug:
print("DEBUG: ", *objs, file=sys.stderr) print("DEBUG: ", *objs, file=sys.stderr)
def err(*objs): def err(*objs):
@ -866,11 +866,11 @@ global_args = []
res_cache = ResultCache() res_cache = ResultCache()
dep_cache = {} dep_cache = {}
my_dir = os.path.dirname(os.path.realpath(__file__)) my_dir = os.path.dirname(os.path.realpath(__file__))
do_debug = False opt_debug = False
opt_os = None
topdir = None topdir = None
top_name = None top_name = None
glob_os_cascade = None glob_os_cascade = None
do_debug = False
projs_root = expanduser("~") + '/local/src/jw.dev/proj' projs_root = expanduser("~") + '/local/src/jw.dev/proj'
if __name__ == "__main__": if __name__ == "__main__":
@ -890,18 +890,21 @@ if __name__ == "__main__":
parser.add_argument('cmd', default='', help='Command') parser.add_argument('cmd', default='', help='Command')
parser.add_argument('--debug', '-d', action='store_true', parser.add_argument('--debug', '-d', action='store_true',
default=False, help='Output debug information to stderr') default=False, help='Output debug information to stderr')
parser.add_argument('--topdir', '-t', nargs='?', help='Project Path') parser.add_argument('--topdir', '-t', nargs=1, default = [], help='Project Path')
parser.add_argument('--prefix', '-p', nargs='?', default = projs_root, help='Projects Path Prefix') parser.add_argument('--prefix', '-p', nargs=1, default = [ projs_root ], help='Projects Path Prefix')
parser.add_argument('--os', '-O', nargs=1, default = [], help='Target operating system')
parser.add_argument('arg', nargs='*', help='Command arguments') parser.add_argument('arg', nargs='*', help='Command arguments')
args = parser.parse_args(global_args) args = parser.parse_args(global_args)
do_debug = args.debug opt_debug = args.debug
if len(args.os):
opt_os = args.os[0]
debug("----------------------------------------- running ", ' '.join(sys.argv)) debug("----------------------------------------- running ", ' '.join(sys.argv))
projs_root = args.prefix projs_root = args.prefix[0]
if args.topdir: if len(args.topdir):
topdir = args.topdir topdir = args.topdir[0]
if topdir: if topdir:
top_name = res_cache.run(read_value, [topdir + '/make/project.conf', 'build', 'name']) top_name = res_cache.run(read_value, [topdir + '/make/project.conf', 'build', 'name'])