ajack 2004/04/06 08:57:11
Modified: python/gump/document forrest.py
python exe.py
python/gump/results model.py
Added: python header.txt
Removed: python license.txt
Log:
1) Changes license.txt (template) to header.txt (to include CVS tag)
2) Changes ForrestDocument to sync xdocs when --xdocs
3) Minor comment changes.
Revision Changes Path
1.132 +25 -2 gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- forrest.py 5 Apr 2004 18:15:48 -0000 1.131
+++ forrest.py 6 Apr 2004 15:57:11 -0000 1.132
@@ -94,6 +94,8 @@
if not runOptions.isXDoc():
ret=self.executeForrest(workspace)
+ else:
+ ret=self.syncXDocs(workspace)
return ret
@@ -204,6 +206,27 @@
success=0
return success
+
+ def syncXDocs(self,workspace):
+
+ # The three dirs, work, output (staging), public
+ forrestWorkDir=self.getForrestWorkDirectory(workspace)
+ logDirectory=workspace.getLogDirectory()
+
+ try:
+ #
+ # Sync over public pages...
+ #
+ syncDirectories(forrestWorkDir,logDirectory)
+ #
+ # Clean up
+ #
+ wipeDirectoryTree(forrestWorkDir)
+ except:
+ log.error('--- Failed to work->log sync and/or clean-up', exc_info=1)
+ success=0
+
+ return success
#####################################################################
#
@@ -265,8 +288,8 @@
if not method: continue
if isinstance(method,types.TypeType): continue
if not isinstance(method,types.MethodType): continue
- if not callable(meth): continue
- if not name.startswith('get') or not name.startswith('is') : continue
+ if not callable(method): continue
+ if not (name.startswith('get') or name.startswith('is')) : continue
optTable.createEntry(str(name),str(method()))
opts+=1
1.3 +21 -3 gump/python/exe.py
Index: exe.py
===================================================================
RCS file: /home/cvs/gump/python/exe.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exe.py 2 Dec 2003 17:36:40 -0000 1.2
+++ exe.py 6 Apr 2004 15:57:11 -0000 1.3
@@ -1,3 +1,23 @@
+#!/usr/bin/python
+
+# Copyright 2003-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# $Header$
+#
+
# exe.py
from distutils.core import setup
import py2exe
@@ -6,6 +26,4 @@
# 1 - install py2exe [http://starship.python.net/crew/theller/py2exe/]
# 2 - run: python exedist.py py2exe
-setup(name="integrate",
- scripts=["integrate.py"],
-)
+setup(name="integrate",scripts=["integrate.py"],)
1.1 gump/python/header.txt
Index: header.txt
===================================================================
#!/usr/bin/python
# Copyright 2003-2004 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# $Header: /home/cvs/gump/python/header.txt,v 1.1 2004/04/06 15:57:11 ajack Exp $
#
1.8 +3 -1 gump/python/gump/results/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/gump/python/gump/results/model.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- model.py 15 Mar 2004 22:07:06 -0000 1.7
+++ model.py 6 Apr 2004 15:57:11 -0000 1.8
@@ -16,7 +16,9 @@
"""
- This module contains information on
+
+ Results (a tree of status)
+
"""
from time import localtime, strftime, tzname
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
