Getting there, but not right.

This commit is contained in:
Ronald G. Minnich 2000-12-14 04:42:38 +00:00
parent bec75e23b1
commit a9d24e25e8
2 changed files with 14 additions and 9 deletions

View file

@ -425,7 +425,7 @@ def makerule(dir, rule):
w = "[" + wspc + "]*"
cmd = "([^" + wspc + "]*)"
namepat = "(.*)"
pat = cmd + w + ":" + w + cmd + w + ";" + w + rest + w
pat = cmd + w + ":" + w + namepat + w + ";" + w + rest + w
print "pat :", pat, ":", rule
command_re = re.compile(pat)
m = command_re.match(rule)
@ -443,7 +443,7 @@ def addaction(dir, rule):
w = "[" + wspc + "]*"
namepat = "(.*)"
cmd = "([^" + wspc + "]*)"
pat = cmd + w + ":" + w + rest + w
pat = cmd + w + rest + w
print "pat :", pat, ":", rule
command_re = re.compile(pat)
m = command_re.match(rule)
@ -644,8 +644,8 @@ def writemakefile(path):
# print out the base rules
for i in range(len(baserules)):
file.write("%s\n" % baserules[i])
# for i in range(len(baserules)):
# file.write("%s\n" % baserules[i])
# print out any user rules
for z in makebaserules.keys():
@ -689,19 +689,24 @@ command_vals['TOP'] = sys.argv[2]
treetop = command_vals['TOP']
# set the default locations for config files
makebase = os.path.join(treetop, "config/make.base")
crt0base = os.path.join(treetop, "config/crt0.base")
ldscriptbase = os.path.join(treetop, "config/ldscript.base")
makebase = os.path.join(treetop, "util/config/make.base")
crt0base = os.path.join(treetop, "util/config/crt0.base")
ldscriptbase = os.path.join(treetop, "util/config/ldscript.base")
doconfigfile(treetop, sys.argv[1])
# do standard config files that the user need not specify
# for now, this is just 'lib', but i tmay be more later.
# for now, this is just 'lib', but it may be more later.
libdir = treetop + "/src/lib"
libconfigfile = libdir + "/Config"
print "Process config file: ", libconfigfile
doconfigfile(libdir, libconfigfile)
# now read in the base files.
print "Now Process the base files"
print "Makebase is :", makebase, ":"
doconfigfile(treetop, makebase)
# print out command values
#print "Command Values:"
#for key,val in command_vals.items():

View file

@ -3,7 +3,7 @@ target winfast
mainboard leadtek/winfast6300
makerule blah : blah.o ; cc -c blah.c
addaction blah: cc -c blah2.c
addaction blah cc -c blah2.c
makedefine THIS=THAT
option SERIAL_CONSOLE
keyboard pc80