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/09/25 19:04:52 UTC
cvs commit: jakarta-gump/template/forrest/src/documentation/resources/icons success.png
ajack 2003/09/25 10:04:52
Modified: python/gump update.py model.py launcher.py context.py
build.py logic.py document.py conf.py
Added: template/forrest/src/documentation/resources/icons
success.png
Log:
1) Toy w/ feather for success.png
2) Fixed "projectexpression" in docs when not all
3) Moved some "default.x" to "setting.x" when not overridable
4) check the version of the workspace, and if less than 0.4 warn
5) Make state the only factor for icons (leave reason to later)
Revision Changes Path
1.11 +4 -4 jakarta-gump/python/gump/update.py
Index: update.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/update.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- update.py 23 Sep 2003 23:16:20 -0000 1.10
+++ update.py 25 Sep 2003 17:04:52 -0000 1.11
@@ -130,7 +130,7 @@
mctxt = context.getModuleContextForModule(module)
if mctxt.okToPerformWork() \
- and not switches.failtesting:
+ and not switch.failtesting:
try:
log.info("CVS Update Module " + name + ", Repository Name: " + str(module.cvs.repository))
1.19 +4 -3 jakarta-gump/python/gump/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- model.py 24 Sep 2003 16:57:12 -0000 1.18
+++ model.py 25 Sep 2003 17:04:52 -0000 1.19
@@ -120,6 +120,7 @@
# provide default elements when not defined in xml
def complete(self):
+
if not self['banner-image']:
self['banner-image']=default.bannerimage
if not self['banner-link']: self['banner-link']="http://jakarta.apache.org"
1.4 +1 -1 jakarta-gump/python/gump/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/launcher.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- launcher.py 23 Sep 2003 23:16:20 -0000 1.3
+++ launcher.py 25 Sep 2003 17:04:52 -0000 1.4
@@ -290,7 +290,7 @@
outputFile=os.path.abspath(os.path.join(tmp,gumpSafeName(cmd.name)+'.txt'))
if os.path.exists(outputFile): os.remove(outputFile)
- if switches.debugging:
+ if switch.debugging:
#############################################################
# This debug might become permenant ...
#############################################################
1.9 +2 -7 jakarta-gump/python/gump/context.py
Index: context.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/context.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- context.py 24 Sep 2003 18:24:21 -0000 1.8
+++ context.py 25 Sep 2003 17:04:52 -0000 1.9
@@ -82,7 +82,7 @@
STATUS_SUCCESS : "Success",
STATUS_FAILED : "Failed",
STATUS_PREREQ_FAILURE : "Prerequisite Failed",
- STATUS_COMPLETE : "Complete. Perform No Action" }
+ STATUS_COMPLETE : "Complete" }
def stateName(state):
return stateDescriptions.get(state,'Unknown State:' + str(state))
@@ -612,12 +612,7 @@
def __init__(self,name="Gump",parent=None):
Context.__init__(self,name,parent)
- #
- # For reporting
- #
- self.projectexpression=''
-
- #
+ #
# Set to true if not found, see checkEnvironment
#
self.noRSync=0
1.13 +4 -4 jakarta-gump/python/gump/build.py
Index: build.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/build.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.py 23 Sep 2003 23:16:20 -0000 1.12
+++ build.py 25 Sep 2003 17:04:52 -0000 1.13
@@ -148,7 +148,7 @@
if mctxt.okToPerformWork() \
and Module.list.has_key(module.name) \
- and not switches.failtesting:
+ and not switch.failtesting:
module=Module.list[module.name];
sourcedir = os.path.abspath(os.path.join(workspace.cvsdir,module.name)) # todo allow override
1.5 +6 -0 jakarta-gump/python/gump/logic.py
Index: logic.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- logic.py 24 Sep 2003 16:57:12 -0000 1.4
+++ logic.py 25 Sep 2003 17:04:52 -0000 1.5
@@ -334,6 +334,12 @@
def preprocessContext(workspace,context=GumpContext()):
+ # Check the workspace
+ if not workspace.version >= workspace.ws_version:
+ message='Workspace version ['+workspace.version+'] below expected [' + setting.ws_version + ']'
+ context.addWarning(message)
+ log.warning(message)
+
#
# Check each project...
#
1.36 +3 -3 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- document.py 25 Sep 2003 00:27:41 -0000 1.35
+++ document.py 25 Sep 2003 17:04:52 -0000 1.36
@@ -248,7 +248,7 @@
startSectionXDoc(x,'Workspace Definition')
startTableXDoc(x)
- titledDataInTableXDoc(x,'Gump Version', default.version)
+ titledDataInTableXDoc(x,'Gump Version', setting.version)
if workspace.description:
titledDataInTableXDoc(x,'Description', workspace.description)
if workspace.version:
@@ -263,7 +263,7 @@
note="""This output does not represent the a complete workspace,
but a partial one.
Only projects, and their dependents, matching this regular expression """ + \
- "<strong>[" + context.projectexpression + "]</strong>."
+ "<strong>[" + context.gumpset.projectexpression + "]</strong>."
note+="\n\nRequested Projects:\n"
for project in context.gumpset.projects:
@@ -973,7 +973,7 @@
uniqueName=sname
if not pair.reason==REASON_UNSET:
description+=' '+rstring
- uniqueName+='_'+rstring
+ # Not yet, just have a few icons ... uniqueName+='_'+rstring
# Build the URL
iconName=gumpSafeName(lower(replace(uniqueName,' ','_')))
1.14 +11 -5 jakarta-gump/python/gump/conf.py
Index: conf.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- conf.py 24 Sep 2003 22:50:15 -0000 1.13
+++ conf.py 25 Sep 2003 17:04:52 -0000 1.14
@@ -103,9 +103,15 @@
prefix = "[GUMPY]"
signature="\r\n--\r\nGump http://jakarta.apache.org/gump"
+class setting:
+ """Configuration of hardcoded settings"""
+
version="2.0.1-alpha-0003"
-class switches:
+ # :TODO: Add "minimum checks later..."
+ ws_version="0.4"
+
+class switch:
"""Configuration of switches """
failtesting=0 # Not testing..
debugging=0 # Not debugging..
@@ -120,7 +126,7 @@
def banner():
print
print "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
- print "Apache Python Gump (" + default.version + "), a multi-project builder."
+ print "Apache Python Gump (" + setting.version + "), a multi-project builder."
print
print "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
print
1.1 jakarta-gump/template/forrest/src/documentation/resources/icons/success.png
<<Binary file>>