You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2004/06/24 18:30:10 UTC
cvs commit: gump/python/gump/model project.py misc.py builder.py
ajack 2004/06/24 09:30:10
Modified: python/gump/model Tag: CleanUp project.py misc.py builder.py
Log:
Was failing to add 'work' entries to CLASSPATH
Revision Changes Path
No revision
No revision
1.85.2.9 +21 -13 gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.85.2.8
retrieving revision 1.85.2.9
diff -u -r1.85.2.8 -r1.85.2.9
--- project.py 17 Jun 2004 21:27:07 -0000 1.85.2.8
+++ project.py 24 Jun 2004 16:30:09 -0000 1.85.2.9
@@ -175,6 +175,7 @@
def getDeletes(self): return self.deletes
def getMkDirs(self): return self.mkdirs
+ def getWorks(self): return self.works
def hasJars(self):
return self.jars
@@ -671,21 +672,28 @@
#
# Add the work directories
#
- for wdom in self.getDomChildIterator('work'):
- path=None
- if hasDomAttribute(wdom,'nested'):
- nested=getDomAttributeValue(wdom,'nested')
- path=os.path.abspath(os.path.join(workdir,nested))
- elif hasDomAttribute(wdom,'parent'):
- parent=getDomAttributeValue(wdom,'parent')
- path=os.path.abspath(os.path.join(self.getWorkspace().getBaseDirectory(),parent))
+ #for wdom in self.getDomChildIterator('work'):
+ # path=None
+ # if hasDomAttribute(wdom,'nested'):
+ # nested=getDomAttributeValue(wdom,'nested')
+ # path=os.path.abspath(os.path.join(workdir,nested))
+ # elif hasDomAttribute(wdom,'parent'):
+ # parent=getDomAttributeValue(wdom,'parent')
+ # path=os.path.abspath(os.path.join(self.getWorkspace().getBaseDirectory(),parent))
+ # else:
+ # log.error("<work element with neither 'nested' nor 'parent' attribute on " \
+ # + self.getName() + " in " + self.getModule().getName())
+ #
+ # if path:
+ # if debug: print "Work Entity: " + path
+ # classpath.addPathPart(AnnotatedPath('',path,self,None,'Work Entity'))
+ for work in self.getWorks():
+ path=work.getResolvedPath()
+ if path:
+ classpath.addPathPart(AnnotatedPath('',path,self,None,'Work Entity'))
else:
log.error("<work element with neither 'nested' nor 'parent' attribute on " \
- + self.getName() + " in " + self.getModule().getName())
-
- if path:
- if debug: print "Work Entity: " + path
- classpath.addPathPart(AnnotatedPath('',path,self,None,'Work Entity'))
+ + self.getName() + " in " + self.getModule().getName())
# Append dependent projects (including optional)
visited=[]
1.1.2.5 +0 -1 gump/python/gump/model/Attic/misc.py
Index: misc.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/Attic/misc.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- misc.py 21 Jun 2004 15:53:30 -0000 1.1.2.4
+++ misc.py 24 Jun 2004 16:30:09 -0000 1.1.2.5
@@ -158,7 +158,6 @@
def __init__(self,dom,owner):
Resolvable.__init__(self,dom,owner)
-
class DirResolvable(ModelObject):
"""
1.1.2.5 +2 -2 gump/python/gump/model/builder.py
Index: builder.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/builder.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- builder.py 17 Jun 2004 20:16:01 -0000 1.1.2.4
+++ builder.py 24 Jun 2004 16:30:09 -0000 1.1.2.5
@@ -211,9 +211,9 @@
Builder.__init__(self,dom,project)
# Import the target
- self.target=self.getDomAttributeValue('target') # :TODO: Soon add ..,'gump')
+ self.target=self.getDomAttributeValue('target') # :TODO: Soon add ... ,'gump')
# Import the buildfile
- self.buildfile=self.getDomAttributeValue('buildfile','build.xml')
+ self.buildfile=self.getDomAttributeValue('buildfile') # :TODO: Soon add ... ,'build.xml')
def getTarget(self):
return self.target
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org