cvs commit: gump/python/gump/document forrest.py
ajack 2004/04/14 07:07:51
Modified:python/gump/document forrest.py
Log:
For the sake of a character the build was lost. :(
Revision ChangesPath
1.146 +6 -1 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- forrest.py13 Apr 2004 15:59:25 - 1.145
+++ forrest.py14 Apr 2004 14:07:49 - 1.146
@@ -464,7 +464,7 @@
self.insertLink( server, workspace, serverRow.createData())
if server.hasNote():
-serverTow.createData(server.getNote())
+serverRow.createData(server.getNote())
else:
serverRow.createData('')
@@ -2588,6 +2588,11 @@
fogRow.createData(pstats.failures)
fogRow.createData(pstats.prereqs)
fogRow.createData('%02.2f' % pstats.getFOGFactor())
+
+# Generate an SVG:
+# ,'FOG'
+#svgFile=self.resolver.getFile(stats,project.getName()+'_FOG','.svg')
+#fogRow.createData().createIcon(svgName.replace('.svg','.png'),'FOG
Factor')
document.serialize()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
ajack 2004/04/12 12:12:34 Modified:python/gump/document forrest.py Log: Try to fix server link table layout (img w.r.t text) Revision ChangesPath 1.142 +1 -1 gump/python/gump/document/forrest.py Index: forrest.py === RCS file: /home/cvs/gump/python/gump/document/forrest.py,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- forrest.py12 Apr 2004 18:57:37 - 1.141 +++ forrest.py12 Apr 2004 19:12:34 - 1.142 @@ -1790,7 +1790,7 @@ # Insert the Icon... if -1 depth: depth=getDepthForObject(linkable) -self.insertStatePairIconAtDepth(dataNode,statePair,depth) +self.insertStatePairIconAtDepth(xdocNode,statePair,depth) if utcTime: xdocNode.createBreak() - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
ajack 2004/04/12 14:12:00
Modified:python/gump/document forrest.py
Log:
Leave xdocs around, if forrest fails, for manual debugging.
Revision ChangesPath
1.143 +4 -1 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- forrest.py12 Apr 2004 19:12:34 - 1.142
+++ forrest.py12 Apr 2004 21:12:00 - 1.143
@@ -200,7 +200,10 @@
#
# Clean up
wipeDirectoryTree(stagingDirectory)
-wipeDirectoryTree(forrestWorkDir)
+
+# Clean only if successful.
+if (forrestResult.state==CMD_STATE_SUCCESS):
+wipeDirectoryTree(forrestWorkDir)
except:
log.error('--- Failed to staging-log sync and/or clean-up',
exc_info=1)
success=0
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
ajack 2004/04/12 14:39:58 Modified:python/gump/document forrest.py Log: Fix depth for state icons in ServerLinks. Revision ChangesPath 1.144 +1 -1 gump/python/gump/document/forrest.py Index: forrest.py === RCS file: /home/cvs/gump/python/gump/document/forrest.py,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- forrest.py12 Apr 2004 21:12:00 - 1.143 +++ forrest.py12 Apr 2004 21:39:58 - 1.144 @@ -1791,7 +1791,7 @@ if statePair: xdocNode.createBreak() # Insert the Icon... -if -1 depth: +if -1 == depth: depth=getDepthForObject(linkable) self.insertStatePairIconAtDepth(xdocNode,statePair,depth) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
ajack 2004/04/11 08:18:43
Modified:python/gump/results resulter.py model.py
python/gump/model server.py workspace.py
python/gump/document forrest.py
Log:
Try actually setting the values...
Revision ChangesPath
1.21 +7 -0 gump/python/gump/results/resulter.py
Index: resulter.py
===
RCS file: /home/cvs/gump/python/gump/results/resulter.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- resulter.py 11 Apr 2004 01:28:49 - 1.20
+++ resulter.py 11 Apr 2004 15:18:43 - 1.21
@@ -179,6 +179,13 @@
# Create
workspaceResults = WorkspaceResult(self.workspace.getName())
+
+# :TODO: Find nicer way to transfer (or just reference)
+workspaceResults.startDateTime=self.workspace.getStartDateTime()
+workspaceResults.startDateTimeUtc=self.workspace.getStartDateTimeUtc()
+workspaceResults.endDateTime=self.workspace.getEndDateTime()
+workspaceResults.endDateTimeUtc=self.workspace.getEndDateTimeUtc()
+workspaceResults.timezone=self.workspace.getTimezone()
# For all modules...
for module in self.workspace.getModules():
1.12 +2 -0 gump/python/gump/results/model.py
Index: model.py
===
RCS file: /home/cvs/gump/python/gump/results/model.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- model.py 11 Apr 2004 00:40:02 - 1.11
+++ model.py 11 Apr 2004 15:18:43 - 1.12
@@ -247,8 +247,10 @@
# Timing
self.startDateTime=self.dom.documentElement.getAttribute('start')
self.startDateTimeUtc=self.dom.documentElement.getAttribute('startUtc')
+
self.endDateTime=self.dom.documentElement.getAttribute('end')
self.endDateTimeUtc=self.dom.documentElement.getAttribute('endUtc')
+
self.timezone=self.dom.documentElement.getAttribute('tzone')
#
1.15 +1 -1 gump/python/gump/model/server.py
Index: server.py
===
RCS file: /home/cvs/gump/python/gump/model/server.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- server.py 10 Apr 2004 23:19:38 - 1.14
+++ server.py 11 Apr 2004 15:18:43 - 1.15
@@ -65,7 +65,7 @@
return str(self.xml.url)
def hasResultsUrl(self):
-return self.hasUrl()
+return self.isPython() and self.hasUrl()
def getResultsUrl(self):
return self.getUrl() + '/results.xml'
1.44 +1 -1 gump/python/gump/model/workspace.py
Index: workspace.py
===
RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- workspace.py 10 Apr 2004 23:09:29 - 1.43
+++ workspace.py 11 Apr 2004 15:18:43 - 1.44
@@ -122,7 +122,7 @@
def getEndDateTime(self):
return self.endDateTime
-def getStartDateTimeUtc(self):
+def getEndDateTimeUtc(self):
return self.endDateTimeUtc
def getChildren(self):
1.140 +2 -2 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- forrest.py10 Apr 2004 23:28:03 - 1.139
+++ forrest.py11 Apr 2004 15:18:43 - 1.140
@@ -466,8 +466,8 @@
if server.hasResultsUrl():
serverRow.createData().createFork( \
-'Results', \
-server.getResultsUrl())
+server.getResultsUrl(), \
+'Results')
else:
serverRow.createData('Not Available')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py resolver.py text.py documenter.py __init__.py xdoc.py
ajack 2004/04/05 06:38:01 Modified:python/gump/document forrest.py resolver.py text.py documenter.py __init__.py xdoc.py Log: Updated license header. Revision ChangesPath 1.128 +13 -56gump/python/gump/document/forrest.py Index: forrest.py === RCS file: /home/cvs/gump/python/gump/document/forrest.py,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- forrest.py3 Apr 2004 17:32:18 - 1.127 +++ forrest.py5 Apr 2004 13:38:00 - 1.128 @@ -1,62 +1,19 @@ #!/usr/bin/env python -# $Header$ -# $Revision$f -# $Date$ +# Copyright 2003-2004 The Apache Software Foundation # -# -# -# The Apache Software License, Version 1.1 -# -# Copyright (c) 2003 The Apache Software Foundation. All rights -# reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -#notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -#notice, this list of conditions and the following disclaimer in -#the documentation and/or other materials provided with the -#distribution. -# -# 3. The end-user documentation included with the redistribution, if -#any, must include the following acknowlegement: -# This product includes software developed by the -#Apache Software Foundation (http://www.apache.org/). -#Alternately, this acknowlegement may appear in the software itself, -#if and wherever such third-party acknowlegements normally appear. -# -# 4. The names The Jakarta Project, Alexandria, and Apache Software -#Foundation must not be used to endorse or promote products derived -#from this software without prior written permission. For written -#permission, please contact [EMAIL PROTECTED] -# -# 5. Products derived from this software may not be called Apache -#nor may Apache appear in their names without prior written -#permission of the Apache Group. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# -# This software consists of voluntary contributions made by many -# individuals on behalf of the Apache Software Foundation. For more -# information on the Apache Software Foundation, please see -# http://www.apache.org/. +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + xdoc generation, for forrest 1.20 +13 -57gump/python/gump/document/resolver.py Index: resolver.py === RCS file: /home/cvs/gump/python/gump/document/resolver.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- resolver.py 30 Mar 2004 19:19:34 - 1.19 +++ resolver.py 5 Apr 2004 13:38:00 - 1.20 @@ -1,65 +1,21 @@ #!/usr/bin/env python -# $Header$ -# $Revision$ -# $Date$ +# Copyright 2003-2004 The Apache Software Foundation # -# -# -# The Apache Software License, Version 1.1 -# -# Copyright (c) 2003 The Apache Software Foundation. All rights -# reserved. -# -# Redistribution and use in source and binary
cvs commit: gump/python/gump/document forrest.py text.py
ajack 2004/04/05 09:31:45
Modified:python/gump/document forrest.py text.py
Log:
Documentation tweaks (including annotations on env, and env when --text)
Revision ChangesPath
1.130 +6 -7 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- forrest.py5 Apr 2004 16:03:49 - 1.129
+++ forrest.py5 Apr 2004 16:31:45 - 1.130
@@ -225,7 +225,8 @@
envSection.createParagraph(
The environment that this Gump run was within.)
-#self.documentFileList(document,environment,'Environment-level Files')
+self.documentAnnotations(document,environment)
+#self.documentFileList(document,environment,'Environment-level Files')
self.documentWorkList(document,environment,'Environment-level Work')
document.serialize()
@@ -271,12 +272,10 @@
definitionTable.createEntry('Start Date/Time', workspace.startdatetime)
definitionTable.createEntry('Timezone', workspace.timezone)
- javaproperties=run.getEnvironment().getJavaProperties()
- for name in ['java.vendor', 'java.version', 'os.name', 'os.arch',
'os.version']:
- if name in javaproperties:
-definitionTable.createEntry(name, javaproperties[name])
-
-
+javaproperties=run.getEnvironment().getJavaProperties()
+for name in ['java.vendor', 'java.version', 'os.name', 'os.arch',
'os.version']:
+if name in javaproperties:
+definitionTable.createEntry(name, javaproperties[name])
rssSyndRow=definitionTable.createRow()
rssSyndRow.createData('Syndication')
1.16 +11 -1 gump/python/gump/document/text.py
Index: text.py
===
RCS file: /home/cvs/gump/python/gump/document/text.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- text.py 5 Apr 2004 13:38:00 - 1.15
+++ text.py 5 Apr 2004 16:31:45 - 1.16
@@ -52,6 +52,7 @@
workspace = run.getWorkspace()
gumpSet = run.getGumpSet()
+gumpEnv = run.getGumpEnvironment()
#
#
@@ -65,7 +66,6 @@
#
output=self.output
-
# Pretty sorting...
sortedModuleList=createOrderedList(gumpSet.getModuleSequence())
sortedProjectList=createOrderedList(gumpSet.getProjectSequence())
@@ -76,6 +76,8 @@
output.write(indent + Workspace State : +
workspace.getStateDescription() + \n)
output.write(indent + Workspace Secs : + str(workspace.getElapsedSecs())
+ \n)
+self.documentEnvironment(indent,gumpEnv,debug,verbose)
+
output.write(indent + Modules: + str(len(workspace.getModules())) + \n)
self.documentAnnotations(indent,workspace)
@@ -106,6 +108,14 @@
self.documentProject(indent,project,debug,verbose)
+def documentEnvironment(self, indent, environment, debug, verbose):
+indent += ' '
+output=self.output
+output.write(indent + Gump Environment\n)
+
+self.documentAnnotations(indent,environment)
+self.documentWork(indent,environment)
+
def documentProject(self, indent, project, debug, verbose):
indent += ' '
output=self.output
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
rubys 2004/04/02 18:36:35
Modified:python/gump gumpenv.py
python/gump/document forrest.py
Log:
Add more java and os version information to the output.
Log all Java system properties (if available).
Revision ChangesPath
1.3 +65 -11gump/python/gump/gumpenv.py
Index: gumpenv.py
===
RCS file: /home/cvs/gump/python/gump/gumpenv.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gumpenv.py19 Mar 2004 23:11:46 - 1.2
+++ gumpenv.py3 Apr 2004 02:36:35 - 1.3
@@ -57,6 +57,12 @@
self.noRuper=0
self.noSvn=0
self.noCvs=0
+ self.noJavaHome=0
+ self.noClasspath=0
+ self.noJava=0
+ self.noJavac=0
+ self.noPGrep=0
+ self.javaProperties=0
#
# JAVACMD can override this, see checkEnvironment
@@ -94,19 +100,19 @@
#CLASSPATH
#FORREST_HOME?
-if not self.checkEnvVariable('JAVA_HOME',0):
+if not self.noJavaHome and not self.checkEnvVariable('JAVA_HOME',0):
self.noJavaHome=1
self.addWarning('JAVA_HOME environmental variable not found. Might not
be needed.')
-if not self.checkEnvVariable('CLASSPATH',0):
+if not self.noClasspath and not self.checkEnvVariable('CLASSPATH',0):
self.noClasspath=1
self.addWarning('CLASSPATH environmental variable not found. Might not
be needed.')
-if not self.checkEnvVariable('FORREST_HOME',0):
+if not self.noForrest and not self.checkEnvVariable('FORREST_HOME',0):
self.noForrest=1
self.addWarning('FORREST_HOME environmental variable not found, no xdoc
output.')
-if not self.checkEnvVariable('MAVEN_HOME',0):
+if not self.noMaven and not self.checkEnvVariable('MAVEN_HOME',0):
self.noMaven=1
self.addWarning('MAVEN_HOME environmental variable not found, no maven
builds.')
@@ -117,14 +123,19 @@
#javac (for bootstrap ant beyond)
#cvs
#
-#These ought set a switch..
-#
#forrest (for documentation)
#
self.checkExecutable('env','',0)
-self.checkExecutable(self.javaCommand,'-version',exitOnError,1)
-self.checkExecutable('javac','-help',0)
-self.checkExecutable('java
com.sun.tools.javac.Main','-help',0,0,'check_java_compiler')
+
+ if not self.noJava and not
self.checkExecutable(self.javaCommand,'-version',exitOnError,1):
+ self.noJava=1
+ self.noJavac=1
+
+ if not self.noJavac and not self.checkExecutable('javac','-help',0):
+ self.noJavac=1
+
+ if not self.noJavac and not self.checkExecutable('java
com.sun.tools.javac.Main','-help',0,0,'check_java_compiler'):
+ self.noJavac=1
if not self.noCvs and not self.checkExecutable('cvs','--version',0):
self.noCvs=1
@@ -148,12 +159,51 @@
self.noMaven=1
self.addWarning('maven command not found, no Maven builds')
-if not self.checkExecutable('pgrep','-help',0):
+if not self.noPGrep and not self.checkExecutable('pgrep','-help',0):
self.noPGrep=1
self.addWarning('pgrep command not found, no process clean-ups can
occur')
self.changeState(STATE_SUCCESS)
+def getJavaProperties(self):
+if self.javaProperties: return self.javaProperties
+
+self.checkEnvironment()
+if self.noJavac: return {}
+
+import commands, re
+
+JAVA_SOURCE = dir.tmp + '/sysprop.java'
+
+source=open(JAVA_SOURCE,'w')
+source.write(
+ import java.util.Enumeration;
+ public class sysprop {
+public static void main(String [] args) {
+ Enumeration e=System.getProperties().propertyNames();
+ while (e.hasMoreElements()) {
+String name = (String)e.nextElement();
+System.out.print(name + : );
+System.out.println(System.getProperty(name));
+ }
+}
+ }
+)
+source.close()
+
+os.system('javac ' + JAVA_SOURCE)
+os.unlink(JAVA_SOURCE)
+
+cmd=self.javaCommand + ' -cp ' + dir.tmp + ' sysprop'
+self.javaProperties = \
+ dict(re.findall('(.*?): (.*)', commands.getoutput(cmd)))
+os.unlink(JAVA_SOURCE.replace('.java','.class'))
+
+for (name,value) in self.javaProperties.items():
cvs commit: gump/python/gump/document forrest.py
ajack 2004/03/31 10:37:51 Modified:python/gump/document forrest.py Log: Document stats and xref even if not a full build. No point not too. Revision ChangesPath 1.123 +8 -7 gump/python/gump/document/forrest.py Index: forrest.py === RCS file: /home/cvs/gump/python/gump/document/forrest.py,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- forrest.py31 Mar 2004 17:41:41 - 1.122 +++ forrest.py31 Mar 2004 18:37:51 - 1.123 @@ -123,10 +123,11 @@ # Document... self.documentEnvironment(run,workspace) -self.documentWorkspace(run,workspace,gumpSet) -if gumpSet.isFull(): -self.documentStatistics(run,workspace,gumpSet) -self.documentXRef(run,workspace,gumpSet) +self.documentWorkspace(run,workspace,gumpSet) + +# Document these (even if not a full build) +self.documentStatistics(run,workspace,gumpSet) +self.documentXRef(run,workspace,gumpSet) # # Launch Forrest, if we aren't just leaving xdocs... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
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 ChangesPath
1.120 +60 -45gump/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.py29 Mar 2004 19:34:19 - 1.119
+++ forrest.py29 Mar 2004 21:19:45 - 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)
cvs commit: gump/python/gump/document forrest.py
ajack 2004/03/19 14:06:44
Modified:python/gump/document forrest.py
Log:
Avalon XML descriptor blows the 32Kb limit of a forrest source.
Revision ChangesPath
1.112 +9 -5 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- forrest.py19 Mar 2004 18:19:18 - 1.111
+++ forrest.py19 Mar 2004 22:06:43 - 1.112
@@ -224,7 +224,7 @@
# let's not shoot so high.
#
success=1
-if 1 or forrestResult.state==CMD_STATE_SUCCESS:
+if 1 or (forrestResult.state==CMD_STATE_SUCCESS):
try:
#
# Sync over public pages...
@@ -1588,7 +1588,11 @@
except Exception, details:
stream.write('Failed to XML serialize the data. ' + str(details))
stream.seek(0)
-xmlSection.createSource(stream.read())
+xmldata=stream.read()
+if len(xmldata) 32000:
+xmlSection.createSource(stream.read())
+else:
+xmlSection.createParagraph('XML Data too large to display.')
stream.close()
def documentSummary(self,xdocNode,summary,description='Project Summary'):
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
ajack 2004/03/09 12:31:02 Modified:python/gump/document forrest.py Log: Reduce verbosity... Revision ChangesPath 1.98 +6 -5 gump/python/gump/document/forrest.py Index: forrest.py === RCS file: /home/cvs/gump/python/gump/document/forrest.py,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- forrest.py9 Mar 2004 19:57:06 - 1.97 +++ forrest.py9 Mar 2004 20:31:02 - 1.98 @@ -1217,10 +1217,11 @@ depees += self.documentDependenciesList(dependencySection, Project Dependees, \ project.getDirectDependees(), 1, project) -depens += self.documentDependenciesList(dependencySection, Full Project Dependencies, \ +if project.isVerboseOrDebug(): +self.documentDependenciesList(dependencySection, Full Project Dependencies,\ project.getFullDependencies(), 0, project) -depees += self.documentDependenciesList(dependencySection, Full Project Dependees, \ +self.documentDependenciesList(dependencySection, Full Project Dependees, \ project.getFullDependees(), 1, project) deps = depees + depens - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document forrest.py
ajack 2004/03/07 21:40:50
Modified:python/gump/results resulter.py
python/gump/document forrest.py
Log:
Count of Dependees not Dependencies.
Revision ChangesPath
1.14 +1 -1 gump/python/gump/results/resulter.py
Index: resulter.py
===
RCS file: /home/cvs/gump/python/gump/results/resulter.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- resulter.py 4 Mar 2004 17:26:09 - 1.13
+++ resulter.py 8 Mar 2004 05:40:49 - 1.14
@@ -138,7 +138,7 @@
+ str(details), exc_info=1)
if results:
-self.workspace.addInfo('Loaded results for server [' +
str(server) + ']')
+log.debug('Loaded results for server [' + str(server) + ']')
self.serverResults[server]=results
self.serversLoaded=1
1.94 +4 -4 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- forrest.py7 Mar 2004 22:22:35 - 1.93
+++ forrest.py8 Mar 2004 05:40:50 - 1.94
@@ -533,7 +533,7 @@
projectRow.createData(affected)
-projectRow.createData( project.getFullDependencyCount())
+projectRow.createData( project.getFullDependeeCount())
projectRow.createData(seq)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
