ajack 2003/09/12 04:50:37
Modified: python/gump check.py document.py
Log:
1) Check for java compiler
2) Added CheckEnvironment to Check command line testing
3) Showing "Cause" always again in docs, not sure why the filter failed.
Revision Changes Path
1.16 +15 -7 jakarta-gump/python/gump/check.py
Index: check.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/check.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- check.py 11 Sep 2003 21:11:42 -0000 1.15
+++ check.py 12 Sep 2003 11:50:37 -0000 1.16
@@ -131,10 +131,12 @@
# rsync or cp
# forrest (for documentation)
#
+ checkExecutable(workspace, context, 'env','',0)
checkExecutable(workspace, context, context.javaCommand,'-version',exitOnError)
checkExecutable(workspace, context, 'javac','-help',exitOnError)
+ checkExecutable(workspace, context, 'java','com.sun.tools.javac.Main
-help',exitOnError,'java_compiler')
checkExecutable(workspace, context, 'cvs','--version',exitOnError)
- if not context.noForrest and not checkExecutable(workspace, context,
'forrest','-help',0):
+ if not context.noForrest and not checkExecutable(workspace, context,
'forrest','-projecthelp',0):
context.noForrest=1
context.addWarning('"forrest" command not found, no xdoc output')
@@ -147,10 +149,11 @@
# Need to check javac classes are on CLASSPATH
#
-def checkExecutable(workspace,context,command,options,mandatory):
+def checkExecutable(workspace,context,command,options,mandatory,name=None):
ok=0
try:
- cmd=getCmdFromString(command+" "+options,'check_'+command)
+ if not name: name='check_'+command
+ cmd=getCmdFromString(command+" "+options,name)
result=execute(cmd)
ok=result.status==CMD_STATUS_SUCCESS
if not ok:
@@ -330,9 +333,14 @@
# get parsed workspace definition
workspace=load(ws)
+
+ context=GumpContext()
+
+ #
+ checkEnvironment(workspace,context,0)
# check
- result = check(workspace, ps);
+ result = check(workspace, ps)
# bye!
sys.exit(result)
1.19 +3 -2 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- document.py 11 Sep 2003 17:06:31 -0000 1.18
+++ document.py 12 Sep 2003 11:50:37 -0000 1.19
@@ -447,7 +447,8 @@
startSectionXDoc(x,'Details')
startListXDoc(x)
addItemXDoc(x,"Status: ", stateName(projectcontext.status))
- if projectcontext.cause and not projectcontext==projectcontext.cause:
+ # Not Working if projectcontext.cause and not
projectcontext==projectcontext.cause:
+ if projectcontext.cause:
addItemXDoc(x,"Root Cause:", "<link href='%s'>%s</link>" % \
(getContextUrl(projectcontext.cause), projectcontext.cause.name))
addItemXDoc(x,"Elapsed: ", str(projectcontext.elapsedSecs()))
@@ -534,7 +535,7 @@
x.write(' <tr><!-- %s -->' % (workTypeName(work.type)))
x.write(' <td><link href=\'%s\'>%s</link></td>' %
(getWorkRelativeUrl(work.type,work.command.name),work.command.name))
x.write(' <td>%s</td>' % (workTypeName(work.type)))
- x.write(' <td>%s</td><td>%s</td>' % (stateName(work.status),
str(work.secs)))
+ x.write(' <td>%s</td><td>%s secs.</td>' % (stateName(work.status),
str(work.secs)))
x.write(' </tr>')
x.write(' </table>\n')
endSectionXDoc(x)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
