gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject svn commit: r1328199 - in /gump/live/python/gump/core: build/ant.py model/property.py
Date Fri, 20 Apr 2012 04:55:21 GMT
Author: billbarker
Date: Fri Apr 20 04:55:20 2012
New Revision: 1328199

URL: http://svn.apache.org/viewvc?rev=1328199&view=rev
Log:
porting changes to <property project=..... /> from trunk to live

Modified:
    gump/live/python/gump/core/build/ant.py
    gump/live/python/gump/core/model/property.py

Modified: gump/live/python/gump/core/build/ant.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/build/ant.py?rev=1328199&r1=1328198&r2=1328199&view=diff
==============================================================================
--- gump/live/python/gump/core/build/ant.py (original)
+++ gump/live/python/gump/core/build/ant.py Fri Apr 20 04:55:20 2012
@@ -167,7 +167,7 @@ class AntBuilder(gump.core.run.gumprun.R
         """ Get properties for a project """
         properties=Parameters()
         for property in project.getWorkspace().getProperties()+project.getAnt().getProperties():
-            properties.addPrefixedNamedParameter('-D',property.name,property.value,'=')
+            properties.addPrefixedNamedParameter('-D',property.name,property.getValue(),'=')
         return properties
 
     def getAntSysProperties(self,project):

Modified: gump/live/python/gump/core/model/property.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/property.py?rev=1328199&r1=1328198&r2=1328199&view=diff
==============================================================================
--- gump/live/python/gump/core/model/property.py (original)
+++ gump/live/python/gump/core/model/property.py Fri Apr 20 04:55:20 2012
@@ -37,6 +37,10 @@ class Property(NamedModelObject):
 
         self.value = None
 
+        self.output = None
+
+        self.reference = None
+
 
     def setValue(self, value):
         """
@@ -48,6 +52,11 @@ class Property(NamedModelObject):
         """
         Get a value
         """
+        if self.output :
+            if self.reference == 'jarpath' or self.reference == 'outputpath' :
+                self.setValue(self.output.getPath())
+            else :
+                self.setValue(self.output.getName())                
         return self.value
 
     # provide default elements when not defined in xml
@@ -188,6 +197,8 @@ class Property(NamedModelObject):
             self.setValue(output.getPath())
         else:
             self.setValue(output.getName())
+        self.output = output
+        self.reference = reference
 
     def type_matches(self, output):
         """



Mime
View raw message