Author: billbarker
Date: Thu Apr 19 08:00:25 2012
New Revision: 1327855
URL: http://svn.apache.org/viewvc?rev=1327855&view=rev
Log:
The evel of using property referenceses. This at least seems to work for Ant builders, which
it the biggest set of <property ... /> users. Passes my small tests now, but want to
see big tests before porting to live
Modified:
gump/trunk/python/gump/core/build/ant.py
gump/trunk/python/gump/core/model/property.py
Modified: gump/trunk/python/gump/core/build/ant.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/build/ant.py?rev=1327855&r1=1327854&r2=1327855&view=diff
==============================================================================
--- gump/trunk/python/gump/core/build/ant.py (original)
+++ gump/trunk/python/gump/core/build/ant.py Thu Apr 19 08:00:25 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/trunk/python/gump/core/model/property.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/model/property.py?rev=1327855&r1=1327854&r2=1327855&view=diff
==============================================================================
--- gump/trunk/python/gump/core/model/property.py (original)
+++ gump/trunk/python/gump/core/model/property.py Thu Apr 19 08:00:25 2012
@@ -22,7 +22,6 @@
import os
import sys
-from gump import log
from gump.core.model.object import NamedModelObject
from gump.util import getIndent
from gump.util.domutils import getDomChildIterator, getDomAttributeValue, \
@@ -57,7 +56,7 @@ class Property(NamedModelObject):
if self.reference == 'jarpath' or self.reference == 'outputpath':
self.setValue(self.output.getPath())
else:
- self.setValue(self.output.getName())
+ self.setValue(self.output.getName())
return self.value
# provide default elements when not defined in xml
|