From 0b3a1e16f5a446a752307d144c3655a3e15bf21d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 30 Apr 2012 16:38:11 +0000 Subject: [PATCH] build.py: Change usage an project path search - Change usage (target first) - Add some more sense to find_proj_path() --- scripts/build.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/build.py b/scripts/build.py index b7549170..98018d8e 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -9,13 +9,21 @@ import fileinput import glob import subprocess from sets import Set +import pwd all_deps = Set() dep_tree = {} order = [] +proj_base=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/cvs.stable/proj" +search_path=[".", "dspc/src", "dspc/src/dspcd-plugins", "dspc/src/io" ] def find_proj_path(name): - return "/home/jan/local/src/cvs.stable/proj/" + name + name=name.replace("dspider-", "") + for sub in search_path: + path=proj_base + "/" + sub + "/" + name + if os.path.exists(path): + return path + raise Exception("module " + name + " not found below " + proj_base) def read_deps(cur): path = find_proj_path(cur) @@ -70,5 +78,5 @@ def build(module, target): for m in order: run_make(m, target) -build(sys.argv[1], sys.argv[2]) +build(sys.argv[2], sys.argv[1])