gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Bodewig <bode...@apache.org>
Subject <depend> in <ant> broken
Date Fri, 19 Mar 2004 07:54:48 GMT
Hi,

it looks as if Adam has changed something that has broken the depend
tag.  Instead of patching all descriptors that use it - quite a few -
I'd rather roll back the change.  Even if that means that some cactus
builds will remain broken for a while.

Does anybody have a Python Gump installation and could quickly try to
revert the files in python/gump/model/ to something before 2003-04-18,
in particular, I'd like you to try to just revert ant.py, depend.py
and project.py (patch appended).  Please run integrate.py on Struts or
Tomcat-4.  If that builds OK, we have gone back to a more stable
state.

Thanks

        Stefan

Index: ant.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/ant.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ant.py	16 Mar 2004 19:50:15 -0000	1.17
+++ ant.py	18 Mar 2004 23:24:55 -0000	1.18
@@ -97,7 +97,7 @@
             # Add a dependency (to bring property)
             dependency=ProjectDependency(project, 	\
                             workspace.getProject(property.project),	\
-                            INHERIT_ALL,	\
+                            INHERIT_NONE,	\
                             runtime,
                             0,	\
                             ids,
Index: depend.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/depend.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- depend.py	16 Mar 2004 19:50:15 -0000	1.19
+++ depend.py	18 Mar 2004 23:24:55 -0000	1.20
@@ -338,13 +338,10 @@
     # 
     def hasFullDependencyOnNamedProject(self,name):
         for dependency in self.getDirectDependencies():
-            if dependency.getProject().getName()==name: 
+            if dependency.getProject().getName()==name	\
+                and not dependency.isNoClasspath() :
                 return 1
-                
-# :TODO:        
-#           and not dependency.noclasspath: return 1
-#:TODO: noclasspath????
-
+            
         return 0
 
     # determine if this project is a prereq of any project on the todo list
@@ -358,8 +355,4 @@
             
     def hasDependee(self,project):
         for dependee in self.getFullDependees():
-            if dependee.getOwnerProject()==project: return 1
-                    
-        
-        
-        
\ No newline at end of file
+            if dependee.getOwnerProject()==project: return 1
\ No newline at end of file
Index: project.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- project.py	16 Mar 2004 19:50:14 -0000	1.65
+++ project.py	18 Mar 2004 23:24:55 -0000	1.66
@@ -977,8 +977,6 @@
         #
         return ( classpath.getFlattened(), bootclasspath.getFlattened() )
 
-
-
     #
     # Maybe this is dodgy (it is inefficient) but we need some
     # way to get the sun tools for a javac compiler for ant and
@@ -1022,6 +1020,9 @@
         #
         srcdir=self.getModule().getSourceDirectory()
           
+        #
+        # Add the work directories
+        #
         for work in self.xml.work:
             path=None
             if work.nested:
@@ -1064,8 +1065,9 @@
     def getDependOutputList(self,dependency,visited,depth=0,debug=0):      
         """Get a classpath of outputs for a project (including its dependencies)"""     
      
    
-        # Don't loop...
-        if dependency in visited:  
+        # Don't loop, and skip ones that aren't here to
+        # affect the classpath
+        if (dependency in visited) or dependency.isNoClasspath():  
             # beneficiary.addInfo("Duplicated dependency [" + str(depend) + "]")        
 
             if debug:
                 print str(depth) + ") Already Visited : " + str(depend)

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message