ajack 2003/10/18 16:54:20
Modified: python/gump model.py
Log:
Something isn't happy w/ <ant <depend ...
Revision Changes Path
1.29 +25 -7 jakarta-gump/python/gump/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- model.py 17 Oct 2003 03:48:14 -0000 1.28
+++ model.py 18 Oct 2003 23:54:20 -0000 1.29
@@ -363,36 +363,54 @@
self.property=Multiple(Property)
self.jvmarg=Multiple(GumpModelObject)
+ #
# expand properties - in other words, do everything to complete the
# entry that does NOT require referencing another project
+ #
def expand(self,project):
+ #
# convert property elements which reference a project into dependencies
+ #
for property in self.property:
- if not property.project: continue
+
+ # Check if the property comes from another project
+ if not property.project: continue
+ # If that project is the one we have in hand
if property.project==project.name: continue
+ # If the property is not as simple as srcdir
if property.reference=="srcdir": continue
+ # If it isn't already a dependency
if project.hasFullDependencyOn(property.project): continue
# Add a dependency (to bring property)
depend=Depend({'project':property.project})
if not property.classpath: depend['noclasspath']=Single({})
if property.runtime: depend['runtime']=property.runtime
+ if property.id: depend['ids']= [ property.id ]
project.depend.append(depend)
- # convert all depend elements into property elements
+ #
+ # convert all depend elements into property elements, and
+ # move the dependency onto the project
+ #
for depend in self.depend:
+ # Generate the property
property=Property(depend.__dict__)
property['reference']='jarpath'
property['name']=depend.project
- self.property.append(property)
+ # Store it
+ self.property.append(property)
+ # Move onto project
project.depend.append(depend)
+
self.depend=None
+ #
# complete the definition - it is safe to reference other projects
# at this point
+ #
def complete(self,project):
-
for property in self.property: property.complete(project)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
