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/model workspace.py
Date Fri, 19 Mar 2004 23:11:47 GMT
ajack       2004/03/19 15:11:47

  Modified:    python/gump/document forrest.py
               python/gump commandLine.py gumpenv.py engine.py config.py
               python/gump/model workspace.py
  Added:       python   license.txt
  Log:
  1) The license.txt I keep cutting and pasting, might as well go in.
  2) Trim the view of depends (to only those in run scope)
  3) Moved EXIT_CODEs to shared (and called them EXIT_CODES).
  
  Revision  Changes    Path
  1.113     +17 -9     gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- forrest.py	19 Mar 2004 22:06:43 -0000	1.112
  +++ forrest.py	19 Mar 2004 23:11:46 -0000	1.113
  @@ -1359,17 +1359,17 @@
           depees = 0
           
           depens += self.documentDependenciesList(dependencySection, "Project Dependencies",
\
  -                    project.getDirectDependencies(), 0, 0, project)
  +                    project.getDirectDependencies(), 0, 0, project, gumpSet)
                       
           depees += self.documentDependenciesList(dependencySection, "Project Dependees",
	\
  -                    project.getDirectDependees(), 1, 0, project)
  +                    project.getDirectDependees(), 1, 0, project, gumpSet)
                       
           if project.isVerboseOrDebug():
               self.documentDependenciesList(dependencySection, "Full Project Dependencies",
\
  -                    project.getFullDependencies(), 0, 1, project)
  +                    project.getFullDependencies(), 0, 1, project, gumpSet)
                                                   
               self.documentDependenciesList(dependencySection, "Full Project Dependees",
	\
  -                    project.getFullDependees(), 1, 1, project)
  +                    project.getFullDependees(), 1, 1, project, gumpSet)
           
           deps = depees + depens
           
  @@ -1438,7 +1438,7 @@
           if not paths:        
               pathTable.createLine('No ' + title + ' entries')
                        
  -    def documentDependenciesList(self,xdocNode,title,dependencies,dependees,full,referencingObject):
       
  +    def documentDependenciesList(self,xdocNode,title,dependencies,dependees,full,referencingObject,gumpSet):
       
           totalDeps=0
                   
           if dependencies:
  @@ -1450,6 +1450,11 @@
               dependencyTable=dependencySection.createTable(titles)
               for depend in dependencies:
                   
  +                # Don't document out of scope...
  +                if not gumpSet.inProjectSequence(depend.getProject()) \
  +                    or not gumpSet.inProjectSequence(depend.getOwnerProject()) : 
  +                    continue      
  +                
                   totalDeps += 1
                   
                   # Project/Owner
  @@ -1468,7 +1473,10 @@
                       type+='Runtime'              
                   if depend.isOptional():
                       if type: type += ' '
  -                    type+='Optional'                
  +                    type+='Optional'               
  +                if depend.isNoClasspath():
  +                    if type: type += ' '
  +                    type+='NoClasspath'                
                   dependencyRow.createData(type)
                   
                   # Inheritence
  
  
  
  1.2       +0 -1      gump/python/gump/commandLine.py
  
  Index: commandLine.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/commandLine.py,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- commandLine.py	16 Mar 2004 19:50:14 -0000	1.1
  +++ commandLine.py	19 Mar 2004 23:11:46 -0000	1.2
  @@ -110,7 +110,6 @@
                   self.options.setText(1)
                   log.info('Use text (not forrest).')
   
  -
           if len(argv)>2 and argv[1] in ['-w','--workspace']:
               self.args.append(argv[2])
               del argv[1:3]
  
  
  
  1.2       +3 -3      gump/python/gump/gumpenv.py
  
  Index: gumpenv.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/gumpenv.py,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gumpenv.py	16 Mar 2004 19:50:14 -0000	1.1
  +++ gumpenv.py	19 Mar 2004 23:11:46 -0000	1.2
  @@ -28,7 +28,7 @@
   
   from gump import log
   
  -from gump.config import dir, default, basicConfig
  +from gump.config import *
   
   from gump.utils.note import Annotatable
   from gump.utils.work import *
  @@ -177,7 +177,7 @@
               print " Unable to detect/test mandatory [" + command+ "] in path (see next)."
               for p in sys.path:
                   print "  " + str(os.path.abspath(p))
  -            sys.exit(MISSING_UTILITY)
  +            sys.exit(EXIT_CODE_MISSING_UTILITY)
           
           # Store the output
           if logOutput and result.output:
  @@ -207,7 +207,7 @@
                       print "  " + e + " = " + v
                   except:
                       print "  " + e 
  -            sys.exit(BAD_ENVIRONMENT)
  +            sys.exit(EXIT_CODE_BAD_ENVIRONMENT)
       
           return ok
           
  
  
  
  1.93      +6 -6      gump/python/gump/engine.py
  
  Index: engine.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/engine.py,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- engine.py	18 Mar 2004 23:24:56 -0000	1.92
  +++ engine.py	19 Mar 2004 23:11:46 -0000	1.93
  @@ -96,9 +96,9 @@
           # Return an exit code based off success
           # :TODO: Move onto run
           if run.getWorkspace().isSuccess():
  -            result = SUCCESS 
  +            result = EXIT_CODE_SUCCESS 
           else: 
  -            result = FAILED
  +            result = EXIT_CODE_FAILED
           
           return result  
       
  @@ -195,9 +195,9 @@
           # Return an exit code based off success
           # :TODO: Move onto run
           if run.getWorkspace().isSuccess():
  -            result = SUCCESS 
  +            result = EXIT_CODE_SUCCESS 
           else: 
  -            result = FAILED
  +            result = EXIT_CODE_FAILED
           
           return result
     
  @@ -336,9 +336,9 @@
           # Return an exit code based off success
           # :TODO: Move onto run
           if run.getWorkspace().isSuccess():
  -            result = SUCCESS 
  +            result = EXIT_CODE_SUCCESS 
           else: 
  -            result = FAILED        
  +            result = EXIT_CODE_FAILED        
           return result
           
       
  
  
  
  1.17      +5 -0      gump/python/gump/config.py
  
  Index: config.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/config.py,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- config.py	15 Mar 2004 22:07:07 -0000	1.16
  +++ config.py	19 Mar 2004 23:11:46 -0000	1.17
  @@ -27,6 +27,11 @@
   
   from gump import log
   
  +EXIT_CODE_SUCCESS=0
  +EXIT_CODE_FAILED=1
  +EXIT_CODE_MISSING_UTILITY=2
  +EXIT_CODE_BAD_ENVIRONMENT=3
  +
   class dir:
       """Configuration of paths"""
   
  
  
  
  1.1                  gump/python/license.txt
  
  Index: license.txt
  ===================================================================
  
  # Copyright 2003-2004 The Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  # 
  #     http://www.apache.org/licenses/LICENSE-2.0
  # 
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
  
  
  1.36      +0 -6      gump/python/gump/model/workspace.py
  
  Index: workspace.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- workspace.py	18 Mar 2004 23:56:44 -0000	1.35
  +++ workspace.py	19 Mar 2004 23:11:47 -0000	1.36
  @@ -41,12 +41,6 @@
   # :TODO: Need to createa GumpEnvironment to move these to..
   #
   
  -SUCCESS=0
  -FAILED=1
  -MISSING_UTILITY=2
  -BAD_ENVIRONMENT=3
  -
  -
   class Workspace(NamedModelObject, PropertyContainer, Statable, Resultable):
       """Gump Workspace"""
       def __init__(self,xmlworkspace):
  
  
  

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


Mime
View raw message