You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2004/03/19 00:24:56 UTC
cvs commit: gump/python/gump/document forrest.py text.py
ajack 2004/03/18 15:24:56
Modified: python/gump/document forrest.py text.py
Log:
1) Tinkered w/ preview (to show what would occur).
Used to "predict" how long a pattern might take (e.g. avalon-*)
Need to build this into the main engine, so we can actually follow the flow w/o doing anything,
also go get results.xml to guestimate times.
2) Worked on nag overrides, I beleive they work now.
3) Made property based depends use inherit=NONE (not ALL)
4) Attempted to ma 'noclasspath' (and 'classpath' on property) work.
5) Some documentation logs/tweaks. No clue why LSD feels repeatedly one day stale.
Revision Changes Path
1.110 +16 -17 gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- forrest.py 17 Mar 2004 20:55:22 -0000 1.109
+++ forrest.py 18 Mar 2004 23:24:55 -0000 1.110
@@ -139,9 +139,9 @@
fdir=os.path.abspath(os.path.join(workspace.getBaseDirectory(),'forrest'))
return fdir
- def getForrestOutputDirectory(self,workspace):
+ def getForrestStagingDirectory(self,workspace):
""" Staging Area for built output """
- fdir=os.path.abspath(os.path.join(workspace.getBaseDirectory(),'forrest-site'))
+ fdir=os.path.abspath(os.path.join(workspace.getBaseDirectory(),'forrest-staging'))
return fdir
def getForrestTemplateDirectory(self):
@@ -166,7 +166,7 @@
forrestWorkDir=self.getForrestDirectory(workspace)
wipeDirectoryTree(forrestWorkDir)
- # Copy in the defaults
+ # Sync in the defaults [i.e. cleans also]
forrestTemplate=self.getForrestTemplateDirectory()
syncDirectories( forrestTemplate, \
forrestWorkDir, \
@@ -180,19 +180,18 @@
workspace)
#
- # Delete the output tree
+ # Wipe the staging tree
#
- outputDirectory=self.getForrestOutputDirectory(workspace)
- wipeDirectoryTree(outputDirectory)
-
-
+ stagingDirectory=self.getForrestStagingDirectory(workspace)
+ wipeDirectoryTree(stagingDirectory)
+
def executeForrest(self,workspace):
# The project tree
xdocs=self.resolver.getDirectory(workspace)
# The three dirs, work, output (staging), public
forrestWorkDir=self.getForrestDirectory(workspace)
- outputDirectory=self.getForrestOutputDirectory(workspace)
+ stagingDirectory=self.getForrestStagingDirectory(workspace)
logDirectory=workspace.getLogDirectory()
# Generate...
@@ -200,9 +199,9 @@
forrest.addPrefixedParameter('-D','java.awt.headless','true','=')
forrest.addPrefixedParameter('-D','project.site-dir', \
- outputDirectory, '=')
+ stagingDirectory, '=')
- # Temporary
+ # Temporary:
# Too verbose ... forrest.addParameter('-debug')
#forrest.addParameter('-verbose')
@@ -230,13 +229,13 @@
#
# Sync over public pages...
#
- syncDirectories(outputDirectory,logDirectory)
+ syncDirectories(stagingDirectory,logDirectory)
#
# Clean up
- wipeDirectoryTree(outputDirectory)
+ wipeDirectoryTree(stagingDirectory)
wipeDirectoryTree(forrestWorkDir)
except:
- log.error('--- Failed to sync or clean-up')
+ log.error('--- Failed to staging->log sync and/or clean-up', exc_info=1)
success=0
return success
1.14 +12 -10 gump/python/gump/document/text.py
Index: text.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/text.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- text.py 16 Mar 2004 23:56:41 -0000 1.13
+++ text.py 18 Mar 2004 23:24:55 -0000 1.14
@@ -99,6 +99,8 @@
#
#
quick=run.getOptions().isQuick()
+ verbose=run.getOptions().isVerbose()
+ debug=run.getOptions().isDebug()
#
# Where to write this.
@@ -144,20 +146,20 @@
else:
if not gumpSet.inProjectSequence(project): continue
- self.documentProject(indent,project)
+ self.documentProject(indent,project,debug,verbose)
- def documentProject(self, indent, project):
+ def documentProject(self, indent, project, debug, verbose):
indent += ' '
output=self.output
output.write(indent + "Project [" + project.getName() \
+ "] State: " + project.getStateDescription() + "\n")
-
- self.documentDependenciesList(indent, "Project Dependees", \
- project.getDirectDependees(), 1, project)
+ if verbose:
+ self.documentDependenciesList(indent, "Project Dependees", \
+ project.getDirectDependees(), 1, project)
- self.documentDependenciesList(indent, "Project Dependencies", \
- project.getDirectDependencies(), 0, project)
+ self.documentDependenciesList(indent, "Project Dependencies", \
+ project.getDirectDependencies(), 0, project)
self.documentAnnotations(indent,project)
self.documentWork(indent,project)
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org