ajack 2003/11/18 13:49:12
Modified: python/gump engine.py config.py
python/gump/model workspace.py
python/gump/output statistics.py
python/gump/document forrest.py
Log:
Tweak, tweak...
Revision Changes Path
1.3 +6 -7 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- engine.py 18 Nov 2003 00:29:49 -0000 1.2
+++ engine.py 18 Nov 2003 21:49:12 -0000 1.3
@@ -137,7 +137,7 @@
# Must be one to be all
if not packageCount: allPackaged=0
- # Give this module a second try, and since some are packaged
+ # Give this module a second try, and if some are packaged
# check if the others have no outputs, then call them good.
if packageCount and not allPackaged:
allPackaged=1
@@ -155,8 +155,8 @@
else:
allPackaged=0
if packageCount:
- module.addWarning("Incomplete \'Packaged\' Module.
Project: " + \
- project.getName() + " is not packaged")
+ module.addWarning('Incomplete \'Packaged\' Module.
Project: ' + \
+ project.getName() + ' is not packaged')
# If packages module, accept it...
if allPackaged:
@@ -261,8 +261,7 @@
log.debug('Perform CVS Update on: ' + module.getName())
- if module.okToPerformWork() \
- and not switch.failtesting:
+ if module.okToPerformWork():
# Did we check it out already?
exists = os.path.exists(module.getName())
@@ -306,7 +305,7 @@
# If no CVS, nothing to sync
if not module.isCVS(): continue
- if module.okToPerformWork() and not switch.failtesting:
+ if module.okToPerformWork():
sourcedir =
os.path.abspath(os.path.join(workspace.getCVSDirectory(),module.name)) # todo allow
override
destdir = os.path.abspath(workspace.getBaseDirectory())
@@ -354,7 +353,7 @@
repository=run.getOutputsRepository()
# build all projects this project depends upon, then the project itself
- for project in sequence:
+ for project in sequence:
if project.okToPerformWork():
self.performPreBuild( run, project )
1.3 +0 -1 jakarta-gump/python/gump/config.py
Index: config.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/config.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.py 18 Nov 2003 17:29:18 -0000 1.2
+++ config.py 18 Nov 2003 21:49:12 -0000 1.3
@@ -129,7 +129,6 @@
"""Configuration of switches """
optimize=0 # Optimize (at risk to exact correctness) anywhere one can
optimizenetwork=1 # Do least network traffic
- failtesting=0 # Not testing..
debugging=0 # Not debugging..
def basicConfig():
1.4 +6 -5 jakarta-gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/workspace.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.py 18 Nov 2003 17:29:17 -0000 1.3
+++ workspace.py 18 Nov 2003 21:49:12 -0000 1.4
@@ -244,7 +244,7 @@
repoName=repository.getName()
if repoName in self.repositories:
# Duplicate, uh oh...
- self.error("Duplicate repository name [" + repoName + "]")
+ self.addError("Duplicate repository name [" + repoName + "]")
else:
repository.complete(self)
self.repositories[repoName] = repository
@@ -257,7 +257,7 @@
moduleName=module.getName()
if moduleName in self.modules:
# Duplicate, uh oh...
- self.error("Duplicate Module name [" + moduleName + "]")
+ self.addError("Duplicate Module name [" + moduleName + "]")
else:
self.modules[moduleName] = module
#
@@ -268,7 +268,7 @@
projectName=project.getName()
if projectName in self.projects:
# Duplicate, uh oh...
- self.error("Duplicate Project name [" + projectName + "]")
+ self.addError("Duplicate Project name [" + projectName + "]")
else:
self.projects[projectName] = project
@@ -277,7 +277,8 @@
module.complete(self)
#
- # Check repositories now modules have been imported
+ # Check repositories, now modules have been imported,
+ # so we can report those unused ones.
#
for repository in self.getRepositories():
repository.check(self)
@@ -299,7 +300,7 @@
# Complete the project
project.complete(self)
- # Complee the properies
+ # Complete the properies
self.completeProperties()
self.setComplete(1)
1.3 +12 -22 jakarta-gump/python/gump/output/statistics.py
Index: statistics.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/output/statistics.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- statistics.py 18 Nov 2003 03:57:47 -0000 1.2
+++ statistics.py 18 Nov 2003 21:49:12 -0000 1.3
@@ -83,7 +83,6 @@
self.first=''
self.last=''
self.currentState=STATE_UNSET
- self.previousState=STATE_UNSET
self.sequenceInState=0
def getFOGFactor(self):
@@ -110,9 +109,6 @@
def currentStateKey(self):
return self.projectname + '-current-state'
- def previousStateKey(self):
- return self.projectname + '-previous-state'
-
def sequenceInStateKey(self):
return self.projectname + '-state-seq'
@@ -132,17 +128,17 @@
elif project.isPrereqFailure():
s.prereqs += 1
- #
- # Deal with states & changes...
- #
- if self.previousState==self.currentState:
- self.sequenceInState += 1
- else:
- self.sequenceInState = 1
-
- self.previousState=self.currentState
- self.currentState=project.getState()
-
+ #
+ # Deal with states & changes...
+ #
+ previousState=self.currentState
+ self.currentState=project.getState()
+
+ if previousState==self.currentState:
+ self.sequenceInState += 1
+ else:
+ self.sequenceInState = 1
+
class StatisticsDB:
"""Statistics Interface"""
@@ -170,7 +166,6 @@
s.first=self.getDate(s.firstKey())
s.last=self.getDate(s.lastKey())
s.currentState=stateForName(self.get(s.currentStateKey()))
- s.previousState=stateForName(self.get(s.previousStateKey()))
s.sequenceInState=self.getInt(s.sequenceInStateKey())
return s
@@ -182,7 +177,6 @@
self.putDate(s.firstKey(), s.first)
self.putDate(s.lastKey(), s.last)
self.put(s.currentStateKey(), stateName(s.currentState))
- self.put(s.previousStateKey(), stateName(s.previousState))
self.putInt(s.sequenceInStateKey(), s.sequenceInState)
def delProjectStats(self,s):
@@ -213,11 +207,7 @@
try:
del self.db[s.currentStateKey()]
except:
- """ Hopefully means it wasn't there... """
- try:
- del self.db[s.previousStateKey()]
- except:
- """ Hopefully means it wasn't there... """
+ """ Hopefully means it wasn't there... """
try:
del self.db[s.sequenceInStateKey()]
except:
1.6 +1 -1 jakarta-gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- forrest.py 18 Nov 2003 20:58:18 -0000 1.5
+++ forrest.py 18 Nov 2003 21:49:12 -0000 1.6
@@ -1403,7 +1403,7 @@
for repo in repoMap.keys():
moduleList=createOrderedList(repoMap.get(repo))
repoSection=document.createSection('Repository: ' + repo.getName())
- self.insertLink( repo, xref, repoSection.createParagraph('Repository
Definition'))
+ self.insertLink( repo, xref, repoSection.createParagraph('Repository
Definition: '))
moduleRepoTable=repoSection.createTable(['Modules'])
for module in moduleList:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
