ajack 2004/05/26 16:23:34
Modified: python/gump/build maven.py
project depot.xml
python/gump/document/xdocs documenter.py
Log:
1) depot-version ought now have *optional* dependency on servlet stuff
2) Hopefully ought stick a nie red box next to where the build log is.
3) Stop looking for maven.log.
Revision Changes Path
1.4 +1 -11 gump/python/gump/build/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/maven.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.py 25 May 2004 22:46:00 -0000 1.3
+++ maven.py 26 May 2004 23:23:34 -0000 1.4
@@ -95,12 +95,7 @@
projpFile=self.locateMavenProjectPropertiesFile(project)
if os.path.exists(projpFile):
project.addDebug('Maven project properties in: ' + projpFile)
- catFileToFileHolder(project, pomFile, FILE_TYPE_CONFIG)
-
- logFile=self.locateMavenLog(project)
- if os.path.exists(logFile):
- project.addDebug('Maven Log in: ' + logFile)
- catFileToFileHolder(project, logFile, FILE_TYPE_LOG)
+ catFileToFileHolder(project, pomFile, FILE_TYPE_CONFIG)
#
# Build an ANT command for this project
@@ -262,11 +257,6 @@
annotatedPath.getPath()))
return propertiesFile
-
- def locateMavenLog(self,project):
- """Return Maven log location"""
- basedir = project.maven.getBaseDirectory() or project.getBaseDirectory()
- return os.path.abspath(os.path.join(basedir,'maven.log'))
def locateMavenProjectPropertiesFile(self,project):
"""Return Maven project properties file location"""
1.53 +1 -1 gump/project/depot.xml
Index: depot.xml
===================================================================
RCS file: /home/cvs/gump/project/depot.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- depot.xml 14 May 2004 22:11:48 -0000 1.52
+++ depot.xml 26 May 2004 23:23:34 -0000 1.53
@@ -86,7 +86,7 @@
<depend inherit="runtime" project="ant"/>
<depend project="depot-common" inherit="all"/>
- <depend project="jakarta-servletapi" />
+ <option project="jakarta-servletapi" />
<jar name="dist/depot-version-gump-@@DATE@@.jar"/>
1.5 +9 -3 gump/python/gump/document/xdocs/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- documenter.py 25 May 2004 22:46:00 -0000 1.4
+++ documenter.py 26 May 2004 23:23:34 -0000 1.5
@@ -1633,9 +1633,12 @@
note=''
if project.wasBuilt():
- note='Project build output found here...'
+ if project.getreason() == REASON_BUILD_FAILED:
+ warn='Project build output (failure) found here...'
+ else:
+ note='Project build output found here...'
self.documentWorkList(document,project,'Project-level Work',0, \
- note)
+ note,warn)
self.documentServerLinks(document,project)
# Project Details (main ones)
@@ -2142,7 +2145,7 @@
' (' + '%02.2f' % summary.packagesPercentage +
'%)'] )
- def
documentWorkList(self,xdocNode,workable,description='Work',tailFail=1,note=''):
+ def
documentWorkList(self,xdocNode,workable,description='Work',tailFail=1,note='',warn=''):
worklist=workable.getWorkList()
if not worklist: return
@@ -2151,6 +2154,9 @@
if note:
workSection.createNote(note)
+
+ if warn:
+ workSection.createWarning(warn)
workTable=workSection.createTable(['Name','State','Start','Elapsed'])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
