cvs commit: gump/python/gump engine.py
ajack 2004/04/10 16:09:29
Modified:python/gump engine.py
Log:
Tinkering towards:
http://issues.apache.org/jira/browse/GUMP-49
Revision ChangesPath
1.99 +10 -1 gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- engine.py 8 Apr 2004 15:00:57 - 1.98
+++ engine.py 10 Apr 2004 23:09:29 - 1.99
@@ -736,6 +736,12 @@
dirs.append(dir)
+def setEndTime(self,run):
+
+logResourceUtilization('Set End Time')
+# :TODO: Move this to run
+run.getWorkspace().setEndTime()
+
**
@@ -1026,9 +1032,12 @@
elif 'gatherResults'==name:
# Gather results.xml from other servers
task=GumpTask(name,['preprocess'])
+elif 'setEndTime'==name:
+# Gather results.xml from other servers
+task=GumpTask(name,['preprocess'])
elif 'generateResults'==name:
# Generate the results.xml for this server/workspace
-
task=GumpTask(name,['preprocess','loadStatistics','prepareDocumentation'])
+
task=GumpTask(name,['preprocess','loadStatistics','setEndTime','prepareDocumentation'])
else:
raise RuntimeError, 'Unknown task name ['+name+']'
return task
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/31 09:41:42
Modified:python/gump/model project.py propagation.py depend.py
python/gump/document forrest.py
template/forrest/src/documentation/content/xdocs site.xml
python/gump/output xref.py
python/gump engine.py
Log:
1) Make annotations less verbose.
2) Show 'ids' for project jars
3) Fixed 'type' on maven.properties file
4) Attempted to fix 'affected' to not count repeats
Revision ChangesPath
1.70 +5 -11 gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- project.py28 Mar 2004 18:58:05 - 1.69
+++ project.py31 Mar 2004 17:41:41 - 1.70
@@ -272,17 +272,11 @@
if self.affected: return self.affected
# Look through all dependees
-for dependee in self.getFullDependees():
-project=dependee.getOwnerProject()
-
+for project in self.getFullDependeeProjectList():
cause=project.getCause()
-#
# Something caused this some grief
-#
if cause:
-#
-# The something was this module or one of its projects
-#
+# The something was this project
if cause == self:
self.affected += 1
@@ -300,9 +294,9 @@
dependeeProject=dependee.getOwnerProject()
if dependee.isOptional():
-dependeeProject.addWarning(Optional dependency + self.name +
+ message)
+dependeeProject.addInfo(Optional dependency + self.name + +
message)
else:
-dependee.addError(Dependency + self.name + + message)
+dependee.addInfo(Dependency + self.name + + message)
dependeeProject.changeState(STATE_PREREQ_FAILED,reason,cause)
#
# We have a potential clash between the project package attribute and
@@ -410,7 +404,7 @@
if 1 == self.getJarCount():
jar=self.getJarAt(0)
if not jar.hasId():
-self.addInfo('Sole jar [' + jar.getPath() + '] identifier set
to project name')
+self.addInfo('Sole jar [' + os.path.basename(jar.getPath()) +
'] identifier set to project name')
jar.setId(self.getName())
else:
#
1.2 +1 -1 gump/python/gump/model/propagation.py
Index: propagation.py
===
RCS file: /home/cvs/gump/python/gump/model/propagation.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- propagation.py16 Mar 2004 19:50:15 - 1.1
+++ propagation.py31 Mar 2004 17:41:41 - 1.2
@@ -58,7 +58,7 @@
message = lower(stateDescription(state))
if not REASON_UNSET == reason:
message += with reason +
lower(reasonDescription(reason))
-self.addError(capitalize(message))
+self.addInfo(capitalize(message))
# Send on the changes...
self.propagateErrorStateChange(state,reason,cause,message)
1.25 +11 -1 gump/python/gump/model/depend.py
Index: depend.py
===
RCS file: /home/cvs/gump/python/gump/model/depend.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- depend.py 28 Mar 2004 21:09:26 - 1.24
+++ depend.py 31 Mar 2004 17:41:41 - 1.25
@@ -228,6 +228,9 @@
def getDepends(self):
return self.depends
+def getUniqueProjectDependList(self):
+return self.projectMap.keys()
+
def getUniqueProjectDependCount(self):
return len(self.projectMap)
@@ -300,6 +303,11 @@
def getFullDependencyCount(self):
self.getFullDependencies()
return self.fullDependencies.getUniqueProjectDependCount()
+
+def getFullDependencyProjectList(self):
+self.getFullDependencies()
+return self.fullDependencies.getUniqueProjectDependList()
+
#
# Depth
@@ -356,7 +364,6 @@
def getDirectDependees(self):
return self.directDependees.getDepends()
-
def getFullDependees(self):
if self.fullDependees: return self.fullDependees.getDepends()
@@
cvs commit: gump/python/gump engine.py
ajack 2004/03/16 15:19:04 Modified:python/gump engine.py Log: Allow a check task... Revision ChangesPath 1.89 +3 -1 gump/python/gump/engine.py Index: engine.py === RCS file: /home/cvs/gump/python/gump/engine.py,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- engine.py 16 Mar 2004 21:04:46 - 1.88 +++ engine.py 16 Mar 2004 23:19:04 - 1.89 @@ -157,7 +157,6 @@ workspace.writeXMLToFile(default.merge) workspace.setMergeFile(default.merge) - ** @@ -983,6 +982,9 @@ task=GumpTask(name,['preprocess','loadStatistics']) elif 'build'==name: # Build using Ant|Maven|... +task=GumpTask(name,['preprocess','loadStatistics']) +elif 'check'==name: +# Check metadata task=GumpTask(name,['preprocess','loadStatistics']) elif 'prepareDocumentation'==name: # Prepare documentation (e.g. create forest templates) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/16 21:00:15
Modified:python/gump engine.py
Log:
Check for pre-existence of directories in mkdir, and warn (don't fail)
Revision ChangesPath
1.91 +5 -2 gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- engine.py 16 Mar 2004 23:56:41 - 1.90
+++ engine.py 17 Mar 2004 05:00:15 - 1.91
@@ -473,8 +473,11 @@
dirToMake=os.path.abspath(os.path.join(basedir,mkdir.dir))
try:
-os.makedirs(dirToMake)
-project.addInfo('Made directory ['+dirToMake+']')
+if not os.path.exists(dirToMake):
+os.makedirs(dirToMake)
+project.addInfo('Made directory ['+dirToMake+']')
+else:
+project.addInfo('MkDir attempt on pre-existing directory
['+dirToMake+']')
except:
project.addError('Failed to make directory ['+dirToMake+']')
raise
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py build.py
ajack 2004/03/12 06:21:00
Modified:python/gump engine.py build.py
Log:
Allow build to run standalone w/o loading stats
Revision ChangesPath
1.82 +41 -11gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- engine.py 11 Mar 2004 16:13:50 - 1.81
+++ engine.py 12 Mar 2004 14:21:00 - 1.82
@@ -391,6 +391,33 @@
**
+def build(self,run,all=1):
+
+#
+# Load the statistics (so we can use them during
+# other operations).
+#
+#logResourceUtilization('Before load statistics')
+#self.loadStatistics(run)
+
+#
+# Run the build commands
+#
+logResourceUtilization('Before build')
+if all:
+self.buildAll(run)
+else:
+self.buildProjects(run)
+
+# Return an exit code based off success
+# :TODO: Move onto run
+if run.getWorkspace().isSuccess():
+result = SUCCESS
+else:
+result = FAILED
+
+return result
+
def buildAll(self,run):
Build a GumpRun's Full Project Stack
@@ -426,28 +453,31 @@
# Extract stats (in case we want to do conditional processing)
-stats=project.getStats()
+stats=None
+if project.hasStats():
+stats=project.getStats()
if project.isPackaged():
-self.performPackageProcessing( run, project, stats)
+self.performPackageProcessing(run, project, stats)
continue
# Do this even if not ok
-self.performPreBuild( run, project, stats )
+self.performPreBuild(run, project, stats)
wasBuilt=0
if project.okToPerformWork():
log.debug(' -- Building: [' + `projectNo` + '] ' +
project.getName())
# Turn on --verbose or --debug if failing ...
-if (not STATE_SUCCESS == stats.currentState) and \
-not project.isVerboseOrDebug():
-if stats.sequenceInState 5:
-project.addInfo('Enable debug output, due to error.')
-project.setDebug(1)
-else:
-project.addInfo('Enable verbose output, due to error.')
-project.setVerbose(1)
+if stats:
+if (not STATE_SUCCESS == stats.currentState) and \
+not project.isVerboseOrDebug():
+if stats.sequenceInState 5:
+project.addInfo('Enable debug output, due to error.')
+project.setDebug(1)
+else:
+project.addInfo('Enable verbose output, due to
error.')
+project.setVerbose(1)
#
# Get the appropriate build command...
1.42 +2 -5 gump/python/gump/build.py
Index: build.py
===
RCS file: /home/cvs/gump/python/gump/build.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.py 8 Mar 2004 22:28:08 - 1.41
+++ build.py 12 Mar 2004 14:21:00 - 1.42
@@ -65,11 +65,8 @@
#
#Perform this integration run...
#
-if '*' in args:
-result = engine.buildAll(run)
-else:
-result = engine.buildProjects(run)
-
+result = engine.build(run, '*' in args)
+
#
log.info('Gump Build complete. Exit code:' + str(result))
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/12 08:10:39
Modified:python/gump/document forrest.py xdoc.py
python/gump/model stats.py
template/forrest/src/documentation/content/xdocs site.xml
python/gump engine.py
Log:
1) Allow 'TAB' not to be mapped to underscore
2) Create _fixes pages showing recent changes to success (with description)
3) Added description paragraph to _todos (the opposite of 2).
Revision ChangesPath
1.102 +141 -8gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- forrest.py12 Mar 2004 14:47:48 - 1.101
+++ forrest.py12 Mar 2004 16:10:39 - 1.102
@@ -500,6 +500,9 @@
totalAffected=0
projectsSection=document.createSection('Projects with issues...')
+projectsSection.createParagraph(These are the project that need 'fixing'.
+This page helps Gumpmeisters (and others) locate the main areas to focus attention.
+The count of affected indicates relative importance of fixing this project.)
projectsTable=projectsSection.createTable(['Name','Affected',\
'Dependees', \
'Duration\nin state','Project State'])
@@ -543,6 +546,66 @@
'Total Affected Projects: ' + str(totalAffected))
document.serialize()
+
+#
+# --
+#
+# project_fixes.xml -- Projects w/ fixes in build order
+#
+document=XDocDocument('Project Fixes', \
+self.resolver.getFile(workspace,'project_fixes'))
+self.documentSummary(document, workspace.getProjectSummary())
+
+totalAffected=0
+
+projectsSection=document.createSection('Projects with fixes...')
+projectsSection.createParagraph(These are the projects that were 'fixed'
(state changed to success) within %s runs.
+This page helps Gumpmeisters (and others) observe community progress.
+ % INSIGNIFICANT_DURATION)
+
+projectsTable=projectsSection.createTable(['Name','Affected',\
+'Dependees', \
+'Duration\nin state','Project State'])
+pcount=0
+for project in sortedProjectList:
+if not gumpSet.inProjectSequence(project): continue
+
+if not project.getState()==STATE_SUCCESS or \
+not project.getStats().sequenceInState INSIGNIFICANT_DURATION:
+continue
+
+pcount+=1
+
+#
+# Determine the number of projects this module (or it's projects)
+# cause not to be run.
+#
+affected=project.determineAffected()
+totalAffected += affected
+
+# How long been like this
+seq=stats=project.getStats().sequenceInState
+
+projectRow=projectsTable.createRow()
+projectRow.createComment(project.getName())
+
+self.insertLink(project,workspace,projectRow.createData())
+
+projectRow.createData(affected)
+
+projectRow.createData( project.getFullDependeeCount())
+
+projectRow.createData(seq)
+
+self.insertStateIcon(project,workspace,projectRow.createData())
+
+if not pcount:
+projectsTable.createLine('None')
+else:
+projectsSection.createParagraph(
+'Total Affected Projects: ' + str(totalAffected))
+
+document.serialize()
#
# --
@@ -553,7 +616,10 @@
self.resolver.getFile(workspace,'module_todos'),)
self.documentSummary(document, workspace.getProjectSummary())
-modulesSection=document.createSection('Modules with TODOs')
+modulesSection=document.createSection('Modules with TODOs')
+modulesSection.createParagraph(These are the modules that need 'fixing',
or contained projects that need fixing.
+This page helps Gumpmeisters (and others) locate the main areas to focus attention.
+The count of affected indicates relative importance of fixing this module.)
cvs commit: gump/python/gump engine.py
ajack 2004/03/09 13:13:18
Modified:python/gump/model workspace.py
python/gump engine.py
Log:
Removed last trace of rsync...
Revision ChangesPath
1.32 +3 -9 gump/python/gump/model/workspace.py
Index: workspace.py
===
RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- workspace.py 1 Mar 2004 18:58:00 - 1.31
+++ workspace.py 9 Mar 2004 21:13:18 - 1.32
@@ -125,7 +125,6 @@
#
# Set to true if not found, see checkEnvironment
#
- self.noRSync=0
self.noForrest=0
self.noMaven=0
self.noRuper=0
@@ -634,7 +633,6 @@
#
#These ought set a switch..
#
-#rsync or cp
#forrest (for documentation)
#
self.checkExecutable('env','',0)
@@ -663,10 +661,6 @@
not self.checkExecutable('maven','--version',0,0,'check_maven'):
self.noMaven=1
self.addWarning('maven command not found, no Maven builds')
-
-if not self.checkExecutable('rsync','-help',0):
-self.noRSync=1
-self.addWarning('rsync command not found, so attempting recursive
copy cp -R')
if not self.checkExecutable('pgrep','-help',0):
self.noPGrep=1
1.79 +1 -2 gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- engine.py 9 Mar 2004 19:57:06 - 1.78
+++ engine.py 9 Mar 2004 21:13:18 - 1.79
@@ -356,8 +356,7 @@
module.setUpdated(cmdResult.hasOutput())
def syncWorkDirs( self, run ):
-copy the raw module (project) materials from source to work dir
- (hopefully using rsync, cp is fallback)
+copy the raw module (project) materials from source to work dir
workspace = run.getWorkspace()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/09 15:20:33
Modified:python/gump/document resolver.py
python/gump engine.py
Log:
Try again (hope I get it this time, I'm out of time today...)
Revision ChangesPath
1.16 +4 -4 gump/python/gump/document/resolver.py
Index: resolver.py
===
RCS file: /home/cvs/gump/python/gump/document/resolver.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- resolver.py 28 Feb 2004 00:08:49 - 1.15
+++ resolver.py 9 Mar 2004 23:20:32 - 1.16
@@ -346,7 +346,7 @@
if not root: root=self.rootDir
if not os.path.exists(root):
log.debug('Make directory : [' + root + ']')
-os.mkdir(root)
+os.makedirs(root)
for p in path:
root=os.path.join(root,p)
if not os.path.exists(root):
1.80 +4 -3 gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- engine.py 9 Mar 2004 21:13:18 - 1.79
+++ engine.py 9 Mar 2004 23:20:32 - 1.80
@@ -370,9 +370,10 @@
if module.okToPerformWork():
-sourcedir =
os.path.abspath(os.path.join(workspace.getCvsDirectory(), \
-module.name)) # todo allow override
-destdir = os.path.abspath(workspace.getBaseDirectory())
+sourcedir = os.path.abspath( \
+os.path.join(workspace.getCvsDirectory(), \
+module.name)) # todo allow override
+destdir = module.getSourceDirectory()
# Perform the sync...
try:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/07 14:22:36
Modified:python/gump/model project.py object.py
python/gump/document forrest.py
python/gump/utils tools.py file.py
python/gump engine.py
Log:
Minor tweaks...
Revision ChangesPath
1.61 +15 -11gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- project.py5 Mar 2004 23:42:22 - 1.60
+++ project.py7 Mar 2004 22:22:35 - 1.61
@@ -283,7 +283,7 @@
return self.getModule().getMetadataViewUrl()
def getViewUrl(self):
-# :TODO: if a basedir the offset?
+# :TODO: if a basedir then offset?
return self.getModule().getViewUrl()
def addJar(self,jar):
@@ -855,8 +855,10 @@
#
# Allow ant-level debugging...
#
-if debug: cmd.addParameter('-debug')
-if verbose: cmd.addParameter('-verbose')
+if self.getWorkspace().isDebug() or self.isDebug() or debug:
+cmd.addParameter('-debug')
+if self.getWorkspace().isVerbose() or self.isVerbose() or verbose:
+cmd.addParameter('-verbose')
#
#This sets the *defaults*, a workspace could override them.
@@ -934,8 +936,10 @@
#
# Allow maven-level debugging...
#
-if debug: cmd.addParameter('--debug')
-if verbose: cmd.addParameter('--exception')
+if self.getWorkspace().isDebug() or self.isDebug() or debug:
+cmd.addParameter('--debug')
+if self.getWorkspace().isVerbose() or self.isVerbose() or verbose:
+cmd.addParameter('--exception')
#
# Suppress downloads
@@ -994,11 +998,11 @@
cmd.addPrefixedParameter('-X','bootclasspath/p',bootclasspath,':')
#
-# Allow ant-level debugging...
+# Allow script-level debugging...
#
-if self.getWorkspace().isDebug() or debug:
+if self.getWorkspace().isDebug() or self.isDebug() or debug:
cmd.addParameter('-debug')
-if self.getWorkspace().isVerbose() or verbose:
+if self.getWorkspace().isVerbose() or self.isVerbose() or verbose:
cmd.addParameter('-verbose')
return cmd
1.20 +14 -5 gump/python/gump/model/object.py
Index: object.py
===
RCS file: /home/cvs/gump/python/gump/model/object.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- object.py 1 Mar 2004 18:58:00 - 1.19
+++ object.py 7 Mar 2004 22:22:35 - 1.20
@@ -168,6 +168,9 @@
# The XML model
self.xml=xml
+ self.debug=None
+ self.verbose=None
+
self.completionPerformed=0
def isComplete(self):
@@ -176,11 +179,17 @@
def setComplete(self,complete):
self.completionPerformed=complete
+def setDebug(self,debug):
+self.debug=debug
+
def isDebug(self):
-return self.xml.debug
+return self.debug or self.xml.debug
+def setVerbose(self,verbose):
+self.verbose=verbose
+
def isVerbose(self):
-return self.xml.verbose
+return self.verbose or self.xml.verbose
def dump(self, indent=0, output=sys.stdout):
Display the contents of this object
1.93 +8 -5 gump/python/gump/document/forrest.py
Index: forrest.py
===
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- forrest.py5 Mar 2004 23:42:22 - 1.92
+++ forrest.py7 Mar 2004 22:22:35 - 1.93
@@ -504,7 +504,8 @@
projectsSection=document.createSection('Projects with issues...')
projectsTable=projectsSection.createTable(['Name','Affected',\
-'Duration\nin state','Project State','Elapsed'])
+'Dependencies', \
+'Duration\nin state','Project State'])
pcount=0
for project in sortedProjectList:
if not gumpSet.inSequence(project): continue
@@ -531,10 +532,12 @@
self.insertLink(project,workspace,projectRow.createData())
cvs commit: gump/python/gump engine.py
ajack 2004/03/07 16:27:50
Modified:python/gump engine.py
Log:
Set stats before trying ot use it...
Revision ChangesPath
1.75 +4 -3 gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- engine.py 7 Mar 2004 22:22:35 - 1.74
+++ engine.py 8 Mar 2004 00:27:50 - 1.75
@@ -419,12 +419,13 @@
log.debug(' -- Project: #[' + `projectNo` + '] of [' +
`projectCount` + '] : ' + project.getName())
-if project.isPackaged():
-self.performPackageProcessing( run, project, stats)
-continue
# Extract stats (in case we want to do conditional processing)
stats=project.getStats()
+
+if project.isPackaged():
+self.performPackageProcessing( run, project, stats)
+continue
# Do this even if not ok
self.performPreBuild( run, project, stats )
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/03 12:32:14
Modified:python/gump engine.py
Log:
1) More formatting for 'results on other servers'.
2) Exclude gumpy.lock and gumpy.log
3) Tweaks to gumpy.py (i.e. add --check)
Revision ChangesPath
1.72 +10 -5 gump/python/gump/engine.py
Index: engine.py
===
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- engine.py 3 Mar 2004 01:02:25 - 1.71
+++ engine.py 3 Mar 2004 20:32:14 - 1.72
@@ -762,17 +762,20 @@
def checkModules(self,run):
# Check all the modules
-for module in run.getGumpSet().getModules():
+list=run.getGumpSet().getModules()
+moduleCount=len(list)
+moduleNo=1
+for module in list:
+
+log.info(' -- Module: #[' + `moduleNo` + '] of [' + `moduleCount` +
'] : ' + module.getName())
+
module.changeState(STATE_SUCCESS)
+moduleNo+=1
def checkProjects(self,run):
list=run.getGumpSet().getProjects()
# Check all projects
-log.debug('Total Project CheckList:');
-for p in list:
-log.debug(' To Check : ' + p.name)
-
projectCount=len(list)
projectNo=1
for project in list:
@@ -788,6 +791,8 @@
if not project.okToPerformWork():
log.warn('Failed to check project #[' + `projectNo` + '] [' +
project.getName() + '], state:' \
+ project.getStateDescription())
+
+projectNo+=1
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump engine.py
ajack 2004/03/01 10:58:01
Modified:python/gump/model project.py state.py module.py property.py
workspace.py object.py
python/gump/document forrest.py
python/gump/results resulter.py model.py
python/gump/utils tools.py
profile gump.xml
python/gump engine.py
Log:
1) Tinkering w/ adding a Tracker [one day will link to]
2) Results ...
2.1) Gathering results from other servers [downloading/parsing results.xml]
2.2) Generating results.xml for this server
3) Making 'catDirectoryToFileHolder' do a directory listing also, for debugging.
Revision ChangesPath
1.58 +8 -4 gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- project.py29 Feb 2004 19:16:19 - 1.57
+++ project.py1 Mar 2004 18:58:00 - 1.58
@@ -66,6 +66,7 @@
from gump.model.state import *
from gump.model.object import ModelObject, NamedModelObject, Jar,\
+Resultable, \
Mkdir, Delete, JunitReport, Work
from gump.model.stats import Statable, Statistics
from gump.model.property import Property
@@ -178,10 +179,13 @@
return os.pathsep.join(self.getSimpleClasspathList())
-class Project(NamedModelObject, Statable):
+class Project(NamedModelObject, Statable, Resultable):
A single project
def __init__(self,xml,workspace):
NamedModelObject.__init__(self,xml.getName(),xml,workspace)
+
+ Statable.__init__(self)
+ Resultable.__init__(self)
# Navigation
self.module=None # Module has to claim ownership
1.12 +24 -3 gump/python/gump/model/state.py
Index: state.py
===
RCS file: /home/cvs/gump/python/gump/model/state.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- state.py 17 Feb 2004 21:54:20 - 1.11
+++ state.py 1 Mar 2004 18:58:00 - 1.12
@@ -148,6 +148,19 @@
REASON_BUILD_TIMEDOUT : BuildTimedOut,
REASON_MISSING_OUTPUTS : MissingBuildOutputs }
+namedReasonCode = { NotSet : REASON_UNSET,
+CompletePackageInstall : REASON_PACKAGE,
+BadPackageInstallation : REASON_PACKAGE_BAD,
+CircularDependency : REASON_CIRCULAR,
+ConfigurationFailed : REASON_CONFIG_FAILED,
+UpdateFailed : REASON_UPDATE_FAILED,
+SynchronizeFailed : REASON_SYNC_FAILED,
+Pre-BuildFailed : REASON_PREBUILD_FAILED,
+BuildFailed : REASON_BUILD_FAILED,
+Post-BuildFailed : REASON_POSTBUILD_FAILED,
+BuildTimedOut : REASON_BUILD_TIMEDOUT,
+MissingBuildOutputs : REASON_MISSING_OUTPUTS }
+
reasonCodeDescriptions = { REASON_UNSET : Not Set,
REASON_PACKAGE : Complete Package Install,
REASON_PACKAGE_BAD : Bad Package Installation,
@@ -166,6 +179,14 @@
def reasonDescription(reasonCode):
return reasonCodeDescriptions.get(reasonCode,'Unknown Reason:' +
str(reasonCode))
+
+def reasonForName(name):
+return namedReasonCode.get(name,STATE_UNSET)
+
+def getStatePairFromNames(stateName,reasonName):
+state=stateForName(stateName)
+reason=reasonForName(reasonName)
+return StatePair(state,reason)
class StatePair:
Contains a State Plus Reason
1.34 +8 -5 gump/python/gump/model/module.py
Index: module.py
===
RCS file: /home/cvs/gump/python/gump/model/module.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- module.py 23 Feb 2004 20:55:08 - 1.33
+++ module.py 1 Mar 2004 18:58:00 - 1.34
@@ -67,7 +67,7 @@
from gump.model.state import *
from gump.model.stats import Statable, Statistics
from gump.model.project import *
-from gump.model.object import NamedModelObject
+from gump.model.object import NamedModelObject, Resultable
from gump.utils import getIndent
from gump.utils.note import transferAnnotations, Annotatable
@@ -192,11 +192,14 @@
unnamedModule.complete(workspace)
return unnamedModule
-class Module(NamedModelObject, Statable):
+class Module(NamedModelObject, Statable, Resultable):
Set of Modules
