gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r109494 - in gump/live/python/gump: actor/document/xdocs core/build core/model core/run
Date Thu, 02 Dec 2004 11:29:40 GMT
Author: bodewig
Date: Thu Dec  2 03:29:37 2004
New Revision: 109494

URL: http://svn.apache.org/viewcvs?view=rev&rev=109494
Log:
Merge rev 109349 from trunk - <make> and <configure> builders
Added:
   gump/live/python/gump/core/build/configure.py
      - copied unchanged from r109349, gump/trunk/python/gump/core/build/configure.py
   gump/live/python/gump/core/build/make.py
      - copied unchanged from r109349, gump/trunk/python/gump/core/build/make.py
Modified:
   gump/live/python/gump/actor/document/xdocs/resolver.py
   gump/live/python/gump/core/build/__init__.py
   gump/live/python/gump/core/build/builder.py
   gump/live/python/gump/core/model/builder.py
   gump/live/python/gump/core/model/project.py
   gump/live/python/gump/core/run/gumpenv.py

Modified: gump/live/python/gump/actor/document/xdocs/resolver.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/actor/document/xdocs/resolver.py?view=diff&rev=109494&p1=gump/live/python/gump/actor/document/xdocs/resolver.py&r1=109493&p2=gump/live/python/gump/actor/document/xdocs/resolver.py&r2=109494
==============================================================================
--- gump/live/python/gump/actor/document/xdocs/resolver.py	(original)
+++ gump/live/python/gump/actor/document/xdocs/resolver.py	Thu Dec  2 03:29:37 2004
@@ -42,7 +42,7 @@
 from gump.core.model.workspace import Workspace
 from gump.core.model.module import Module
 from gump.core.model.project import Project
-from gump.core.model.builder import Ant,NAnt,Maven,Script
+from gump.core.model.builder import Ant,NAnt,Maven,Script,Configure,Make
 from gump.core.model.object import *
 from gump.core.model.state import *
 
@@ -183,6 +183,8 @@
     elif isinstance(object, Ant) or \
         isinstance(object, NAnt) or \
         isinstance(object, Maven) or \
+        isinstance(object, Configure) or \
+        isinstance(object, Make) or \
         isinstance(object, Script) :
         index='Build'
     else:

Modified: gump/live/python/gump/core/build/__init__.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/build/__init__.py?view=diff&rev=109494&p1=gump/live/python/gump/core/build/__init__.py&r1=109493&p2=gump/live/python/gump/core/build/__init__.py&r2=109494
==============================================================================
--- gump/live/python/gump/core/build/__init__.py	(original)
+++ gump/live/python/gump/core/build/__init__.py	Thu Dec  2 03:29:37 2004
@@ -22,6 +22,6 @@
 
 
 # tell Python what modules make up the gump.test package
-__all__ = ["builder", "ant","script","maven", "java"]
+__all__ = ["builder", "ant","script","maven", "java","nant","configure","make"]
 
     

Modified: gump/live/python/gump/core/build/builder.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/build/builder.py?view=diff&rev=109494&p1=gump/live/python/gump/core/build/builder.py&r1=109493&p2=gump/live/python/gump/core/build/builder.py&r2=109494
==============================================================================
--- gump/live/python/gump/core/build/builder.py	(original)
+++ gump/live/python/gump/core/build/builder.py	Thu Dec  2 03:29:37 2004
@@ -49,6 +49,8 @@
 from gump.core.build.ant import AntBuilder
 from gump.core.build.nant import NAntBuilder
 from gump.core.build.maven import MavenBuilder
+from gump.core.build.configure import ConfigureBuilder
+from gump.core.build.make import MakeBuilder
 
 from gump.util import dump, display, getIndent, logResourceUtilization, \
                             invokeGarbageCollection
@@ -81,6 +83,8 @@
         self.nant=NAntBuilder(run)
         self.maven=MavenBuilder(run)
         self.script=ScriptBuilder(run)
+        self.configure = ConfigureBuilder(run)
+        self.make = MakeBuilder(run);
 
         # Place repository in repodir
         self.repository=self.run.getOutputsRepository()        
@@ -137,6 +141,10 @@
                     self.nant.buildProject(project, languageHelper, stats)
                 elif project.hasMaven():
                     self.maven.buildProject(project, languageHelper, stats)
+                elif project.hasConfigure():
+                    self.configure.buildProject(project, languageHelper, stats)
+                elif project.hasMake():
+                    self.make.buildProject(project, languageHelper, stats)
               
             # Do this even if not ok
             self.performPostBuild( project, languageHelper, stats )

Copied: gump/live/python/gump/core/build/configure.py (from r109349, gump/trunk/python/gump/core/build/configure.py)
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/build/configure.py?view=diff&rev=109494&p1=gump/trunk/python/gump/core/build/configure.py&r1=109349&p2=gump/live/python/gump/core/build/configure.py&r2=109494
==============================================================================

