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/15 01:29:06 UTC
cvs commit: jakarta-gump/python/gump nag.py logic.py document.py
ajack 2003/10/14 16:29:06
Modified: python/gump nag.py logic.py document.py
Log:
1) Log nags we can't nag [later send to gump?]
2) link to fork in some cases
3) Hack for inherit="jars"
Revision Changes Path
1.5 +2 -0 jakarta-gump/python/gump/nag.py
Index: nag.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/nag.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nag.py 13 Oct 2003 22:38:28 -0000 1.4
+++ nag.py 14 Oct 2003 23:29:06 -0000 1.5
@@ -91,6 +91,8 @@
project=Project.list[pname]
if project.nag:
nagProject(workspace,context,module,mctxt,project,pctxt)
+ else:
+ log.error("Project naggable w/ nowhere to nag")
def nagWorkspace(workspace,context):
""" Nag for the workspace """
1.25 +4 -2 jakarta-gump/python/gump/logic.py
Index: logic.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- logic.py 14 Oct 2003 16:12:38 -0000 1.24
+++ logic.py 14 Oct 2003 23:29:06 -0000 1.25
@@ -445,7 +445,8 @@
#
# Append JARS for this project
- # Note: This checks "id" in "ids"
+ #
+ # Note: This checks "id" in "<depend ids="
for jar in depend.jars():
classpath.append(AnnotatedPath(jar.path,pctxt))
@@ -471,7 +472,8 @@
"""Determine if we ought deepCopy to inherit"""
deep=0
inherit=depend.inherit
- if inherit == 'all' or inherit=='hard':
+ # :TODO: The 'jars' is a temporary hack.
+ if inherit == 'all' or inherit=='hard' or inherit=='jars':
deep=1
return deep
1.72 +13 -6 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- document.py 14 Oct 2003 00:07:27 -0000 1.71
+++ document.py 14 Oct 2003 23:29:06 -0000 1.72
@@ -513,7 +513,7 @@
if not description:
description='No description provided.'
if module.url:
- description+=' For more information, see: ' + getLink(module.url.href)
+ description+=' For more information, see: ' + getFork(module.url.href)
else:
description+=' (No module URL provided).'
@@ -629,7 +629,7 @@
if not description:
description='No description provided.'
if project.url:
- description+=' For more information, see: ' + getLink(project.url.href)
+ description+=' For more information, see: ' + getFork(project.url.href)
else:
description=' (No project URL provided.)'
@@ -1232,6 +1232,16 @@
if not xdata: xdata = escape(href)
link='<link href=\'%s\'>%s</link>' % (escape(href),xdata)
return link
+
+def getFork(href,name=None):
+ if not name: name = href
+ fork='<fork href=\'%s\'>%s</fork>' % (escape(href),escape(name))
+ return fork
+
+def getXFork(href,xdata=None):
+ if not xdata: xdata = escape(href)
+ fork='<fork href=\'%s\'>%s</fork>' % (escape(href),xdata)
+ return fork
#####################################################################
#
@@ -1323,10 +1333,7 @@
if i:
f.write(' <li>%s - %s</li>\n' % (t, i))
else:
- f.write(' <li>%s</li>\n' % (t))
-
-def addLinkXDoc(f,url,title):
- f.write(' <link href=\'%s\'>%s</link>' % (url,title))
+ f.write(' <li>%s</li>\n' % (t))
def endListXDoc(f ):
f.write(' </ul>\n')