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 2003/11/21 05:41:22 UTC
cvs commit: jakarta-gump/python/gump/model module.py workspace.py project.py
ajack 2003/11/20 20:41:22
Modified: python/gump/model module.py workspace.py project.py
Log:
Honorary packaged projects (those w/o output in a module w/ a package)
Revision Changes Path
1.9 +3 -13 jakarta-gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/module.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- module.py 21 Nov 2003 00:27:58 -0000 1.8
+++ module.py 21 Nov 2003 04:41:22 -0000 1.9
@@ -151,7 +151,6 @@
self.repository=None
self.packaged = 0
- self.packageComplete= 0
self.updated = 0
# provide default elements when not defined in xml
@@ -213,7 +212,8 @@
# project in a module as a package, and those that do
# not product significant outputs (e.g. test projects)
# will be asssumed to be packages.
- #
+ #
+ project.setHonoraryPackage(1)
project.changeState(STATE_COMPLETE,REASON_PACKAGE)
packageCount+=1
else:
@@ -252,17 +252,7 @@
- self.setComplete(1)
-
-
- def completePackagedModule(self):
- # If so far so good, check packages
- if not self.isPackaged(): return
- if self.packageComplete: return
-
- self.addInfo("This is a packaged module")
-
- self.packageComplete=1
+ self.setComplete(1)
def addProject(self,project):
project.setModule(self)
1.7 +1 -0 jakarta-gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/workspace.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.py 21 Nov 2003 00:27:58 -0000 1.6
+++ workspace.py 21 Nov 2003 04:41:22 -0000 1.7
@@ -301,6 +301,7 @@
# Complete the project
project.complete(self)
+ # Check they are complete...
for project in self.getProjects():
if not project.isPackaged(): continue
project.checkPackage()
1.14 +10 -1 jakarta-gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.py 21 Nov 2003 02:32:41 -0000 1.13
+++ project.py 21 Nov 2003 04:41:22 -0000 1.14
@@ -204,6 +204,11 @@
#
self.jars={}
+ #############################################################
+ # Misc
+ #
+ self.honoraryPackage=0
+
def getAnt(self):
return self.ant
@@ -317,7 +322,11 @@
# we test the attribute for type.
#
def isPackaged(self):
- return (type(self.xml.package) in types.StringTypes)
+ return (type(self.xml.package) in types.StringTypes) \
+ or self.honoraryPackage
+
+ def setHonoraryPackage(self,honorary):
+ self.honoraryPackage=honorary
# provide elements when not defined in xml
def complete(self,workspace):