gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r963182 - in /gump/live: ./ python/gump/core/build/mvn.py python/gump/core/language/java.py python/gump/core/model/builder.py python/gump/core/update/bzr.py python/gump/core/update/darcs.py python/gump/core/update/hg.py
Date Mon, 12 Jul 2010 04:09:29 GMT
Author: bodewig
Date: Mon Jul 12 04:09:29 2010
New Revision: 963182

URL: http://svn.apache.org/viewvc?rev=963182&view=rev
Log:
support for mvn profiles

Modified:
    gump/live/   (props changed)
    gump/live/python/gump/core/build/mvn.py
    gump/live/python/gump/core/language/java.py   (props changed)
    gump/live/python/gump/core/model/builder.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)

Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 12 04:09:29 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,962401,963021-963048
+/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,962401,962981,963021-963048

Modified: gump/live/python/gump/core/build/mvn.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/build/mvn.py?rev=963182&r1=963181&r2=963182&view=diff
==============================================================================
--- gump/live/python/gump/core/build/mvn.py (original)
+++ gump/live/python/gump/core/build/mvn.py Mon Jul 12 04:09:29 2010
@@ -99,23 +99,13 @@ def getMavenCommand(project):
     props = getMavenProperties(project)
     cmd.addNamedParameters(props)
 
-    #
-    # Suppress downloads
-    #
-
-    # As long as we don't know how to pass our local artifacts to
-    # mvn there is no point in using the offline mode
-    #
-    # cmd.addParameter('--offline')
-
-    #
-    #       This sets the *defaults*, a workspace could override them.
-    #
-    #cmd.addPrefixedParameter('-D', 'build.sysclasspath', 'only', '=')
-
     cmd.addParameter('--settings')
     cmd.addParameter(locateMavenSettings(project))
 
+    profile = maven.getProfile()
+    if profile:
+        cmd.addPrefixedParameter('-P', profile)
+
     # End with the goal...
     if goal: 
         for goalParam in goal.split(','):

Propchange: gump/live/python/gump/core/language/java.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 12 04:09:29 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,963021-963048
+/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,963021-963048

Modified: gump/live/python/gump/core/model/builder.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/builder.py?rev=963182&r1=963181&r2=963182&view=diff
==============================================================================
--- gump/live/python/gump/core/model/builder.py (original)
+++ gump/live/python/gump/core/model/builder.py Mon Jul 12 04:09:29 2010
@@ -293,20 +293,29 @@ class Maven2(Builder):
     def __init__(self, dom, project):
         Builder.__init__(self, dom, project)
 
-        # Import the goal
         self.goal = self.getDomAttributeValue('goal', 'package')
 
         self.local_repo = self.getDomAttributeValue('separateLocalRepository',
                                                     'False')
+        self.profile = self.getDomAttributeValue('profile')
 
     def getGoal(self):
+        """ The goal to execute """
         return self.goal
 
+    def getProfile(self):
+        """ The profile to use, may be None """
+        return self.profile
+
     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 + 'Goal: ' + self.getGoal() + '\n')
+        if self.profile:
+            output.write(i + 'Profile: ' + self.getProfile() + '\n')
+        else:
+            output.write(i + 'using default profile.\n')
 
     def needsSeparateLocalRepository(self):
         """ Whether a separate local repository will be used for this build """

Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 12 04:09:29 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,962401,963021-963048
+/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,962401,962981,963021-963048

Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 12 04:09:29 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,962401,963021-963048
+/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,962401,962981,963021-963048

Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 12 04:09:29 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,962401,963021-963048
+/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,962401,962981,963021-963048



Mime
View raw message