ajack 2004/07/02 08:28:10
Modified: python/gump/document/xdocs Tag: CleanUp documenter.py
Log:
If at first...
Revision Changes Path
No revision
No revision
1.9.2.33 +14 -20 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.9.2.32
retrieving revision 1.9.2.33
diff -u -r1.9.2.32 -r1.9.2.33
--- documenter.py 2 Jul 2004 15:16:13 -0000 1.9.2.32
+++ documenter.py 2 Jul 2004 15:28:10 -0000 1.9.2.33
@@ -119,34 +119,24 @@
#
# XDocing...
def getXDocWorkDirectory(self):
- if hasattr(self,'workDir'): return self.workDir
-
+ if hasattr(self,'workDir'): return self.workDir
wdir=os.path.abspath(os.path.join(
- self.workspace.getBaseDirectory(),'xdocs-work'))
-
+ self.workspace.getBaseDirectory(),'xdocs-work'))
if self.config.isXdocs():
- wdir=os.path.abspath(os.path.join(wdir,'content'))
-
+ wdir=os.path.abspath(os.path.join(wdir,'content'))
if not os.path.exists(wdir):
- os.makedirs(wdir)
-
- self.workDir=wdir
-
+ os.makedirs(wdir)
+ self.workDir=wdir
return self.workDir
def getXDocLogDirectory(self):
- if hasattr(self,'logDir'): return self.logDir
-
- ldir=self.workspace.getLogDirectory()
-
+ if hasattr(self,'logDir'): return self.logDir
+ ldir=self.workspace.getLogDirectory()
if self.config.isXdocs():
- ldir=os.path.abspath(os.path.join(ldir,'content'))
-
+ ldir=os.path.abspath(os.path.join(ldir,'content'))
if not os.path.exists(ldir):
- os.makedirs(ldir)
-
- self.logDir=ldir
-
+ os.makedirs(ldir)
+ self.logDir=ldir
return self.logDir
def getXDocTemplateDirectory(self):
@@ -155,6 +145,8 @@
if self.config.isXhtml():
templateName='xhtml'
fdir=os.path.abspath(os.path.join(dir.template,templateName))
+ if self.config.isXdocs():
+ fdir=os.path.abspath(os.path.join(fdir,'content'))
return fdir
def getXDocSiteTemplateDirectory(self):
@@ -163,6 +155,8 @@
if self.config.isXhtml():
templateName='site-xhtml'
fdir=os.path.abspath(os.path.join(dir.template,templateName))
+ if self.config.isXdocs():
+ fdir=os.path.abspath(os.path.join(fdir,'content'))
return fdir
def prepareXDoc(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
