ajack 2003/11/17 16:29:50
Modified: python/gump __init__.py build.py check.py engine.py
update.py
python/gump/document forrest.py
python/gump/model ant.py object.py project.py state.py
python/gump/output rss.py
python/gump/utils tools.py
Log:
First 'wet run' fixes.
Revision Changes Path
1.19 +3 -3 jakarta-gump/python/gump/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/__init__.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
1.37 +3 -3 jakarta-gump/python/gump/build.py
Index: build.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/build.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
1.34 +3 -3 jakarta-gump/python/gump/check.py
Index: check.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/check.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
1.2 +11 -5 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- engine.py 17 Nov 2003 22:10:51 -0000 1.1
+++ engine.py 18 Nov 2003 00:29:49 -0000 1.2
@@ -21,7 +21,7 @@
from gump.model.note import Annotatable
from gump.utils import dump, display, getIndent
-from gump.utils.tools import listDirectoryAsWork
+from gump.utils.tools import listDirectoryAsWork,syncDirectories
from gump.document.text import TextDocumenter
from gump.document.forrest import ForrestDocumenter
@@ -297,6 +297,8 @@
"""copy the raw module (project) materials from source to work dir
(hopefully using rsync, cp is fallback) """
+ workspace = run.getWorkspace()
+
log.debug('--- Synchronizing work directories with sources')
for module in run.getGumpSet().getModules():
@@ -306,10 +308,12 @@
if module.okToPerformWork() and not switch.failtesting:
- sourcedir =
os.path.abspath(os.path.join(workspace.cvsdir,module.name)) # todo allow override
+ sourcedir =
os.path.abspath(os.path.join(workspace.getCVSDirectory(),module.name)) # todo allow
override
destdir = os.path.abspath(workspace.getBaseDirectory())
-
work=syncDirectories(workspace.noRSync,WORK_TYPE_SYNC,dir.work,sourcedir,destdir,module.name)
+ work=syncDirectories(workspace.noRSync,WORK_TYPE_SYNC,\
+ dir.work,workspace.tmpdir,\
+ sourcedir,destdir,module.name)
# Perform the sync...
module.performedWork(work)
@@ -437,6 +441,8 @@
def performPostBuild(self, run, project, repository):
"""Perform Post-Build Actions"""
+ log.debug(' ------ Performing post-Build Actions (check jars) for : '+
project.getName())
+
if project.hasOutputs():
outputsOk=1
for jar in project.getJars():
@@ -450,7 +456,7 @@
for jar in project.getJars():
jarPath=os.path.abspath(jar.getPath())
# Copy to repository
- repository.publish( module.name, jarpath )
+ repository.publish( project.getModule().getName(), jarPath )
project.changeState(STATE_SUCCESS)
@@ -499,4 +505,4 @@
# Update stats (and stash onto projects)
#
db.updateStatistics(run.getWorkspace())
-
\ No newline at end of file
+
1.21 +3 -3 jakarta-gump/python/gump/update.py
Index: update.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/update.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
1.2 +7 -7 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forrest.py 17 Nov 2003 22:10:55 -0000 1.1
+++ forrest.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -281,7 +281,7 @@
self.documentSummary(document,workspace.getProjectSummary())
self.documentAnnotations(document,workspace)
- self.documentXML(document,workspace)
+ #self.documentXML(document,workspace)
detailsSection=document.createSection('Details')
detailsTable=detailsSection.createTable()
@@ -355,7 +355,7 @@
self.documentSummary(document, workspace.getProjectSummary())
projectsSection=document.createSection('Projects (in build order)')
- projectsTable=projectsSection.createTable(['Name','Project
State','Duration','Elapsed'])
+ projectsTable=projectsSection.createTable(['Name','Project State','Duration
in state','Elapsed'])
pcount=0
for project in sortedProjectList:
if not gumpSet.inSequence(project): continue
@@ -440,7 +440,7 @@
self.documentSummary(document, workspace.getProjectSummary())
modulesSection=document.createSection('Modules with TODOs')
-
modulesTable=modulesSection.createTable(['Name','Affected','Duration','Module State',
\
+ modulesTable=modulesSection.createTable(['Name','Affected','Duration in
state','Module State', \
'Project State(s)','Elapsed'])
mcount=0
@@ -638,11 +638,11 @@
if repo.hasHomePage():
detailList.createEntry('Homepage: ') \
- .createLink(repo.getHomePage())
+ .createLink(repo.getHomePage(),repo.getHomePage())
if repo.hasCvsWeb():
detailList.createEntry('CVS Viewer: ') \
- .createLink(repo.getCvsWeb())
+ .createLink(repo.getCvsWeb(),repo.getCvsWeb())
detailList.createEntry('State: ' + repo.getStateDescription())
if not repo.getReason() == REASON_UNSET:
@@ -658,7 +658,7 @@
detailList.createEntry('Path: ', repo.getPath())
if repo.hasHostname():
- detailList.createEntry('Homename: ', repo.getHostname())
+ detailList.createEntry('Hostname: ', repo.getHostname())
self.documentXML(document,repo)
@@ -1414,4 +1414,4 @@
document.serialize()
-
\ No newline at end of file
+
1.2 +19 -16 jakarta-gump/python/gump/model/ant.py
Index: ant.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/ant.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.py 17 Nov 2003 22:10:50 -0000 1.1
+++ ant.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -124,25 +124,28 @@
# Runtime?
runtime=0
if property.runtime: property.runtime=1
-
- # Add a dependency (to bring property)
- dependency=ProjectDependency(project, \
- workspace.getProject(property.project), \
- INHERIT_ALL, \
- runtime,
- 0, \
- ids)
+
+ projectName=property.project
+ if workspace.hasProject(projectName):
+ # Add a dependency (to bring property)
+ dependency=ProjectDependency(project, \
+ workspace.getProject(property.project), \
+ INHERIT_ALL, \
+ runtime,
+ 0, \
+ ids)
- dependency.addInfo("Property Based Dependency " + `property`)
+ dependency.addInfo("Property Based Dependency " + `property`)
- # :TODOs:
- # if not property.classpath: depend['noclasspath']=Single({})
+ # :TODOs:
+ # if not property.classpath: depend['noclasspath']=Single({})
- # Add depend to project...
- # :TODO: Convert to ModelObject
- project.addDependency(dependency)
-
+ # Add depend to project...
+ # :TODO: Convert to ModelObject
+ project.addDependency(dependency)
+ else:
+ log.error('No such project [' + projectName + '] for property')
def expandDependencies(self,project,workspace):
#
@@ -200,4 +203,4 @@
#
PropertyContainer.dump(self,indent+1,output)
-
\ No newline at end of file
+
1.2 +15 -14 jakarta-gump/python/gump/model/object.py
Index: object.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/object.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- object.py 17 Nov 2003 22:10:50 -0000 1.1
+++ object.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -91,19 +91,20 @@
# Store it...
Stateful.setStatePair(self,StatePair(state,reason))
-
- #
- # If no-one else to point the finger at ...
- # ... step up.
- #
- if not cause: cause = self
-
- # List of things that caused issues...
- self.addCause(cause)
-
- # Send on the changes...
- self.propagateErrorStateChange(state,reason,cause)
-
+
+ if not stateOk(state):
+ #
+ # If no-one else to point the finger at ...
+ # ... step up.
+ #
+ if not cause: cause = self
+
+ # List of things that caused issues...
+ self.addCause(cause)
+
+ # Send on the changes...
+ self.propagateErrorStateChange(state,reason,cause)
+
def propagateErrorStateChange(self,state,reason,cause):
@@ -266,4 +267,4 @@
# represents a <work/> element
class Work(ModelObject): pass
-
\ No newline at end of file
+
1.2 +2 -2 jakarta-gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.py 17 Nov 2003 22:10:50 -0000 1.1
+++ project.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -332,7 +332,7 @@
if dependee.isOptional():
dependee.getProject().addWarning("Optional dependency " +
self.name + " " + message)
else:
-
dependee.getProject().changeState(STATE_PREREQ_FAILURE,reason,cause)
+
dependee.getProject().changeState(STATE_PREREQ_FAILED,reason,cause)
#
# We have a potential clash between the <project package attribute and
@@ -977,7 +977,7 @@
# Stand up and be counted
if stateOk(state):
self.successes+=1
- elif STATE_PREREQ_FAILURE == state:
+ elif STATE_PREREQ_FAILED == state:
self.prereqs+=1
elif STATE_FAILED == state:
self.failures+=1
1.2 +6 -6 jakarta-gump/python/gump/model/state.py
Index: state.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/state.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- state.py 17 Nov 2003 22:10:50 -0000 1.1
+++ state.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -71,14 +71,14 @@
STATE_NONE=1
STATE_SUCCESS=2
STATE_FAILED=3
-STATE_PREREQ_FAILURE=4
+STATE_PREREQ_FAILED=4
STATE_COMPLETE=5
stateDescriptions = { STATE_UNSET : "Unset",
STATE_NONE : "No Work Performed",
STATE_SUCCESS : "Success",
STATE_FAILED : "Failed",
- STATE_PREREQ_FAILURE : "Prerequisite Failed",
+ STATE_PREREQ_FAILED : "Prerequisite Failed",
STATE_COMPLETE : "Complete" }
def stateName(state):
@@ -89,7 +89,7 @@
"No Work Performed" : STATE_NONE,
"Success" : STATE_SUCCESS,
"Failed" : STATE_FAILED,
- "Prerequisite Failed" : STATE_PREREQ_FAILURE,
+ "Prerequisite Failed" : STATE_PREREQ_FAILED,
"Complete" : STATE_COMPLETE}
def stateForName(name):
@@ -206,8 +206,8 @@
return STATE_SUCCESS == self.statePair.state
def isFailure(self):
- return STATE_FAILURE == self.statePair.state
+ return STATE_FAILED == self.statePair.state
def isPrereqFailure(self):
- return STATE_PREREQ_FAILURE == self.statePair.state
-
\ No newline at end of file
+ return STATE_PREREQ_FAILED == self.statePair.state
+
1.2 +1 -1 jakarta-gump/python/gump/output/rss.py
Index: rss.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/output/rss.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rss.py 17 Nov 2003 22:10:54 -0000 1.1
+++ rss.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -110,7 +110,7 @@
# State changes that are newsworthy...
if s.sequenceInState == 1 \
- and not s.currentState == STATE_PREREQ_FAILURE \
+ and not s.currentState == STATE_PREREQ_FAILED \
and not s.currentState == STATE_NONE \
and not s.currentState == STATE_COMPLETE :
1.2 +5 -5 jakarta-gump/python/gump/utils/tools.py
Index: tools.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/utils/tools.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tools.py 17 Nov 2003 22:10:55 -0000 1.1
+++ tools.py 18 Nov 2003 00:29:50 -0000 1.2
@@ -87,18 +87,18 @@
-def syncDirectories(useRSync,type,cwd,sourcedir,destdir,name=None):
+def syncDirectories(noRSync,type,cwddir,tmpdir,sourcedir,destdir,name=None):
# :TODO: Make this configurable (once again)
#if not workspace.sync:
# workspace.sync = default.syncCommand
- if useRSync:
- cmd=Cmd('cp','sync_'+name,dir.work)
+ if noRSync:
+ cmd=Cmd('cp','sync_'+name,cwddir)
cmd.addParameter('-Rf')
cmd.addParameter(sourcedir)
cmd.addParameter(destdir)
else:
- cmd=Cmd('rsync','rsync_'+name,dir.work)
+ cmd=Cmd('rsync','rsync_'+name,cwddir)
cmd.addParameter('-r')
cmd.addParameter('-a')
# Keep it quiet...
@@ -112,7 +112,7 @@
log.debug(' ------ Sync\'ing : '+ name)
# Perform the Sync
- cmdResult=execute(cmd,workspace.tmpdir)
+ cmdResult=execute(cmd,tmpdir)
work=CommandWorkItem(type,cmd,cmdResult)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
