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/model project.py
Date Wed, 11 Feb 2004 23:35:54 GMT
ajack       2004/02/11 15:35:54

  Modified:    python/gump engine.py
               python/gump/model project.py
  Log:
  Might as well publish the maven.log file.
  
  Revision  Changes    Path
  1.55      +17 -2     jakarta-gump/python/gump/engine.py
  
  Index: engine.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- engine.py	11 Feb 2004 22:07:24 -0000	1.54
  +++ engine.py	11 Feb 2004 23:35:54 -0000	1.55
  @@ -499,7 +499,7 @@
           if project.okToPerformWork() and project.hasMaven():
               try:
                   propertiesFile=project.generateMavenProperties()                      
         
  -                project.addInfo('Maven Properties in: ' + propertiesFile)
  +                project.addDebug('Maven Properties in: ' + propertiesFile)
                   
                   try:
                       catFileAsWork(project,propertiesFile,	\
  @@ -508,7 +508,7 @@
                       log.error('Display Properties [ ' + propertiesFile + '] Failed', exc_info=1)
  
                   
               except:
  -                log.error('GenerateMavenProperties Failed', exc_info=1)    
  +                log.error('Generate Maven Properties Failed', exc_info=1)    
                   project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
               
           if not project.okToPerformWork():
  @@ -577,6 +577,21 @@
                   project.addInfo('Reports in: ' + reportDir)
                   catDirectoryContentsAsWork(project,reportDir)
       
  +        # Maven generates a maven.log...
  +        if project.hasMaven() and not project.isPackaged():
  +            try:
  +                logFile=project.locateMavenLog()                                
  +                project.addDebug('Maven Log in: ' + logFile)                
  +                try:
  +                    catFileAsWork(project,logFile,	\
  +                        project.getName() + ' ' + os.path.basename(logFile))
  +                except:
  +                    log.error('Display Log [ ' + logFile + '] Failed', exc_info=1)   
  +                
  +            except:
  +                log.warning('Display Maven Log Failed', exc_info=1)    
  +                # Not worth crapping out over...
  +            
                   
       """
       
  
  
  
  1.49      +15 -3     jakarta-gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- project.py	11 Feb 2004 22:39:44 -0000	1.48
  +++ project.py	11 Feb 2004 23:35:54 -0000	1.49
  @@ -1053,6 +1053,18 @@
   
           return propertiesFile
         
  +    def locateMavenLog(self):
  +        """Return Maven log location"""
  +        
  +        #
  +        # Where to put this:
  +        #
  +        basedir = self.maven.getBaseDirectory() or self.getBaseDirectory()
  +        logFile=os.path.abspath(os.path.join(\
  +                    basedir,'maven.log'))
  +        
  +        return logFile
  +        
       def dump(self, indent=0, output=sys.stdout):
           """ Display the contents of this object """
           output.write(getIndent(indent)+'Project: ' + self.getName() + '\n')
  
  
  

Mime
View raw message