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/python/gump logic.py document.py
Date Fri, 03 Oct 2003 21:10:36 GMT
ajack       2003/10/03 14:10:36

  Modified:    python/gump logic.py document.py
  Log:
  1) Had a logic bug, too many modules were marked 'complete' due to package install. Attempted
to fix that.
  2) Add classpath list to the documentation pages, to try to track down the state of play
there.
  
  Revision  Changes    Path
  1.14      +19 -9     jakarta-gump/python/gump/logic.py
  
  Index: logic.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- logic.py	2 Oct 2003 16:15:29 -0000	1.13
  +++ logic.py	3 Oct 2003 21:10:36 -0000	1.14
  @@ -280,7 +280,7 @@
   def getOutputsList(project):
       outputs=[]
       for i in range(0,len(project.jar)):
  -        # :TODO: Hack to avoid a crash
  +        # :TODO: Hack to avoid a crash, don't know why it is needed...
           if project.jar[i].path:
               jar=os.path.normpath(project.jar[i].path)
               outputs.append(jar)        
  @@ -440,7 +440,21 @@
           allPackaged=1
           for project in module.project:
               if not isPackaged(project):
  -                if not hasOutputs(project):
  +                allPackaged=0  
  +            else:
  +                mctxt.addInfo('Packaged Project: ' + project.name)
  +                packageCount+=1
  +                
  +        # Must be one to be all
  +        if not packageCount: allPackaged=0
  +    
  +        # Give this module a second try, and since some are packaged
  +        # check if the others have no outputs, then call them good.
  +        if packageCount and not allPackaged:
  +            allPackaged=1
  +            for project in module.project:
  +                if not isPackaged(project):
  +                    if not hasOutputs(project):
                           # 
                           # Honorary package (allow folks to only mark the main
                           # project in a module as a package, and those that do
  @@ -455,13 +469,9 @@
                       allPackaged=0  
                       if packageCount:
                           mctxt.addWarning("Incomplete \'Packaged\' Module. Project: " +
\
  -                                    project.name + " is not packaged")   
  -            else:
  -                packageCount+=1
  -                
  -        # Must be one to be all
  -        if not packageCount: allPackaged=0
  -                
  +                                    project.name + " is not packaged")  
  +               
  +        # If packages module, accept it... 
           if allPackaged:
               mctxt.status=STATUS_COMPLETE
               mctxt.reason=REASON_PACKAGE
  
  
  
  1.61      +12 -0     jakarta-gump/python/gump/document.py
  
  Index: document.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- document.py	1 Oct 2003 18:19:13 -0000	1.60
  +++ document.py	3 Oct 2003 21:10:36 -0000	1.61
  @@ -651,6 +651,18 @@
       documentProjectContextList(x,"Optional Project Dependencies",projectcontext.options)
                     
       documentProjectContextList(x,"Project Dependees",projectcontext.dependees)        
   
       documentProjectContextList(x,"Optional Project Dependees",projectcontext.optionees)
                 
  +
  +    startSectionXDoc(x,title)
  +    startTableXDoc(x)
  +    x.write('      <tr><th>Path Entry</th></tr>')
  +       
  +    classpath=getClasspathList(project,workspace)
  +    for path in classpath:
  +        startTableRowXDoc(x)    
  +        insertTableDataXDoc(x,path)
  +        endTableRowXDoc(x)
  +    endTableXDoc(x)
  +    endSectionXDoc(x)
          
   #    x.write('<p><strong>Project Config :</strong> <link href=\'%s\'>XML</link></p>'
\
   #                % (getModuleProjectRelativeUrl(modulename,projectcontext.name)) )
  
  
  

Mime
View raw message