gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump/python/gump/utils tools.py
Date Tue, 04 May 2004 15:12:52 GMT
ajack       2004/05/04 08:12:52

  Modified:    python/gump/document/forrest xdoc.py documenter.py
               project  depot.xml
               python/gump/utils tools.py
  Log:
  1) Tweaks to depot env.
  2) Trying to debug Hermes.
  
  Revision  Changes    Path
  1.7       +1 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- xdoc.py	4 May 2004 14:13:58 -0000	1.6
  +++ xdoc.py	4 May 2004 15:12:52 -0000	1.7
  @@ -143,7 +143,7 @@
           #    self.stream.seek(0)
           #    print(self.stream.read())
           #else:
  -        if not self.isTransient():
  +        if not self.isTransient():     
               self.stream.close()
               
       def map(self,raw):
  
  
  
  1.25      +11 -5     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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- documenter.py	4 May 2004 14:13:58 -0000	1.24
  +++ documenter.py	4 May 2004 15:12:52 -0000	1.25
  @@ -151,7 +151,9 @@
           
           Copy the main template (perhaps with site tweaks) to prepare
           
  -        """        
  +        """                
  +        log.info('Prepare Forrest work with template')
  +        
           #
           # First deleted the work tree (if exists), then ensure created
           #
  @@ -167,15 +169,15 @@
           # Copy over the local site defaults (if any)        
           forrestSiteTemplate=self.getForrestSiteTemplateDirectory()  
           if os.path.exists(forrestSiteTemplate):
  +            log.info('Prepare Forrest work with *site* template')            
               copyDirectories(forrestSiteTemplate,	\
                               forrestWorkDir,	\
                               workspace)                               
                                
           #    
  -        # Wipe the staging tree
  +        # Wipe the staging tree (to produce into).
           #   
  -        stagingDirectory=self.getForrestStagingDirectory(workspace)
  -        wipeDirectoryTree(stagingDirectory)
  +        wipeDirectoryTree(self.getForrestStagingDirectory(workspace))
                    
       def executeForrest(self,workspace):
           # The project tree
  @@ -2890,8 +2892,12 @@
           
           repoMap=xref.getRepositoryToModuleMap()
           repoList=createOrderedList(repoMap.keys())
  +        rcount=0
           if repoList:
               for repo in repoList:
  +                if not gumpSet.inRepositories(repo): continue
  +                rcount+=1
  +                
                   moduleList=createOrderedList(repoMap.get(repo))            
                   repoSection=document.createSection(repo.getName())            
                   self.insertLink( repo, xref, 	\
  @@ -2903,7 +2909,7 @@
                       moduleRepoRow=moduleRepoTable.createRow()
                       self.insertLink( module, xref, moduleRepoRow.createData())
                       
  -        else:
  +        if not rcount:
               document.createParagraph('No repositories')
             
           document.serialize()    
  
  
  
  1.45      +1 -0      gump/project/depot.xml
  
  Index: depot.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/depot.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- depot.xml	3 May 2004 21:58:43 -0000	1.44
  +++ depot.xml	4 May 2004 15:12:52 -0000	1.45
  @@ -249,6 +249,7 @@
       	debug="true">    	
   
           <depend project="depot-update" inherit="runtime"/>
  +        <depend project="commons-logging" inherit="runtime"/>
           <depend project="ant" inherit="runtime"/>
           
           <ant  basedir="update" buildfile="build-ant-sample.xml" target="gump" vm="1.4">
  
  
  
  1.24      +1 -0      gump/python/gump/utils/tools.py
  
  Index: tools.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/utils/tools.py,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- tools.py	26 Apr 2004 16:13:56 -0000	1.23
  +++ tools.py	4 May 2004 15:12:52 -0000	1.24
  @@ -165,6 +165,7 @@
               transferAnnotations(sync, annotatable)    
               
   def wipeDirectoryTree(dir):
  +    log.info('Wipe Directory [' + `dir` + ']') 
       if os.path.exists(dir):
           try:
               shutil.rmtree(dir)            
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message