cvs commit: jakarta-gump/python/gump check.py model.py

[ru...@apache.org]

rubys       2003/05/07 05:42:22

  Modified:    python/gump check.py model.py
  Log:
  Most modules only contain a single project.  For those that contain
  multiple projects, often there isn't a separate URL for the project
  and module.  In the few cases that there are both, the project URL
  is generally the more useful, and links back to the module URL.
  
  For these reasons, I believe that it is simpler and better for check
  to present a single URL for missing projects.
  
  Revision  Changes    Path
  1.9       +1 -2      jakarta-gump/python/gump/check.py
  
  Index: check.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/check.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- check.py	5 May 2003 21:46:16 -0000	1.8
  +++ check.py	7 May 2003 12:42:22 -0000	1.9
  @@ -128,12 +128,11 @@
         print "  ",currentmodule.description
         print
         print "   project url: " , currentproject.url.href
  -      print "   module  url: " , currentmodule.url.href
         print "   module  cvs: " , currentmodule.cvsroot()
         if currentmodule.redistributable:
           print  
           print "   NOTE: You can also get it in the Gump jar repository." 
  -        print "         See http://jakarta.apache,org/gump/ for details."
  +        print "         See http://jakarta.apache.org/gump/ for details."
           
       else:
         print "   Gump doesn't know about it. Or it's wrong, or you have to "
  
  
  
  1.12      +9 -8      jakarta-gump/python/gump/model.py
  
  Index: model.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- model.py	5 May 2003 17:46:00 -0000	1.11
  +++ model.py	7 May 2003 12:42:22 -0000	1.12
  @@ -63,7 +63,7 @@
   from gump import GumpBase, Named, Single, Multiple
   from gump.conf import dir, default
   
  -    
  +
   ###############################################################################
   # Initialize
   ###############################################################################
  @@ -139,6 +139,7 @@
       self.srcdir=os.path.join(str(workspace.basedir),self.srcdir or self.name)
       for project in self.project:
         if not project.module: project.module=self.name
  +      if not project.url and self.url: project.url=self.url
   
   # represents a <repository/> element
   class Repository(Named):
  @@ -200,7 +201,7 @@
           self.home=os.path.normpath(os.path.join(srcdir,self.home.nested))
         elif self.home.parent:
           self.home=os.path.normpath(os.path.join(workspace.basedir,self.home.parent))
  -    elif not self.home: 
  +    elif not self.home:
         if type(self.package) in types.StringTypes:
           self.home=os.path.join(workspace.pkgdir,self.package)
         elif self.module:
  @@ -364,7 +365,7 @@
         except:
           log.debug( traceback.format_stack() )
           log.warn( "Cannot resolve srcdir of " + self.project + " for " + project.name)
  -        
  +
       elif self.reference=='jarpath':
         try:
           target=Project.list[self.project]
  @@ -385,7 +386,7 @@
           else:
             raise str("Project %s referenced by %s defines no jars as output" %
               (target.name, project.name))
  -        
  +
         except:
           log.debug( traceback.format_stack() )
           log.warn( "Cannot resolve jarpath of " + self.project + " for " + project.name)
  @@ -393,7 +394,7 @@
   # TODO: set up the below elements with defaults using complete()
   
   # represents a <depend/> element
  -class Depend(GumpBase): 
  +class Depend(GumpBase):
     def jars(self):
       result=[]
       ids=(self.ids or '').split(' ')