gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: jakarta-gump gumpy.sh
Date Wed, 10 Sep 2003 21:43:54 GMT
ajack       2003/09/10 14:43:54

  Modified:    python/gump rss.py context.py build.py document.py
               .        gumpy.sh
  Log:
  1) Some progress with RSS.
  2) Some documentation additions (niceties)
  
  Revision  Changes    Path
  1.6       +7 -8      jakarta-gump/python/gump/rss.py
  
  Index: rss.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/rss.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rss.py	9 Sep 2003 23:37:48 -0000	1.5
  +++ rss.py	10 Sep 2003 21:43:54 -0000	1.6
  @@ -113,11 +113,10 @@
                       s=db.getProjectStats(pctxt.name)
                       
                       # State changes that are newsworthy...
  -                    # :TODO: Remove 1, this is for testing...
  -                    #if not s.currentState == s.previousState \
  -                    #  and not s.currentState == STATUS_PREREQ_FAILURE \
  -                    #  and not s.currentState == STATUS_COMPLETE :
  -                    if 1:
  +                    if not s.currentState == s.previousState \
  +                        and not s.currentState == STATUS_PREREQ_FAILURE \
  +                        and not s.currentState == STATUS_NONE \
  +                        and not s.currentState == STATUS_COMPLETE :
                           project=pctxt.project
                               
                           log.info("RSS written for " + pctxt.name); 
  
  
  
  1.4       +2 -1      jakarta-gump/python/gump/context.py
  
  Index: context.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/context.py,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- context.py	8 Sep 2003 18:13:11 -0000	1.3
  +++ context.py	10 Sep 2003 21:43:54 -0000	1.4
  @@ -206,7 +206,8 @@
           
   class CommandWorkItem(TimedWorkItem):
       """ Unit of Work"""
  -    def __init__(self,type,command,result,message=''):
  +    def __init__(self,type,command,result=None,message=''):
  +        if not result: result=CmdResult(command)
           TimedWorkItem.__init__(self,type,commandStatusToWorkStatus(result.status),result.elapsed,message)
           self.command=command
           self.result=result
  
  
  
  1.10      +5 -5      jakarta-gump/python/gump/build.py
  
  Index: build.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/build.py,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.py	5 Sep 2003 05:20:42 -0000	1.9
  +++ build.py	10 Sep 2003 21:43:54 -0000	1.10
  @@ -147,8 +147,8 @@
         
       if mctxt.okToPerformWork() and Module.list.has_key(module.name):
           module=Module.list[module.name];
  -        sourcedir = os.path.normpath(os.path.join(workspace.cvsdir,module.name)) # todo
allow override
  -        destdir = os.path.normpath(workspace.basedir)
  +        sourcedir = os.path.abspath(os.path.join(workspace.cvsdir,module.name)) # todo
