ajack 2004/02/09 10:26:00 Modified: python/gump/model workspace.py project.py profile gump.xml python/gump/document forrest.py Added: project gump-test.xml Log: 1) Fixed a bug w/ has|getTitle() on server. [Need to add some servers] 2) Added gump-test.xml (for some extra gump test projects) 3) Made 'root cause' be referenced as a Note up top of project/module. Revision Changes Path 1.25 +14 -4 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- workspace.py 1 Feb 2004 18:44:44 -0000 1.24 +++ workspace.py 9 Feb 2004 18:25:59 -0000 1.25 @@ -116,6 +116,7 @@ # self.noRSync=0 self.noForrest=0 + self.noMaven=0 self.noRuper=0 self.noSvn=0 self.noCvs=0 @@ -572,7 +573,11 @@ if not self.checkEnvVariable('FORREST_HOME',0): self.noForrest=1 - self.addWarning('FORREST_HOME environmental variable not found, no xdoc output') + self.addWarning('FORREST_HOME environmental variable not found, no xdoc output.') + + if not self.checkEnvVariable('MAVEN_HOME',0): + self.noMaven=1 + self.addWarning('MAVEN_HOME environmental variable not found, no maven builds.') # # Check for executables: @@ -607,6 +612,11 @@ not self.checkExecutable('ruper','-version',0,0,'check_ruper'): self.noRuper=1 self.addWarning('"ruper" command not found, no package downloads') + + if not self.noMaven and \ + 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 1.32 +5 -5 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.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- project.py 5 Feb 2004 05:43:56 -0000 1.31 +++ project.py 9 Feb 2004 18:25:59 -0000 1.32 @@ -813,7 +813,7 @@ # # The module src directory (if exists) or Gump base # plus: - # The specifier for ANT, or nothing. + # The specifier for Maven, or nothing. # basedir = os.path.abspath(os.path.join(self.getModule().getSourceDirectory() or dir.base, \ maven.basedir or '')) @@ -831,7 +831,7 @@ # # Run java on apache Ant... # - cmd=Cmd(self.getWorkspace().getJavaCommand(),'build_'+self.getModule().getName()+'_'+self.getName(),\ + cmd=Cmd('maven','build_'+self.getModule().getName()+'_'+self.getName(),\ basedir,{'CLASSPATH':classpath}) # Set this as a system property. Setting it here helps JDK1.4+ 1.301 +2 -0 jakarta-gump/profile/gump.xml Index: gump.xml =================================================================== RCS file: /home/cvs/jakarta-gump/profile/gump.xml,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- gump.xml 3 Feb 2004 07:57:45 -0000 1.300 +++ gump.xml 9 Feb 2004 18:26:00 -0000 1.301 @@ -98,6 +98,8 @@ <module href="project/jakarta-velocity-dvsl.xml"/> <module href="project/jakarta-watchdog.xml"/> + <module href="project/gump-test.xml"/> + <!-- Apache.Maven --> <module href="project/maven.xml"/> 1.1 jakarta-gump/project/gump-test.xml Index: gump-test.xml =================================================================== <module name="jakarta-gump-test"> <url href="http://jakarta.apache.org/gump/"/> <description> Cross project build tool testing </description> <svn repository="apache-svn-sandbox" dir="gump-test"/> <project name="gump-test-maven1" basedir="maven-project"> <maven target="dist"/> </project> </module> 1.64 +13 -5 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.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- forrest.py 5 Feb 2004 14:50:07 -0000 1.63 +++ forrest.py 9 Feb 2004 18:26:00 -0000 1.64 @@ -794,8 +794,8 @@ detailSection=document.createSection('Server Details') detailList=detailSection.createList() - if server.hasTitle(): - detailList.createEntry('Title: ', server.getTitle()) + #if server.hasTitle(): + # detailList.createEntry('Title: ', server.getTitle()) self.documentXML(document,server) @@ -825,6 +825,10 @@ descriptionSection.createParagraph().createRaw(description) + if module.cause and not module==module.cause: + self.insertTypedLink( module.cause, module, \ + document.createNote( "This module failed due to: ")) + if module.isPackaged(): document.createNote('This is a packaged module, not Gumped.') @@ -985,6 +989,10 @@ projectsSection.createParagraph().createRaw(description) + if project.cause and not project==project.cause: + self.insertTypedLink( project.cause, project, \ + document.createNote( "This project failed due to: ")) + if project.isPackaged(): document.createNote('This is a packaged project, not Gumped.') elif not project.hasBuildCommand():
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]