ajack 2003/10/16 14:35:00
Modified: python/gump logic.py
Log:
Attempt to introduce inherit="runtime" logic.
Revision Changes Path
1.27 +15 -7 jakarta-gump/python/gump/logic.py
Index: logic.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- logic.py 15 Oct 2003 21:12:28 -0000 1.26
+++ logic.py 16 Oct 2003 21:35:00 -0000 1.27
@@ -398,8 +398,8 @@
if path:
classpath.append(AnnotatedPath(path,pctxt))
- visited=[]
# Append dependent projects (including optional)
+ visited=[]
# Does it have any depends?
if project.depend:
@@ -444,6 +444,11 @@
pctxt=context.getProjectContextForProject(project)
#
+ # Are we asking for runtime dependencies only?
+ #
+ runtime=depend.runtime
+
+ #
# Append JARS for this project
#
# Note: This checks "id" in "<depend ids="
@@ -452,19 +457,22 @@
#
# inherit='ALL' or 'HARD'
+ # or inherit the runtime ones...
#
deepCopy=determineDeepCopy(depend)
-
- if deepCopy:
+
+ if deepCopy or runtime:
# Append sub-projects outputs
if project.depend:
- for depend in project.depend:
- classpath += getDependOutputList(depend,context,visited)
+ for subdepend in project.depend:
+ if not runtime or subdepend.inherit=="runtime":
+ classpath += getDependOutputList(subdepend,context,visited)
# Append optional sub-project's output (that may not exist)
if project.option:
- for option in project.option:
- classpath += getDependOutputList(option,context,visited)
+ for suboption in project.option:
+ if not runtime or suboption.inherit=="runtime":
+ classpath += getDependOutputList(suboption,context,visited)
return classpath
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