allow override
  +        destdir = os.path.abspath(workspace.basedir)
           
           # :TODO: Make this configurable (once again)
           #if not workspace.sync:
  
  
  
  1.17      +31 -19    jakarta-gump/python/gump/document.py
  
  Index: document.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- document.py	10 Sep 2003 14:25:08 -0000	1.16
  +++ document.py	10 Sep 2003 21:43:54 -0000	1.17
  @@ -170,7 +170,7 @@
       forrestSeed=Cmd('cp','forrest_seed',forrest)
       forrestSeed.addParameter('-Rf')
       forrestSeed.addParameter(forrestTemplate)    
  -    forrestSeed.addParameter(workspace.basedir)    
  +    forrestSeed.addParameter(os.path.abspath(workspace.basedir))    
       forrestSeedResult=execute(forrestSeed)
       work=CommandWorkItem(WORK_TYPE_DOCUMENT,forrestSeed,forrestSeedResult)
       context.performedWork(work)
  @@ -215,6 +215,14 @@
   
       #forrest.addPrefixedParameter('-D','project.skinconf', \
       #    getWorkspaceSiteDir(workspace), '=' )
  +    
  +    # A sneak preview ... 
  +    work=CommandWorkItem(WORK_TYPE_DOCUMENT,forrest)
  +    context.performedWork(work)
  +    
  +    #
  +    # Do the actual work...
  +    #
       forrestResult=execute(forrest)
   
       # Update Context    
  @@ -296,8 +304,8 @@
       endSectionXDoc(x)       
       
       x.write('<p><strong>Context Tree:</strong> <link href=\'context.html\'>context</link></p>')
  -    x.write('<p><strong>Workspace Config:</strong> <link href=\'xml.txt\'>XML</link></p>')
  -    x.write('<p><strong>RSS :</strong> <link href=\'index.rss\'>News
Feed</link></p>')
  +    # x.write('<p><strong>Workspace Config:</strong> <link href=\'xml.txt\'>XML</link></p>')
  +    # x.write('<p><strong>RSS :</strong> <link href=\'index.rss\'>News
Feed</link></p>')
       
       documentWorkList(x,workspace,context.worklist,'Workspace-level Work',wdir)
        
  @@ -382,7 +390,7 @@
       startSectionXDoc(x,'Module Details')
       startListXDoc(x)
       addItemXDoc(x,"Status: " + stateName(modulecontext.status))
  -    if modulecontext.cause:
  +    if modulecontext.cause and not modulecontext==modulecontext.cause:
           addItemXDoc(x, "Cause:", "<link href='%s'>%s</link>" % \
               (getContextUrl(modulecontext.cause), \
                   modulecontext.cause.name))    
  @@ -432,7 +440,7 @@
       startSectionXDoc(x,'Details')
       startListXDoc(x)
       addItemXDoc(x,"Status: ", stateName(projectcontext.status))  
  -    if projectcontext.cause:
  +    if projectcontext.cause and not projectcontext==projectcontext.cause:
           addItemXDoc(x,"Cause:", "<link href='%s'>%s</link>" % \
               (getContextUrl(projectcontext.cause), projectcontext.cause.name))
       addItemXDoc(x,"Elapsed: ", str(projectcontext.elapsedSecs()))
  @@ -453,7 +461,8 @@
           startSectionXDoc(x,"Project Dependencies")
           startListXDoc(x)
           for depend in projectcontext.depends:
  -          addItemXDoc(x,depend.name)
  +          addItemXDoc(x,"<link href='%s'>%s</link>" % \
  +                (getContextUrl(depend), depend.name))
           endListXDoc(x)
           endSectionXDoc(x)
               
  @@ -461,7 +470,8 @@
           startSectionXDoc(x,"Optional Project Dependencies")
           startListXDoc(x)
           for option in projectcontext.options:
  -          addItemXDoc(x,option.name)
  +           addItemXDoc(x,"<link href='%s'>%s</link>" % \
  +                (getContextUrl(option), option.name))
           endListXDoc(x)
           endSectionXDoc(x)
                         
  @@ -469,15 +479,17 @@
           startSectionXDoc(x,"Project Dependees")
           startListXDoc(x)
           for depend in projectcontext.dependees:
  -          addItemXDoc(x,depend.name)
  +          addItemXDoc(x,"<link href='%s'>%s</link>" % \
  +                (getContextUrl(depend), depend.name))
           endListXDoc(x)
           endSectionXDoc(x)
               
       if projectcontext.optionees:
           startSectionXDoc(x,"Optional Project Dependees")
           startListXDoc(x)
  -        for option in projectcontext.optionees:
  -          addItemXDoc(x,option.name)
  +        for option in projectcontext.optionees:        
  +           addItemXDoc(x,"<link href='%s'>%s</link>" % \
  +                (getContextUrl(option), option.name))
           endListXDoc(x)
           endSectionXDoc(x)
                     
  @@ -776,52 +788,52 @@
   #    return sdir    
       
   def getForrestTemplateDir():
  -    fdir=os.path.normpath(os.path.join(dir.template,'forrest'))
  +    fdir=os.path.abspath(os.path.join(dir.template,'forrest'))
       return fdir  
       
   def getForrestSiteTemplateDir():
  -    fdir=os.path.normpath(os.path.join(dir.template,'site-forrest'))
  +    fdir=os.path.abspath(os.path.join(dir.template,'site-forrest'))
       return fdir  
         
   def getForrestDir(workspace):
  -    fdir=os.path.normpath(os.path.join(workspace.basedir,'forrest'))
  +    fdir=os.path.abspath(os.path.join(workspace.basedir,'forrest'))
       if not os.path.exists(fdir): os.mkdir(fdir)
       return fdir  
       
   def getContentDir(workspace,forrestdir=None):
       fdir=forrestdir or getForrestDir(workspace)
  -    cdir=os.path.normpath(os.path.join(fdir,'content'))
  +    cdir=os.path.abspath(os.path.join(fdir,'content'))
       if not os.path.exists(cdir): os.mkdir(cdir)
       return cdir  
       
   def getWorkspaceDir(workspace,contentdir=None):
       cdir = contentdir or getContentDir(workspace)
  -    xdir=os.path.normpath(os.path.join(getContentDir(workspace),'xdocs'))
  +    xdir=os.path.abspath(os.path.join(getContentDir(workspace),'xdocs'))
       if not os.path.exists(xdir): os.mkdir(xdir)
       return xdir  
       
   def getStatisticsDir(workspace,workspacedir=None):
       wdir=workspacedir or getWorkspaceDir(workspace)
  -    sdir=os.path.normpath(os.path.join(wdir,'gump_stats'))
  +    sdir=os.path.abspath(os.path.join(wdir,'gump_stats'))
       if not os.path.exists(sdir): os.mkdir(sdir)
       return sdir
       
   def getXRefDir(workspace,workspacedir=None):
       wdir=workspacedir or getWorkspaceDir(workspace)
  -    xdir=os.path.normpath(os.path.join(wdir,'xref'))
  +    xdir=os.path.abspath(os.path.join(wdir,'xref'))
       if not os.path.exists(xdir): os.mkdir(xdir)
       return xdir
       
   def getModuleDir(workspace,modulename,workspacedir=None):
       mdir=gumpSafeName(modulename)
       if not workspacedir: workspacedir = getWorkspaceDir(workspace)
  -    xdir=os.path.normpath(os.path.join(workspacedir,mdir))
  +    xdir=os.path.abspath(os.path.join(workspacedir,mdir))
       if not os.path.exists(xdir): os.mkdir(xdir)
       return xdir
   
   def getWorkDir(rootdir,type):
       tdir=gumpSafeName(lower(workTypeName(type)))
  -    wdir=os.path.normpath(os.path.join(rootdir,tdir))
  +    wdir=os.path.abspath(os.path.join(rootdir,tdir))
       if not os.path.exists(wdir): os.mkdir(wdir)
       return wdir    
    
  
  
  
  1.10      +1 -1      jakarta-gump/gumpy.sh
  
  Index: gumpy.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/gumpy.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- gumpy.sh	10 Sep 2003 18:08:32 -0000	1.9
  +++ gumpy.sh	10 Sep 2003 21:43:54 -0000	1.10
  @@ -118,7 +118,7 @@
   #
   cd $GUMP_PYTHON
   echo $SEPARATOR >> $GUMP_LOG
  -python gump/check.py -w ../${GUMP_WORKSPACE}.xml >> $GUMP_LOG 2>&1
  +python gump/check.py -w ../${GUMP_WORKSPACE}.xml ${GUMP_TARGET} >> $GUMP_LOG 2>&1
   
   #
   # Do the integration run
  @@ -162,10 +162,9 @@
   pkill -P $$ 
   
   # $Log$
  -# Revision 1.9  2003/09/10 18:08:32  ajack
  -# Uncommented the check.py I added ages ago, it is likely worth the cycles...
  -# ... even though integrate.py ought be as informative as it works on the
  -# tree.
  +# Revision 1.10  2003/09/10 21:43:54  ajack
  +# 1) Some progress with RSS.
  +# 2) Some documentation additions (niceties)
   #
   # Revision 1.2  2003/05/30 22:02:56  nickchalko
   # Fixing incomplete update from Adam
  
  
  

Mime
View raw message