gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1028423 - in /gump/live: ./ python/gump/core/build/ python/gump/core/language/ python/gump/core/model/ python/gump/core/update/ python/gump/util/process/
Date Thu, 28 Oct 2010 18:31:30 GMT
Author: bodewig
Date: Thu Oct 28 18:31:30 2010
New Revision: 1028423

URL: http://svn.apache.org/viewvc?rev=1028423&view=rev
Log:
merge jvmarg support for maven builders

Modified:
    gump/live/   (props changed)
    gump/live/python/gump/core/build/maven.py
    gump/live/python/gump/core/build/mvn.py
    gump/live/python/gump/core/language/java.py   (props changed)
    gump/live/python/gump/core/model/project.py
    gump/live/python/gump/core/update/bzr.py   (props changed)
    gump/live/python/gump/core/update/darcs.py   (props changed)
    gump/live/python/gump/core/update/hg.py   (props changed)
    gump/live/python/gump/util/process/command.py

Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 18:31:30 2010
@@ -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
+/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

Modified: gump/live/python/gump/core/build/maven.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/build/maven.py?rev=1028423&r1=1028422&r2=1028423&view=diff
==============================================================================
--- gump/live/python/gump/core/build/maven.py (original)
+++ gump/live/python/gump/core/build/maven.py Thu Oct 28 18:31:30 2010
@@ -200,6 +200,12 @@ class MavenBuilder(RunSpecific):
             cmd = getMavenCommand(project)
 
             if cmd:
+                # Get/set JVM properties
+                jvmargs = languageHelper.getJVMArgs(project)
+                if jvmargs and len(jvmargs.items()) > 0:
+                    cmd.addEnvironment('MAVEN_OPTS',
+                                       jvmargs.formatCommandLine())
+
                 # Execute the command ....
                 cmdResult = execute(cmd, workspace.tmpdir)
 

Modified: gump/live/python/gump/core/build/mvn.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/build/mvn.py?rev=1028423&r1=1028422&r2=1028423&view=diff
==============================================================================
--- gump/live/python/gump/core/build/mvn.py (original)
+++ gump/live/python/gump/core/build/mvn.py Thu Oct 28 18:31:30 2010
@@ -141,6 +141,12 @@ class Maven2Builder(RunSpecific):
             cmd = getMavenCommand(project)
 
             if cmd:
+                # Get/set JVM properties
+                jvmargs = languageHelper.getJVMArgs(project)
+                if jvmargs and len(jvmargs.items()) > 0:
+                    cmd.addEnvironment('MAVEN_OPTS',
+                                       jvmargs.formatCommandLine())
+
                 # Execute the command ....
                 cmdResult = execute(cmd, workspace.tmpdir)
 

Propchange: gump/live/python/gump/core/language/java.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 18:31:30 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/language/java.py: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,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
+/gump/trunk/python/gump/core/language/java.py: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,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

Modified: gump/live/python/gump/core/model/project.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/project.py?rev=1028423&r1=1028422&r2=1028423&view=diff
==============================================================================
--- gump/live/python/gump/core/model/project.py (original)
+++ gump/live/python/gump/core/model/project.py Thu Oct 28 18:31:30 2010
@@ -649,8 +649,10 @@ class Project(NamedModelObject, Statable
         if self.hasDomChild('description'):
             self.desc = self.getDomChildValue('description')
 
-        if self.ant:
-            self.addJVMArgs(self.getDomChild("ant"))
+        jvmargs_parents = ['ant', 'maven', 'mvn']
+        for tag in jvmargs_parents:
+            if self.hasDomChild(tag):
+                self.addJVMArgs(self.getDomChild(tag))
 
         #
         # complete properties

Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 18:31:30 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/bzr.py: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
+/gump/trunk/python/gump/core/update/bzr.py: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

Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 18:31:30 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/darcs.py: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
+/gump/trunk/python/gump/core/update/darcs.py: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

Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 18:31:30 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/hg.py: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
+/gump/trunk/python/gump/core/update/hg.py: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

Modified: gump/live/python/gump/util/process/command.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/util/process/command.py?rev=1028423&r1=1028422&r2=1028423&view=diff
==============================================================================
--- gump/live/python/gump/util/process/command.py (original)
+++ gump/live/python/gump/util/process/command.py Thu Oct 28 18:31:30 2010
@@ -200,7 +200,7 @@ class Cmd:
         for p in params.items():
           self.params.addNamedParameter(p.name,p.value,p.separator,p.prefix)
         
-    def addEnvirionment(self,name,val=None):
+    def addEnvironment(self,name,val=None):
         self.env[name]=val
         
     def formatCommandLine(self):



Mime
View raw message