Copied: gump/live/python/gump/core/build/make.py (from r109349, gump/trunk/python/gump/core/build/make.py)
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/build/make.py?view=diff&rev=109494&p1=gump/trunk/python/gump/core/build/make.py&r1=109349&p2=gump/live/python/gump/core/build/make.py&r2=109494
==============================================================================

Modified: gump/live/python/gump/core/model/builder.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/model/builder.py?view=diff&rev=109494&p1=gump/live/python/gump/core/model/builder.py&r1=109493&p2=gump/live/python/gump/core/model/builder.py&r2=109494
==============================================================================
--- gump/live/python/gump/core/model/builder.py	(original)
+++ gump/live/python/gump/core/model/builder.py	Thu Dec  2 03:29:37 2004
@@ -255,6 +255,12 @@
     """ A NAnt command (within a project) """
     pass
     
+# represents a <make/> element
+# will probably need to extend Builder directly later
+class Make(BaseAnt):
+    """ A make command (within a project) """
+    pass
+
 # represents an <maven/> element
 class Maven(Builder):
     """ A Maven command (within a project)"""
@@ -284,5 +290,10 @@
     	
     def getName(self):
         return self.name
-    
+
+# represents an <configure/> element
+class Configure(Builder):
+    """ A configure command (within a project)"""
+    pass
+
     	

Modified: gump/live/python/gump/core/model/project.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/model/project.py?view=diff&rev=109494&p1=gump/live/python/gump/core/model/project.py&r1=109493&p2=gump/live/python/gump/core/model/project.py&r2=109494
==============================================================================
--- gump/live/python/gump/core/model/project.py	(original)
+++ gump/live/python/gump/core/model/project.py	Thu Dec  2 03:29:37 2004
@@ -30,7 +30,7 @@
                             AddressPair
 from gump.core.model.stats import Statable, Statistics
 from gump.core.model.property import Property
-from gump.core.model.builder import Ant,NAnt,Maven,Script
+from gump.core.model.builder import Ant,NAnt,Maven,Script,Configure,Make
 from gump.util import getIndent
 from gump.util.file import *
 from gump.core.model.depend import *
@@ -80,6 +80,8 @@
         self.nant=None
     	self.maven=None
     	self.script=None
+        self.configure = None
+        self.make = None
 
     	self.works=[]
     	self.mkdirs=[]
@@ -159,6 +161,14 @@
         if self.script: return True
         return False
     
+    def hasConfigure(self):
+        if self.configure: return True
+        return False
+        
+    def hasMake(self):
+        if self.make: return True
+        return False
+        
     def getAnt(self):
         return self.ant
         
@@ -171,6 +181,12 @@
     def getScript(self):
         return self.script
     
+    def getConfigure(self):
+        return self.configure
+        
+    def getMake(self):
+        return self.make
+
     def hasUrl(self):
         if self.url or self.getModule().hasUrl(): return True
         return False
@@ -372,6 +388,20 @@
             
             # Copy over any XML errors/warnings
             # :TODO:#1: transferAnnotations(self.xml.script, self)
+        
+        # Import any <nant part [if not packaged]
+        if self.hasDomChild('make') and not packaged:
+            self.make = Make(self.getDomChild('make'),self)
+            
+            # Copy over any XML errors/warnings
+            # :TODO:#1: transferAnnotations(self.xml.make, self)
+        
+        # Import any <nant part [if not packaged]
+        if self.hasDomChild('configure') and not packaged:
+            self.configure = Configure(self.getDomChild('configure'),self)
+            
+            # Copy over any XML errors/warnings
+            # :TODO:#1: transferAnnotations(self.xml.configure, self)
         
         # Set this up to be the base directory of this project,
         # if one is set

Modified: gump/live/python/gump/core/run/gumpenv.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/run/gumpenv.py?view=diff&rev=109494&p1=gump/live/python/gump/core/run/gumpenv.py&r1=109493&p2=gump/live/python/gump/core/run/gumpenv.py&r2=109494
==============================================================================
--- gump/live/python/gump/core/run/gumpenv.py	(original)
+++ gump/live/python/gump/core/run/gumpenv.py	Thu Dec  2 03:29:37 2004
@@ -72,6 +72,7 @@
         self.noP4 = False   
         self.noJava = False
         self.noJavac = False
+        self.noMake = False    
         
         self.javaProperties = None
     
@@ -173,6 +174,11 @@
             not self._checkExecutable('mono','--help',False,False,'check_mono'): 
             self.noMono=True
             self.addWarning('"Mono" command not found, no Mono runtime')
+       
+        if not self.noMake and \
+            not self._checkExecutable('make','--help',False,False,'check_Make'): 
+            self.noMake=True
+            self.addWarning('"make" command not found, no make builds')
        
         self.checked = True
         

Mime
View raw message