ajack 2004/03/29 13:19:45
Modified: python/gump/document forrest.py
Log:
1) Retry on environment
2) Couldn't resist trying 'notesLog' (hopefully the 'root cause path' was what
caused Forrest to spin, not this.)
Revision Changes Path
1.120 +60 -45 gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- forrest.py 29 Mar 2004 19:34:19 -0000 1.119
+++ forrest.py 29 Mar 2004 21:19:45 -0000 1.120
@@ -119,6 +119,7 @@
workspace=run.getWorkspace()
gumpSet=run.getGumpSet()
+ runOptions=run.getOptions()
# Document...
self.documentEnvironment(run,workspace)
@@ -127,8 +128,15 @@
self.documentStatistics(run,workspace,gumpSet)
self.documentXRef(run,workspace,gumpSet)
- # Launch Forrest...
- return self.executeForrest(workspace)
+ #
+ # Launch Forrest, if we aren't just leaving xdocs...
+ #
+ ret=0
+
+ if not runOptions.isXDoc():
+ ret=self.executeForrest(workspace)
+
+ return ret
#####################################################################
#
@@ -257,7 +265,11 @@
document=XDocDocument('Workspace', \
self.resolver.getFile(workspace, 'environment.xml'))
-
+
+ envSection=document.createSection('Gump Environment')
+ envSection.createParagraph(
+ """The environment that this Gump run was within.""")
+
#self.documentFileList(document,environment,'Environment-level Files')
self.documentWorkList(document,environment,'Environment-level Work')
@@ -501,45 +513,48 @@
#
# notesLog.xml -- Notes log
#
-# document=XDocDocument('Annotations', \
-# self.resolver.getFile(workspace,'notesLog'))
-# self.documentSummary(document, workspace.getProjectSummary())
-#
-# notesSection=document.createSection('Negative Annotations')
-# notesSection.createParagraph(
-# """Entities with errors and warnings.""")
-#
-# ncount=0
-# for module in gumpSet.getModuleSequence():
-# if not gumpSet.inModuleSequence(module): continue
-#
-# moduleSection=document.createSection('Module : ' + module.getName())
-#
-# # Link to the module
-# self.insertLink(module,workspace,moduleSection.createParagraph())
-#
-# if not module.containsNasties():
-#
-# # Display the annotations
-# self.documentAnnotations(moduleSection,project,1)
-#
-# for project in module.getProjects():
-# if not gumpSet.inProjectSequence(project): continue
-# if not project.containsNasties(): continue
-#
-# projectSection=moduleSection.createSection('Project : ' +
project.getName())
-#
-# # Link to the project
-#
self.insertLink(project,workspace,projectSection.createParagraph())
-#
-# # Display the annotations
-# self.documentAnnotations(projectSection,project,1)
-#
-# ncount+=1
-#
-# if not ncount: notesTable.createLine('None')
-#
-# document.serialize()
+ document=XDocDocument('Annotations', \
+ self.resolver.getFile(workspace,'notesLog'))
+ self.documentSummary(document, workspace.getProjectSummary())
+
+ notesSection=document.createSection('Negative Annotations')
+ notesSection.createParagraph(
+ """Entities with errors and warnings.""")
+
+ ncount=0
+ for module in gumpSet.getModuleSequence():
+ if not gumpSet.inModuleSequence(module): continue
+
+ moduleSection=None
+
+ if not module.containsNasties():
+ moduleSection=document.createSection('Module : ' +
module.getName())
+ # Link to the module
+ self.insertLink(module,workspace,moduleSection.createParagraph())
+
+ # Display the annotations
+ self.documentAnnotations(moduleSection,project,1)
+
+ for project in module.getProjects():
+ if not gumpSet.inProjectSequence(project): continue
+ if not project.containsNasties(): continue
+
+ if not moduleSection:
+ moduleSection=document.createSection('Module : ' +
module.getName())
+
+ projectSection=moduleSection.createSection('Project : ' +
project.getName())
+
+ # Link to the project
+ self.insertLink(project,workspace,projectSection.createParagraph())
+
+ # Display the annotations
+ self.documentAnnotations(projectSection,project,1)
+
+ ncount+=1
+
+ if not ncount: notesTable.createLine('None')
+
+ document.serialize()
#
# ----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
