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/build builder.py
Date Wed, 28 Jul 2004 15:50:30 GMT
ajack       2004/07/28 08:50:30

  Modified:    python/gump preview.py
               python/gump/runner runner.py
               python/gump/notify notification.py notifier.py
               python/gump/document/xdocs documenter.py
               python/gump/document resolver.py
               python/gump/run gumprun.py
               python/gump/build builder.py
  Log:
  Restored 'preview' after JavaHelper refactor.
  
  Revision  Changes    Path
  1.9       +5 -2      gump/python/gump/preview.py
  
  Index: preview.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/preview.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- preview.py	19 Jul 2004 16:07:53 -0000	1.8
  +++ preview.py	28 Jul 2004 15:50:29 -0000	1.9
  @@ -77,8 +77,11 @@
       if verbose:  
           # Show the workings
           runner=getRunner(run)
  +        
  +        #
           updater=runner.getUpdater()
           builder=runner.getBuilder()
  +        languageHelper=runner.getJavaHelper()
               
           for module in run.getGumpSet().getModules():
               print SEPARATOR
  @@ -96,7 +99,7 @@
                   print project.getXml()
               project.dump()
               if project.hasBuilder():
  -                builder.preview(project)
  +                builder.preview(project, languageHelper)
       
       # Show any nasties...
       if workspace.containsNasties():
  
  
  
  1.12      +16 -1     gump/python/gump/runner/runner.py
  
  Index: runner.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/runner/runner.py,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- runner.py	28 Jul 2004 01:26:08 -0000	1.11
  +++ runner.py	28 Jul 2004 15:50:29 -0000	1.12
  @@ -55,9 +55,15 @@
           self.updater=GumpUpdater(run)
           self.builder=GumpBuilder(run)
           
  +        
  +        # A helper per language/type
  +        # Note: All are Java right now...
  +        self.java=gump.java.helper.JavaHelper(run)
  +        
           # Stash them for reference...
           run.setUpdater(self.updater)
  -        run.setBuilder(self.builder)
  +        run.setBuilder(self.builder)        
  +        run.setJavaHelper(self.java)
           
       def initialize(self,exitOnError=True):
           
  @@ -157,6 +163,15 @@
           
       def getBuilder(self):
           return self.builder
  +        
  +    def getJavaHelper(self):
  +        """
  +        
  +        Return the language specific helper
  +         
  +        """
  +        return self.java
  +        
           
       #
       # Call a method called 'documentRun(run)'
  
  
  
  1.7       +19 -5     gump/python/gump/notify/notification.py
  
  Index: notification.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/notify/notification.py,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- notification.py	21 Jul 2004 14:54:34 -0000	1.6
  +++ notification.py	28 Jul 2004 15:50:29 -0000	1.7
  @@ -199,6 +199,9 @@
           
           
       def resolveAnnotations(self, resolver, stream):
  +        """
  +        Resolve any annotations on the entity
  +        """
             
           #
           # Add an info/error/etc...
  @@ -211,7 +214,10 @@
                   stream.write(' -%s- %s\n' % (upper(levelName(note.level)), note.text))
           
       def resolveWork(self, resolver, stream):
  -    
  +        """
  +        Resolve any work entries on the entity
  +        """
  +              
           #
           # Work
           #
  @@ -227,11 +233,17 @@
       
           
       def resolveStats(self, resolver, stream):
  +        """
  +        Resolve any stats on the entity
  +        """
  +          
           stats=self.entity.getStats()
           stream.write('\n\n')
           
  -    def resolveSyndication(self, resolver, stream):
  -        
  +    def resolveSyndication(self, resolver, stream): 
  +        """
  +        Resolve syndication links on the entity
  +        """
           stream.write('\n')
           stream.write('To subscribe to this information via syndicated feeds:')
           stream.write('\n')
  @@ -243,8 +255,10 @@
           stream.write(' RSS: ' + rssurl + '\n')
           stream.write(' Atom: ' + atomurl + '\n')
           
  -    def resolveFooter(self, resolver, id, stream):
  -        
  +    def resolveFooter(self, resolver, id, stream):        
  +        """
  +        Resolve footer (Gump identification information)
  +        """
           stream.write('\n\n--\n')
           if id:
               stream.write('Gump E-mail Identifier (within run) #%s.\n' % id )
  
  
  
  1.13      +8 -2      gump/python/gump/notify/notifier.py
  
  Index: notifier.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/notify/notifier.py,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- notifier.py	22 Jul 2004 02:54:38 -0000	1.12
  +++ notifier.py	28 Jul 2004 15:50:29 -0000	1.13
  @@ -263,7 +263,7 @@
                           subject,content)
       
       def notifyModule(self,module,notification):
  -        """ Notify to a specific module's <notify entry """
  +        """ Notify to a specific module's <nag entries """
           
           # Form the content...
           content=notification.resolveContent(self.resolver, self.getNextIdentifier())
  @@ -273,11 +273,14 @@
                   ': '+module.getName()+' '+	\
                   lower(stateDescription(module.getState()))
                       
  +        if notification.isWarning():
  +            subject += ', but with warnings.'
  +            
           self.sendEmails(self.getAddressPairs(module),subject,content)
               
       
       def notifyProject(self,project,notification):
  -        """ Notify to a specific project's <notify entry """
  +        """ Notify to a specific project's <nag entries """
           module=project.getModule()
       
           #
  @@ -289,6 +292,9 @@
           subject=self.workspace.prefix+': '	\
               + module.getName() + '/' +project.getName()	\
               +' '+lower(stateDescription(project.getState()))
  +            
  +        if notification.isWarning():
  +            subject += ', but with warnings.'
                       
           # Send those e-mails
           self.sendEmails(self.getAddressPairs(project),subject,content)
  
  
  
  1.24      +1 -1      gump/python/gump/document/xdocs/documenter.py
  
  Index: documenter.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- documenter.py	28 Jul 2004 01:26:09 -0000	1.23
  +++ documenter.py	28 Jul 2004 15:50:30 -0000	1.24
  @@ -1818,7 +1818,7 @@
               if project.hasAnt():                
                   self.documentProperties(miscSection, project.getAnt(), 'Ant Properties')
               
  -            javaHelper=self.run.getBuilder().getJavaLanguageHelper()            
  +            javaHelper=self.run.getJavaHelper()            
               (classpath,bootclasspath)=javaHelper.getClasspathObjects(project)         
  
               self.displayClasspath(miscSection, classpath, 'Classpath', project)       

               self.displayClasspath(miscSection, bootclasspath, 'Boot Classpath', project)

  
  
  
  1.32      +1 -1      gump/python/gump/document/resolver.py
  
  Index: resolver.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/resolver.py,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- resolver.py	19 Jul 2004 16:07:56 -0000	1.31
  +++ resolver.py	28 Jul 2004 15:50:30 -0000	1.32
  @@ -130,7 +130,7 @@
      
   def getShortenedPath(path,index):
       """
  -    	Trim a path
  +    	Create a trimmed path (from index to end)
       """
       return Path(path[index:len(path)])
           
  
  
  
  1.3       +7 -0      gump/python/gump/run/gumprun.py
  
  Index: gumprun.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/run/gumprun.py,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gumprun.py	28 Jul 2004 01:26:09 -0000	1.2
  +++ gumprun.py	28 Jul 2004 15:50:30 -0000	1.3
  @@ -120,6 +120,13 @@
       def getUpdater(self):
           return self.updater
   
  +    def setJavaHelper(self,javaHelper):
  +        self.javaHelper=javaHelper
  +        
  +    def getJavaHelper(self):
  +        return self.javaHelper
  +        
  +    
       def getRunGuid(self):
           return self.guid
           
  
  
  
  1.11      +1 -14     gump/python/gump/build/builder.py
  
  Index: builder.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build/builder.py,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- builder.py	28 Jul 2004 01:26:09 -0000	1.10
  +++ builder.py	28 Jul 2004 15:50:30 -0000	1.11
  @@ -75,20 +75,7 @@
           self.script=ScriptBuilder(run)
   
           # Place repository in jardir (to be renamed to repodir)
  -        self.repository=self.run.getOutputsRepository()
  -        
  -        # A helper per language/type
  -        # Note: All are Java right now...
  -        self.java=gump.java.helper.JavaHelper(run)
  -
  -
  -    def getJavaLanguageHelper(self):
  -        """
  -        
  -        Return the language specific helper
  -         
  -        """
  -        return self.java
  +        self.repository=self.run.getOutputsRepository()        
               
       def buildProject(self,project):
           """
  
  
  

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


Mime
View raw message