You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2015/02/08 14:42:34 UTC
svn commit: r1658169 - in /gump/live: ./ python/gump/core/model/builder.py
python/gump/core/model/project.py python/gump/core/run/gumpenv.py
Author: bodewig
Date: Sun Feb 8 13:42:34 2015
New Revision: 1658169
URL: http://svn.apache.org/r1658169
Log:
merge gradle changes over from trunk
picked the wrong branch, darn
Modified:
gump/live/ (props changed)
gump/live/python/gump/core/model/builder.py
gump/live/python/gump/core/model/project.py
gump/live/python/gump/core/run/gumpenv.py
Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 8 13:42:34 2015
@@ -1 +1 @@
-/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463,1306165,1435792
+/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463,1306165,1435792,1658079-1658080
Modified: gump/live/python/gump/core/model/builder.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/builder.py?rev=1658169&r1=1658168&r2=1658169&view=diff
==============================================================================
--- gump/live/python/gump/core/model/builder.py (original)
+++ gump/live/python/gump/core/model/builder.py Sun Feb 8 13:42:34 2015
@@ -506,3 +506,36 @@ class Script(Configure):
def getName(self):
return self.name
+# represents an <gradle/> element
+class Gradle(Builder):
+
+ """ A gradle command (within a project)"""
+
+ def __init__(self, dom, project):
+ Builder.__init__(self, dom, project)
+
+ self.task = self.getDomAttributeValue('task', 'build')
+
+ self.local_repo = self.getDomAttributeValue('separateLocalRepository',
+ 'False')
+
+ def getTask(self):
+ """ The task to execute """
+ return self.task
+
+ def dump(self, indent = 0, output = sys.stdout):
+ """ Display the contents of this object """
+ Builder.dump(self, indent, output)
+ i = getIndent(indent + 1)
+ output.write(i + 'Task: ' + self.getTask() + '\n')
+
+ def needsSeparateLocalRepository(self):
+ """ Whether a separate local repository will be used for this build """
+ return self.local_repo and self.local_repo not in ['False', 'false']
+
+ def getLocalRepositoryName(self):
+ """ Name of the local repository if one has been given """
+ if not self.needsSeparateLocalRepository() \
+ or self.local_repo in ['True', 'true']:
+ return None
+ return self.local_repo
Modified: gump/live/python/gump/core/model/project.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/project.py?rev=1658169&r1=1658168&r2=1658169&view=diff
==============================================================================
--- gump/live/python/gump/core/model/project.py (original)
+++ gump/live/python/gump/core/model/project.py Sun Feb 8 13:42:34 2015
@@ -29,7 +29,7 @@ import gump.util.process.command
from gump import log
from gump.core.config import default
from gump.core.model.builder import Ant, NAnt, Maven1, Maven, MvnInstall, \
- MVN_VERSION2, MVN_VERSION3, Script, Configure, Make
+ MVN_VERSION2, MVN_VERSION3, Script, Configure, Make, Gradle
from gump.core.model.depend import Dependable, importDomDependency
from gump.core.model.misc import AddressPair, \
Resultable, Positioned, Mkdir, Delete, Report, Work
@@ -87,6 +87,7 @@ class Project(NamedModelObject, Statable
self.script = None
self.configure = None
self.make = None
+ self.gradle = None
self.builder = []
self.works = []
@@ -196,6 +197,11 @@ class Project(NamedModelObject, Statable
return True
return False
+ def hasGradle(self):
+ if self.gradle:
+ return True
+ return False
+
def getAnt(self):
return self.ant
@@ -217,6 +223,9 @@ class Project(NamedModelObject, Statable
def getMake(self):
return self.make
+ def getGradle(self):
+ return self.gradle
+
def hasUrl(self):
if self.url or self.getModule().hasUrl():
return True
@@ -513,6 +522,14 @@ class Project(NamedModelObject, Statable
# Copy over any XML errors/warnings
# :TODO:#1: transferAnnotations(self.xml.configure, self)
+ # Import any <gradle part [if not packaged]
+ if self.hasDomChild('gradle') and not packaged:
+ self.gradle = Gradle(self.getDomChild('gradle'), self)
+ self.builder.append(self.gradle)
+
+ # Copy over any XML errors/warnings
+ # :TODO:#1: transferAnnotations(self.xml.gradle, self)
+
# Set this up to be the base directory of this project,
# if one is set
self.basedir = os.path.abspath(os.path.join(
@@ -669,7 +686,7 @@ class Project(NamedModelObject, Statable
if self.hasDomChild('description'):
self.desc = self.getDomChildValue('description')
- jvmargs_parents = ['ant', 'maven', 'mvn', 'mvn1', 'mvn2', 'mvn3']
+ jvmargs_parents = ['ant', 'maven', 'mvn', 'mvn1', 'mvn2', 'mvn3', 'gradle']
for tag in jvmargs_parents:
if self.hasDomChild(tag):
self.addJVMArgs(self.getDomChild(tag))
Modified: gump/live/python/gump/core/run/gumpenv.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/run/gumpenv.py?rev=1658169&r1=1658168&r2=1658169&view=diff
==============================================================================
--- gump/live/python/gump/core/run/gumpenv.py (original)
+++ gump/live/python/gump/core/run/gumpenv.py Sun Feb 8 13:42:34 2015
@@ -91,6 +91,7 @@ class GumpEnvironment(Annotatable, Worka
self.noDarcs = False
self.noHg = False
self.noBzr = False
+ self.noGradle = False
self.javaProperties = None
@@ -233,6 +234,8 @@ class GumpEnvironment(Annotatable, Worka
self.noBzr = self._checkWithDashVersion('bzr',
'no Bazar repository updates')
+ self.noGradle = self._checkWithDashVersion('gradle',
+ 'no gradle builds')
self.checked = True