ajack 2003/10/22 14:49:39
Modified: python/gump logic.py
Log:
One more stab at CLASSPATH
Revision Changes Path
1.38 +19 -15 jakarta-gump/python/gump/logic.py
Index: logic.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- logic.py 21 Oct 2003 19:53:27 -0000 1.37
+++ logic.py 22 Oct 2003 21:49:39 -0000 1.38
@@ -471,13 +471,13 @@
# Don't loop...
if depend in visited:
- #print "Visited : " + str(depend)
+ # print "Visited : " + str(depend)
#print "Visits : "
#for v in visited:
# print " - " + str(v)
return []
visited.append(depend)
- # print "Perform : " + str(depend) + " in " + parent.name
+ #print "Perform : " + str(depend) + " in " + parent.name
#
# Check we can get the project...
@@ -555,21 +555,25 @@
# Deep copy all/hard (or those for runtime)
#
# Append sub-projects outputs
- if inherit and not inherit=='none':
- if project.depend:
- for subdepend in project.depend:
- if not inherit=='runtime' or subdepend.runtime:
+ if project.depend:
+ for subdepend in project.depend:
+ if (subdepend.inherit and not subdepend.inherit=='none' ) \
+ or (inherit=='runtime' and subdepend.runtime):
for path in
getDependOutputList(project,pctxt,subdepend,context,visited):
- if not path in classpath:
- classpath.append(path)
-
- # Append optional sub-project's output (that may not exist)
- if project.option:
- for suboption in project.option:
- if not inherit=='runtime' or suboption.runtime:
+ if not path in classpath:
+ classpath.append(path)
+
+ #
+ # Deep copy all/hard (or those for runtime)
+ #
+ # Append sub-projects outputs
+ if project.option:
+ for suboption in project.option:
+ if (suboption.inherit and not suboption.inherit=='none' ) \
+ or (inherit=='runtime' and suboption.runtime):
for path in
getDependOutputList(project,pctxt,suboption,context,visited):
- if not path in classpath:
- classpath.append(path)
+ if not path in classpath:
+ classpath.append(path)
return classpath
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
