ajack 2004/06/16 11:19:26
Modified: python/gump/document/xdocs Tag: CleanUp documenter.py
. Tag: CleanUp gumpy.sh
Log:
Retry on those last two.
Revision Changes Path
No revision
No revision
1.9.2.7 +10 -8 gump/python/gump/document/xdocs/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -r1.9.2.6 -r1.9.2.7
--- documenter.py 16 Jun 2004 18:15:36 -0000 1.9.2.6
+++ documenter.py 16 Jun 2004 18:19:26 -0000 1.9.2.7
@@ -2548,16 +2548,17 @@
#
if stats.successes+stats.failures+stats.prereqs > 0:
svgFile=self.resolver.getFile(base,name+'_FOG','.svg')
- pngFile=os.path.basename(svgFile).replace('.svg','.png')
+ svgBasename=os.path.basename(svgFile)
+ pngBasename=svgBasename.replace('.svg','.png')
from gump.svg.scale import ScaleDiagram
diagram=ScaleDiagram([stats.successes,stats.prereqs,stats.failures])
diagram.generateDiagram().serializeToFile(svgFile)
- file=pngFile
+ fileBasename=pngBaseName
if self.config.isXhtml():
- file=svgFile
+ fileBasename=svgBasename
- return (file, 'FOG Factor')
+ return (fileBasename, 'FOG Factor')
return (None, None)
@@ -2567,17 +2568,18 @@
if not base: base=project
svgFile=self.resolver.getFile(base,name+'_depend','.svg')
- pngFile=os.path.basename(svgFile).replace('.svg','.png')
+ svgBasename=os.path.basename(svgFile)
+ pngBasename=svgBasename.replace('.svg','.png')
from gump.svg.depdiag import DependencyDiagram
diagram=DependencyDiagram(project)
diagram.compute()
diagram.generateDiagram().serializeToFile(svgFile)
- file=pngFile
+ fileBasename=pngBasename
if self.config.isXhtml():
- file=svgFile
+ fileBasename=svgBasename
- return (file, 'Dependency Diagram')
+ return (fileBasename, 'Dependency Diagram')
#####################################################################
#
No revision
No revision
1.34.4.2 +1 -1 gump/gumpy.sh
Index: gumpy.sh
===================================================================
RCS file: /home/cvs/gump/gumpy.sh,v
retrieving revision 1.34.4.1
retrieving revision 1.34.4.2
diff -u -r1.34.4.1 -r1.34.4.2
--- gumpy.sh 16 Jun 2004 18:13:55 -0000 1.34.4.1
+++ gumpy.sh 16 Jun 2004 18:19:26 -0000 1.34.4.2
@@ -45,7 +45,7 @@
#
# Perform the run (passing on any arguments)
#
-GUMP_PYTHON gumpy.py $*
+$GUMP_PYTHON gumpy.py $*
#
# Ensure nothing we started (directly) is left running after we end...
@@ -56,6 +56,6 @@
fi
# $Log$
-# Revision 1.34.4.1 2004/06/16 18:13:55 ajack
-# Try to detect/use 'python2.3' (e.g in /usr/bin) before 'python'.
+# Revision 1.34.4.2 2004/06/16 18:19:26 ajack
+# Retry on those last two.
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
