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 maven.py
Date Thu, 20 May 2004 13:14:09 GMT
ajack       2004/05/20 06:14:09

  Modified:    python/gump/build Tag: MultiRunner maven.py
  Log:
  Test/Fix...
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.7   +6 -6      gump/python/gump/build/Attic/maven.py
  
  Index: maven.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build/Attic/maven.py,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- maven.py	19 May 2004 21:14:19 -0000	1.1.2.6
  +++ maven.py	20 May 2004 13:14:09 -0000	1.1.2.7
  @@ -198,7 +198,7 @@
                   project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
    
       # The propertiesFile parameter is primarily for testing.
  -    def generateMavenProperties(self,propertiesFile=None):
  +    def generateMavenProperties(self,project,propertiesFile=None):
           """Set properties/overrides for a Maven project"""
           
           #:TODO: Does Maven have the idea of system properties?
  @@ -206,13 +206,13 @@
           #
           # Where to put this:
           #
  -        basedir = self.maven.getBaseDirectory() or self.getBaseDirectory()
  +        basedir = project.maven.getBaseDirectory() or project.getBaseDirectory()
           if not propertiesFile: 
               propertiesFile=os.path.abspath(os.path.join(	\
                       basedir,'build.properties'))
           
           if os.path.exists(propertiesFile):
  -            self.addWarning('Overriding Maven properties: ['+propertiesFile+']')
  +            project.addWarning('Overriding Maven properties: ['+propertiesFile+']')
       
           
           props=open(propertiesFile,'w')
  @@ -228,12 +228,12 @@
   #
   # DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT
EDIT
   # ------------------------------------------------------------------------
  -""")	%	(self.getName(), time.strftime('%Y-%m-%d %H:%M:%S')) )
  +""")	%	(project.getName(), time.strftime('%Y-%m-%d %H:%M:%S')) )
           
           #
           # Output basic properties
           #
  -        for property in self.getWorkspace().getProperties()+self.getMaven().getProperties():
  +        for property in project.getWorkspace().getProperties()+project.getMaven().getProperties():
               # build.sysclasspath makes Maven sick.
               if not 'build.sysclasspath' == property.name:
                   props.write(('%s=%s\n') % (property.name,property.value))            
  @@ -252,7 +252,7 @@
   # ------------------------------------------------------------------------
   """)
           
  -        (classpath,bootclasspath)=self.getClasspathObjects()
  +        (classpath,bootclasspath)=project.getClasspathObjects()
           
           # :TODO: write...
           for annotatedPath in classpath.getPathParts():
  
  
  

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


Mime
View raw message