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 engine.py
Date Thu, 20 Nov 2003 21:47:55 GMT
ajack       2003/11/20 13:47:55

  Modified:    python/gump engine.py
  Log:
  Don't try to build packages (so won't stumble w/o an <ant entry.)
  
  Revision  Changes    Path
  1.9       +19 -18    jakarta-gump/python/gump/engine.py
  
  Index: engine.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- engine.py	20 Nov 2003 20:51:49 -0000	1.8
  +++ engine.py	20 Nov 2003 21:47:55 -0000	1.9
  @@ -363,33 +363,34 @@
           repository=run.getOutputsRepository()
   
           # build all projects this project depends upon, then the project itself
  -        for project in sequence:                 
  +        for project in sequence:  
  +            if project.isPackaged(): continue
  +            
               if project.okToPerformWork():     
                   self.performPreBuild( run, project )
   
               if project.okToPerformWork():        
                   log.debug(' ------ Building: ' + project.getName())
   
  -            cmd=project.getBuildCommand()
  +                cmd=project.getBuildCommand()
   
  -            if cmd:
  -                # Execute the command ....
  -                cmdResult=execute(cmd,workspace.tmpdir)
  +                if cmd:
  +                    # Execute the command ....
  +                    cmdResult=execute(cmd,workspace.tmpdir)
       
  -                # Update Context    
  -                work=CommandWorkItem(WORK_TYPE_BUILD,cmd,cmdResult)
  -                project.performedWork(work)
  +                    # Update Context    
  +                    work=CommandWorkItem(WORK_TYPE_BUILD,cmd,cmdResult)
  +                    project.performedWork(work)
               
  -                # Update Context w/ Results  
  -                if not cmdResult.state==CMD_STATE_SUCCESS:
  -                    reason=REASON_BUILD_FAILED
  -                    if cmdResult.state==CMD_STATE_TIMED_OUT:
  -                        reason=REASON_BUILD_TIMEDOUT
  -                    project.changeState(STATE_FAILED,reason)
  -                else:
  -                         
  -                    # For now, things are going good...
  -                    project.changeState(STATE_SUCCESS)
  +                    # Update Context w/ Results  
  +                    if not cmdResult.state==CMD_STATE_SUCCESS:
  +                        reason=REASON_BUILD_FAILED
  +                        if cmdResult.state==CMD_STATE_TIMED_OUT:
  +                            reason=REASON_BUILD_TIMEDOUT
  +                        project.changeState(STATE_FAILED,reason)
  +                    else:                         
  +                        # For now, things are going good...
  +                        project.changeState(STATE_SUCCESS)
                       
               if project.okToPerformWork():                 
                   # Double check the outputs...
  
  
  

Mime
View raw message