ajack 2004/04/30 11:09:12
Modified: . gumpy.py
python/gump/document/text documenter.py
python/gump/core config.py gumpenv.py
python/gump/document/forrest documenter.py
Log:
Some documentation tweaks.
Revision Changes Path
1.27 +9 -0 gump/gumpy.py
Index: gumpy.py
===================================================================
RCS file: /home/cvs/gump/gumpy.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gumpy.py 29 Apr 2004 17:00:42 -0000 1.26
+++ gumpy.py 30 Apr 2004 18:09:12 -0000 1.27
@@ -40,6 +40,8 @@
LINE=' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GUMP'
+GUMPY_VERSION='2.0.2-alpha-0001'
+
def ignoreHangup(signum):
pass
@@ -258,6 +260,7 @@
log.write('- GUMP run on host : ' + hostname + '\n')
log.write('- GUMP run @ : ' + time.strftime('%d %b %y %H:%M:%S',
time.gmtime()) + '\n')
log.write('- GUMP run by Python : ' + `sys.version` + '\n')
+ log.write('- GUMP run by Gumpy : ' + GUMPY_VERSION + '\n')
log.write('- GUMP run on OS : ' + `os.name` + '\n')
log.write('- GUMP run in env : \n')
@@ -456,6 +459,12 @@
mailData += tailData
except:
pass
+
+ # Tack a version on there
+ maildata += '--\n'
+ maildata += 'Gumpy Version: '
+ maildata += GUMPY_VERSION
+ maildata += '\n'
sendEmail(mailto,mailfrom,logTitle,mailData,mailserver,mailport)
1.4 +3 -1 gump/python/gump/document/text/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/text/documenter.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- documenter.py 14 Apr 2004 23:06:57 -0000 1.3
+++ documenter.py 30 Apr 2004 18:09:12 -0000 1.4
@@ -171,6 +171,9 @@
output.write(indent+"Work Cmd : " +
work.command.formatCommandLine() + "\n")
if work.command.cwd:
output.write(indent+"Work Cwd : " + work.command.cwd + "\n")
+ if work.command.env:
+ for envKey in work.command.env.keys():
+ output.write(indent+"Work Env : " + envKey + ' :
'+self.env[envKey])
if work.result.signal:
output.write(indent+"Work Signal : " + `work.result.signal` +
"\n")
output.write(indent+"Work Exit : " + str(work.result.exit_code) +
"\n")
@@ -178,7 +181,6 @@
if realtime and work.result.hasOutput():
catFile(output,work.result.getOutput(),work.result.getOutput())
-
def documentAnnotations(self, indent, annotatable):
indent += ' '
1.3 +1 -1 gump/python/gump/core/config.py
Index: config.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/config.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.py 24 Apr 2004 15:25:18 -0000 1.2
+++ config.py 30 Apr 2004 18:09:12 -0000 1.3
@@ -86,7 +86,7 @@
class setting:
"""Configuration of hardcoded settings"""
- version="2.0.2-alpha-0003"
+ version='2.0.2-alpha-0004'
ws_version="0.4"
ws_minimum_version="0.3"
1.5 +1 -1 gump/python/gump/core/gumpenv.py
Index: gumpenv.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumpenv.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gumpenv.py 28 Apr 2004 13:16:34 -0000 1.4
+++ gumpenv.py 30 Apr 2004 18:09:12 -0000 1.5
@@ -224,7 +224,7 @@
os.unlink(JAVA_SOURCE.replace('.java','.class'))
for (name,value) in self.javaProperties.items():
- log.info(name + " => " + value)
+ log.debug("Java Property: " + name + " => " + value)
return self.javaProperties
1.21 +11 -13 gump/python/gump/document/forrest/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest/documenter.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- documenter.py 29 Apr 2004 17:20:23 -0000 1.20
+++ documenter.py 30 Apr 2004 18:09:12 -0000 1.21
@@ -409,19 +409,20 @@
syndRow.createData().createLink('workspace.html','XML')
if not gumpSet.isFull():
- warning=definitionSection.createWarning()
+ notice=definitionSection.createWarning()
- warning.createText("""This output does not represent the a complete
workspace,
- but a partial one.
+ notice.createText("""This output does not represent the complete
workspace,
+ but part of it.
Only projects, and their dependents, matching this regular expression
""")
- warning.createStrong(gumpSet.projectexpression)
- warning.createBreak()
- warning.createBreak()
- warning.createText('Requested Projects:')
- warning.createBreak()
+ notice.createStrong(gumpSet.projectexpression)
+ notice.createBreak()
+ notice.createBreak()
+ notice.createStrong('Requested Projects: ')
+ notice.createBreak()
+ notice.createBreak()
for project in gumpSet.projects:
- warning.createText(project.name)
- warning.createText(' ')
+ notice.createText(project.name)
+ notice.createText(' ')
self.documentSummary(document,workspace.getProjectSummary())
@@ -2149,9 +2150,6 @@
o=open(output, 'r')
line=o.readline()
while line:
-
- line=wrapLine(line,100,'...\n',' ')
-
length = len(line)
size += length
# Crude to 'ensure' that escaped
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
