ajack 2004/04/22 12:58:08
Modified: python/gump/document/forrest xdoc.py documenter.py
resolver.py
project depot.xml
Added: template/forrest/content/images icon.png gump-logo.png
apache.png
template/forrest skinconf.xml
template/forrest/content/gump_icons complete.png
no_work_performed.png failed.png success.png
prerequisite_failed.png unset.png
template/forrest/content/xdocs tabs.xml site.xml
template/forrest/content favicon.ico
Removed: template/forrest/src/documentation/content/gump_icons
failed.png prerequisite_failed.png
no_work_performed.png success.png complete.png
template/forrest/src/documentation/content/gump_icons/archive
prerequisite_failed.png failed.png
template/forrest/src/documentation/content/xdocs site.xml
tabs.xml
template/forrest/src/documentation/content/images icon.png
apache.png gump-logo.png
template/forrest/src/documentation/content favicon.ico
template/forrest/src/documentation skinconf.xml
Log:
1) Removed src/document from forrest paths, and template
2) Made depot verbose (for testing)
3) Made buildLog show what is verbose and/or debug
Revision Changes Path
1.5 +31 -1 gump/python/gump/document/forrest/xdoc.py
Index: xdoc.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest/xdoc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdoc.py 20 Apr 2004 17:44:32 -0000 1.4
+++ xdoc.py 22 Apr 2004 19:58:08 -0000 1.5
@@ -303,6 +303,9 @@
def createStrong(self,text=None,transient=0):
return self.storePiece(XDocStrong(self.createSubContext(transient),text))
+ def createEmphasis(self,text=None,transient=0):
+ return self.storePiece(XDocEmphasis(self.createSubContext(transient),text))
+
def createLink(self,href,text=None):
return self.storePiece(XDocLink(self.createSubContext(),href,text))
@@ -352,6 +355,21 @@
def createText(self,text=None,transient=0):
return self.storePiece(XDocText(self.createSubContext(transient),text))
+class XDocEmphasis(XDocPiece):
+ def __init__(self,context,text):
+ XDocPiece.__init__(self,context)
+ if text:
+ self.createText(text)
+
+ def start(self):
+ self.context.write('<em>')
+
+ def end(self):
+ self.context.write('</em>')
+
+ def createText(self,text=None,transient=0):
+ return self.storePiece(XDocText(self.createSubContext(transient),text))
+
class XDocList(XDocPiece):
def __init__(self,context):
XDocPiece.__init__(self,context)
@@ -386,6 +404,9 @@
def createStrong(self,text=None):
return self.storePiece(XDocStrong(self.createSubContext(),text))
+
+ def createEmphasis(self,text=None,transient=0):
+ return self.storePiece(XDocEmphasis(self.createSubContext(transient),text))
def createText(self,text=None):
return self.storePiece(XDocText(self.createSubContext(),text))
@@ -430,7 +451,7 @@
def createEntry(self,title,data=None):
row=self.createRow()
- titleData=row.createData(title)
+ titleData=row.createData().createStrong(title)
if not isinstance(data,NoneType):
dataData=row.createData(str(data))
return row
@@ -503,6 +524,9 @@
def createStrong(self,text=None):
return self.storePiece(XDocStrong(self.createSubContext(),text))
+
+ def createEmphasis(self,text=None,transient=0):
+ return self.storePiece(XDocEmphasis(self.createSubContext(transient),text))
def createIcon(self,href,alt=None):
return self.storePiece(XDocIcon(self.createSubContext(),href,alt))
@@ -527,6 +551,9 @@
def createStrong(self,text=None,transient=0):
return self.storePiece(XDocStrong(self.createSubContext(transient),text))
+
+ def createEmphasis(self,text=None,transient=0):
+ return self.storePiece(XDocEmphasis(self.createSubContext(transient),text))
def createLink(self,href,text=None):
return self.storePiece(XDocLink(self.createSubContext(),href,text))
@@ -554,6 +581,9 @@
def createStrong(self,text=None,transient=0):
return self.storePiece(XDocStrong(self.createSubContext(transient),text))
+
+ def createEmphasis(self,text=None,transient=0):
+ return self.storePiece(XDocEmphasis(self.createSubContext(transient),text))
class XDocSource(XDocPiece):
1.12 +8 -2 gump/python/gump/document/forrest/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest/documenter.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- documenter.py 22 Apr 2004 18:24:33 -0000 1.11
+++ documenter.py 22 Apr 2004 19:58:08 -0000 1.12
@@ -188,6 +188,8 @@
forrest=Cmd('forrest','forrest',forrestWorkDir)
forrest.addPrefixedParameter('-D','java.awt.headless','true','=')
+ forrest.addPrefixedParameter('-D','project.content-dir', \
+ '.', '=')
forrest.addPrefixedParameter('-D','project.site-dir', \
stagingDirectory, '=')
@@ -551,7 +553,7 @@
self.documentSummary(document, workspace.getProjectSummary())
projectsSection=document.createSection('Projects (in build order)')
- projectsTable=projectsSection.createTable(['Time','Updated','Name','Project
State','Duration\nin state','Last Modified','Elapsed'])
+ projectsTable=projectsSection.createTable(['Time','Updated','Name','Project
State','Duration\nin state','Last Modified','Notes'])
pcount=0
for project in gumpSet.getProjectSequence():
# :TODO: Next line irrelevent?
@@ -572,7 +574,11 @@
projectRow.createData( \
getGeneralSinceDescription( \
project.getModule().getStats().getLastUpdated()))
-
projectRow.createData(secsToElapsedTimeString(project.getElapsedSecs()))
+
+ notes=''
+ if project.isVerbose(): notes += 'Verbose'
+ if project.isDebug(): notes += 'Debug'
+ projectRow.createData(notes)
if not pcount: projectsTable.createLine('None')
1.6 +4 -3 gump/python/gump/document/forrest/resolver.py
Index: resolver.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest/resolver.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- resolver.py 16 Apr 2004 17:28:42 -0000 1.5
+++ resolver.py 22 Apr 2004 19:58:08 -0000 1.6
@@ -168,14 +168,15 @@
Resolver.__init__(self,rootDir,rootUrl)
-
# Content
- contentSubPath=Path(['forrest-work','src','documentation','content'])
+ #contentSubPath=Path(['forrest-work','src','documentation','content'])
+ contentSubPath=Path(['forrest-work','content'])
self.makePath(contentSubPath,rootDir)
self.contentDir=concatenate(rootDir,contentSubPath.serialize())
# XDocs
- xdocsSubPath=Path(['forrest-work','src','documentation','content','xdocs'])
+ #xdocsSubPath=Path(['forrest-work','src','documentation','content','xdocs'])
+ xdocsSubPath=Path(['forrest-work','content','xdocs'])
self.makePath(xdocsSubPath,rootDir)
self.xdocsDir=concatenate(rootDir,xdocsSubPath.serialize())
1.1 gump/template/forrest/content/images/icon.png
<<Binary file>>
1.1 gump/template/forrest/content/images/gump-logo.png
<<Binary file>>
1.1 gump/template/forrest/content/images/apache.png
<<Binary file>>
1.4 +11 -15 gump/template/forrest/skinconf.xml
1.1 gump/template/forrest/content/gump_icons/complete.png
<<Binary file>>
1.1 gump/template/forrest/content/gump_icons/no_work_performed.png
<<Binary file>>
1.1 gump/template/forrest/content/gump_icons/failed.png
<<Binary file>>
1.1 gump/template/forrest/content/gump_icons/success.png
<<Binary file>>
1.1 gump/template/forrest/content/gump_icons/prerequisite_failed.png
<<Binary file>>
1.1 gump/template/forrest/content/gump_icons/unset.png
<<Binary file>>
1.24 +1 -1 gump/project/depot.xml
Index: depot.xml
===================================================================
RCS file: /home/cvs/gump/project/depot.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- depot.xml 21 Apr 2004 07:09:37 -0000 1.23
+++ depot.xml 22 Apr 2004 19:58:08 -0000 1.24
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module name="depot" fullname="Apache Depot">
+<module name="depot" fullname="Apache Depot" verbose="true">
<url href="http://incubator.apache.org/depot"/>
1.4 +3 -3 gump/template/forrest/content/xdocs/tabs.xml
1.3 +76 -5 gump/template/forrest/content/xdocs/site.xml
1.1 gump/template/forrest/content/favicon.ico
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
