You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2003/10/21 21:03:09 UTC
cvs commit: jakarta-gump/python/gump logic.py document.py conf.py
ajack 2003/10/21 12:03:09
Modified: python/gump logic.py document.py conf.py
Log:
Try N+1 of getting CLASSPATH correct.
Revision Changes Path
1.35 +26 -16 jakarta-gump/python/gump/logic.py
Index: logic.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- logic.py 20 Oct 2003 04:34:29 -0000 1.34
+++ logic.py 21 Oct 2003 19:03:08 -0000 1.35
@@ -445,13 +445,17 @@
if project.depend:
# For each
for depend in project.depend:
- classpath += getDependOutputList(project,pctxt,depend,context,visited)
+ for path in getDependOutputList(project,pctxt,depend,context,visited):
+ if not path in classpath:
+ classpath.append(path)
# Same as above, but for optional...
if project.option:
for option in project.option:
- classpath += getDependOutputList(project,pctxt,option,context,visited)
-
+ for path in getDependOutputList(project,pctxt,option,context,visited):
+ if not path in classpath:
+ classpath.append(path)
+
return classpath
#
@@ -462,8 +466,13 @@
# Don't loop...
if depend in visited:
+ #print "Visited : " + str(depend)
+ #print "Visits : "
+ #for v in visited:
+ # print " - " + str(v)
return []
visited.append(depend)
+ print "Perform : " + str(depend) + " in " + parent.name
#
# Check we can get the project...
@@ -524,7 +533,7 @@
# If 'all' or in ids list:
if (not ids) or (jar.id in ids):
if ids: dependStr += ' Id = ' + jar.id
- path=AnnotatedPath(jar.path,pctxt,parentctxt,dependStr)
+ path=AnnotatedPath(jar.path,pctxt,parentctxt,dependStr)
if not path in classpath:
classpath.append(path)
@@ -541,20 +550,21 @@
# Deep copy all/hard (or those for runtime)
#
# Append sub-projects outputs
- if project.depend:
- for subdepend in project.depend:
- if subdepend.inherit or ( runtime and subdepend.runtime ):
- for path in getDependOutputList(project,pctxt,subdepend,context,visited):
- if not path in classpath:
- classpath.append(path)
+ if inherit and not inherit=='none':
+ if project.depend:
+ for subdepend in project.depend:
+ if not inherit=='runtime' or 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 suboption.inherit or ( runtime and suboption.runtime ):
- for path in getDependOutputList(project,pctxt,suboption,context,visited):
- if not path in classpath:
- classpath.append(path)
+ if project.option:
+ for suboption in project.option:
+ if not inherit=='runtime' or suboption.runtime:
+ for path in getDependOutputList(project,pctxt,suboption,context,visited):
+ if not path in classpath:
+ classpath.append(path)
return classpath
1.90 +2 -2 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- document.py 20 Oct 2003 23:58:37 -0000 1.89
+++ document.py 21 Oct 2003 19:03:08 -0000 1.90
@@ -592,7 +592,7 @@
if not modulecontext.reason == REASON_UNSET:
addItemXDoc(x,"Reason: " + reasonString(modulecontext.reason))
if modulecontext.cause and not modulecontext==modulecontext.cause:
- addItemXDoc(x, "Root Cause: ", getTypedContextLink(modulecontext.cause))
+ addXItemXDoc(x, "Root Cause: ", getTypedContextLink(modulecontext.cause))
if module.cvs.repository:
addItemXDoc(x, "CVS Repository: ", module.cvs.repository)
if module.cvs.module:
@@ -657,7 +657,7 @@
addItemXDoc(x,"Reason: " + reasonString(projectcontext.reason))
addXItemXDoc(x,"Module: ", getContextLink(projectcontext.parent))
if projectcontext.cause and not projectcontext==projectcontext.cause:
- addItemXDoc(x,"Root Cause: ", getTypedContextLink(projectcontext.cause))
+ addXItemXDoc(x,"Root Cause: ", getTypedContextLink(projectcontext.cause))
addItemXDoc(x,"Elapsed: ", str(projectcontext.elapsedSecs()))
addItemXDoc(x,"FOG Factor: ", str(round(stats.getFOGFactor(),2)))
addItemXDoc(x,"Successes: ", str(stats.successes))
1.32 +4 -4 jakarta-gump/python/gump/conf.py
Index: conf.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- conf.py 21 Oct 2003 16:15:52 -0000 1.31
+++ conf.py 21 Oct 2003 19:03:08 -0000 1.32
@@ -122,7 +122,7 @@
class switch:
"""Configuration of switches """
- optimize=0 # Optimize (at risk to exact correctness) anywhere one can
+ optimize=1 # Optimize (at risk to exact correctness) anywhere one can
optimizenetwork=1 # Do least network traffic
failtesting=0 # Not testing..
debugging=0 # Not debugging..