:) Thanks :)
--- [EMAIL PROTECTED] wrote:
> ajack 2003/12/03 10:36:13
>
> Modified: python/gump engine.py config.py
> python/gump/output statsdb.py xref.py
> python/gump/utils launcher.py work.py tools.py __init__.py
> note.py
> project directory-naming.xml
> python/gump/model project.py object.py
> python/gump/document text.py xdoc.py forrest.py
> repository apache-incubator-svn.xml
> Log:
> 1) Dates/Times
> 2) Re-worked documentation to be clearer for projects/modules
> [grouped the clutter, one day will only add thing if debug or verbose]
> 3) Added more stuff to try to figure out <junitreport
> [dims, be patient w/ me, I'll get there. :-) ]
> 4) Write a big red <warning> if there as "nasties" warn/error in annotatons.
>
> Revision Changes Path
> 1.35 +7 -1 jakarta-gump/python/gump/engine.py
>
> Index: engine.py
> ===================================================================
> RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -r1.34 -r1.35
> --- engine.py 3 Dec 2003 04:29:05 -0000 1.34
> +++ engine.py 3 Dec 2003 18:36:13 -0000 1.35
> @@ -472,6 +472,7 @@
> #
> dirs=[]
> dircnt=0
> + listed=0
> for jar in project.getJars():
> jarPath=os.path.abspath(jar.getPath())
> dir=os.path.dirname(jarPath)
> @@ -480,8 +481,12 @@
> listDirectoryAsWork(project,dir,\
>
> 'list_'+project.getName()+'_dir'+str(dircnt)+'_'+os.path.basename(dir))
> dirs.append(dir)
> + listed += 1
> else:
> project.addWarning("No such directory (where output
> is expect) :
> " + dir)
> +
> + if listed:
> + project.addError("See Directory Listing Work for Missing
> Outputs")
> else:
> project.changeState(STATE_SUCCESS)
>
> @@ -489,7 +494,8 @@
> # Display report output...
> #
> for report in project.getReports():
> - reportDir=report.getResolvedPath()
> + reportDir=report.getResolvedPath()
> + project.addInfo('Reports in: ' + reportDir)
> catDirectoryContentsAsWork(project,reportDir)
>
>
>
>
>
> 1.8 +2 -1 jakarta-gump/python/gump/config.py
>
> Index: config.py
> ===================================================================
> RCS file: /home/cvs/jakarta-gump/python/gump/config.py,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- config.py 26 Nov 2003 16:08:39 -0000 1.7
> +++ config.py 3 Dec 2003 18:36:13 -0000 1.8
> @@ -126,7 +126,8 @@
> # :TODO: Add "minimum version" checks...
> ws_version="0.4"
>
> - datetimeformat="%a, %d %b %Y %H:%M:%S (%Z)"
> + datetimeformat='%a, %d %b %Y %H:%M:%S (%Z)'
> + timeformat='%H:%M:%S (%Z)'
>
> timeout=60*60 # 60 minutes (in seconds)
>
>
>
>
> 1.3 +2 -2 jakarta-gump/python/gump/output/statsdb.py
>
> Index: statsdb.py
> ===================================================================
> RCS file: /home/cvs/jakarta-gump/python/gump/output/statsdb.py,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- statsdb.py 20 Nov 2003 21:30:06 -0000 1.2
> +++ statsdb.py 3 Dec 2003 18:36:13 -0000 1.3
> @@ -355,8 +355,8 @@
> round(self.projectsInWorkspace/self.modulesInWorkspace,2)
>
> def sortByElapsed(module1,module2):
> - elapsed1=module1.elapsedSecs()
> - elapsed2=module2.elapsedSecs()
> + elapsed1=module1.getElapsedSecs()
> + elapsed2=module2.getElapsedSecs()
> c = 0
> if elapsed1 > elapsed2: c = -1
> if elapsed1 < elapsed2: c = 1
>
>
>
> 1.3 +4 -3 jakarta-gump/python/gump/output/xref.py
>
> Index: xref.py
> ===================================================================
> RCS file: /home/cvs/jakarta-gump/python/gump/output/xref.py,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- xref.py 2 Dec 2003 00:45:40 -0000 1.2
> +++ xref.py 3 Dec 2003 18:36:13 -0000 1.3
> @@ -98,6 +98,7 @@
> def mapPackages(self):
> for module in self.workspace.getModules():
> for project in module.getProjects():
> + if project.isPackaged(): continue
> for package in project.xml.package:
> if package:
> packageName=str(package)
> @@ -106,12 +107,12 @@
> self.packageToModule[packageName]=[]
>
> # Store
> - self.packageToModule[packageName].append(module)
> + if not module in self.packageToModule[packageName]:
> + self.packageToModule[packageName].append(module)
>
> def getRepositoryToModuleMap(self):
> return self.repositoryToModule
> -
> -
> +
> def getPackageToModuleMap(self):
> return self.packageToModule
>
>
>
>
> 1.3 +20 -17 jakarta-gump/python/gump/utils/launcher.py
>
> Index: launcher.py
> ===================================================================
> RCS file: /home/cvs/jakarta-gump/python/gump/utils/launcher.py,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- launcher.py 20 Nov 2003 00:57:40 -0000 1.2
> +++ launcher.py 3 Dec 2003 18:36:13 -0000 1.3
> @@ -240,17 +240,20 @@
> self.cmd=cmd
> self.state=CMD_STATE_NOT_YET_RUN
> self.output=None
> - self.elapsed=0
> self.signal=0
> self.exit_code=-1
>
> + # To calculate elapsed
> + self.start_time=None
> + self.end_time=None
> +
> def overview(self,indent):
> overview + indent+"State: " + states[self.state]
> overview += self.cmd.overview(indent)
> if self.output:
> overview += indent+"Output: " + self.output
> - if self.elapsed:
> - overview += indent+"Elapsed: " + str(self.elapsed)
> + if self.hasTimes():
> + overview += indent+"Elapsed: " + str(self.getElapsedTime())
> if self.signal:
> overview += indent+"Termination Signal: " + str(self.signal)
> if self.exit_code:
> @@ -274,21 +277,22 @@
> def getOutput(self):
> return self.output
>
> + def hasTimes(self):
> + if self.start_time and self.end_time: return 1
> + return 0
> +
> + def getStartTimeSecs(self):
> + return self.start_time
> +
> + def getEndTimeSecs(self):
> + return self.end_time
> +
> + def getElapsedSecs(self):
> + return int(round(self.end_time-self.start_time,0))
> +
> def dump(self,indent):
>
=== message truncated ===
=====
Davanum Srinivas - http://webservices.apache.org/~dims/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
