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/05/19 18:02:03 UTC
cvs commit: gump/python/gump/gui view.py
ajack 2004/05/19 09:02:03
Modified: python/gump/shared Tag: MultiRunner __init__.py
python/gump/test Tag: MultiRunner __init__.py xref.py
resolving.py stats.py updater.py documenter.py
tasks.py notifying.py utils.py pyunit.py
python/gump/core Tag: MultiRunner commandLine.py gumpinit.py
python/gump/model Tag: MultiRunner module.py workspace.py
object.py project.py ant.py property.py
python/gump/syndication Tag: MultiRunner syndicator.py
abstract.py
python/gump/update Tag: MultiRunner cvs.py updater.py
python/gump/test/resources/complete1 Tag: MultiRunner
svn_repository1.xml server1.xml maven1.xml
python/gump/build Tag: MultiRunner maven.py builder.py
script.py
python/gump/stats Tag: MultiRunner __init__.py
python/gump/test/resources/full1 Tag: MultiRunner
server1.xml
python/gump/results Tag: MultiRunner __init__.py
python/gump/runner Tag: MultiRunner tasks.py
python/gump/utils Tag: MultiRunner __init__.py
python/gump/guru Tag: MultiRunner __init__.py
python/gump/notify Tag: MultiRunner __init__.py
python/gump/gui Tag: MultiRunner view.py
Added: python/gump/update Tag: MultiRunner svn.py jars.py
Log:
1) Try to 'look ahead' in the updates. (svn status --show-updates, cvs -n)
2) Fix Updater when called out of sequence
3) Tinker w/ GC.
Revision Changes Path
No revision
No revision
1.1.2.1 +1 -1 gump/python/gump/shared/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/shared/__init__.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- __init__.py 9 Apr 2004 22:38:25 -0000 1.1
+++ __init__.py 19 May 2004 16:01:54 -0000 1.1.2.1
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# tell Python what modules make up the gump.output package
+# tell Python what modules make up the gump.shared package
__all__ = ["comparator"]
No revision
No revision
1.11.2.2 +2 -2 gump/python/gump/test/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/__init__.py,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- __init__.py 17 May 2004 21:41:21 -0000 1.11.2.1
+++ __init__.py 19 May 2004 16:01:54 -0000 1.11.2.2
@@ -27,7 +27,7 @@
from gump.model.rawmodel import XMLWorkspace
from gump.model.workspace import Workspace
-from gump.output.statsdb import StatisticsDB
+from gump.stats.statsdb import StatisticsDB
from gump.utils.tools import listDirectoryToFileHolder
from gump.utils.work import *
@@ -47,7 +47,7 @@
# Some file items...
listDirectoryToFileHolder(workspace,workspace.getBaseDirectory())
for module in workspace.getModules():
- listDirectoryToFileHolder(module,module.getSourceDirectory())
+ listDirectoryToFileHolder(module,module.getWorkingDirectory())
for project in module.getProjects():
listDirectoryToFileHolder(project,project.getHomeDirectory())
1.4.2.1 +1 -1 gump/python/gump/test/xref.py
Index: xref.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/xref.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- xref.py 16 Apr 2004 17:28:35 -0000 1.4
+++ xref.py 19 May 2004 16:01:54 -0000 1.4.2.1
@@ -25,7 +25,7 @@
import gump.core.config
from gump.model.state import *
from gump.model.loader import WorkspaceLoader
-from gump.output.xref import XRefGuru
+from gump.guru.xref import XRefGuru
from gump.utils import *
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
1.6.2.2 +1 -1 gump/python/gump/test/resolving.py
Index: resolving.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resolving.py,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- resolving.py 17 May 2004 20:22:04 -0000 1.6.2.1
+++ resolving.py 19 May 2004 16:01:54 -0000 1.6.2.2
@@ -26,7 +26,7 @@
import gump.core.config
from gump.test import *
from gump.document.text.resolver import *
-from gump.document.forrest.resolver import *
+from gump.document.xdocs.resolver import *
from gump.test.pyunit import UnitTestSuite
1.10.2.2 +1 -1 gump/python/gump/test/stats.py
Index: stats.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/stats.py,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- stats.py 17 May 2004 21:41:21 -0000 1.10.2.1
+++ stats.py 19 May 2004 16:01:54 -0000 1.10.2.2
@@ -23,7 +23,7 @@
from gump import log
import gump.core.config
-from gump.output.statsdb import *
+from gump.stats.statsdb import *
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
1.6.2.1 +1 -1 gump/python/gump/test/updater.py
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/updater.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- updater.py 16 Apr 2004 17:28:35 -0000 1.6
+++ updater.py 19 May 2004 16:01:54 -0000 1.6.2.1
@@ -23,7 +23,7 @@
from gump import log
import gump.core.config
-from gump.output.statsdb import *
+from gump.stats.statsdb import *
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
1.6.2.1 +2 -3 gump/python/gump/test/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/documenter.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- documenter.py 16 Apr 2004 17:28:35 -0000 1.6
+++ documenter.py 19 May 2004 16:01:55 -0000 1.6.2.1
@@ -25,9 +25,8 @@
from gump.core.gumprun import GumpRun
from gump.document.documenter import Documenter
from gump.document.text.documenter import TextDocumenter
-from gump.document.template.documenter import TemplateDocumenter
-from gump.document.forrest.documenter import ForrestDocumenter
-from gump.output.statsdb import *
+from gump.document.xdocs.documenter import XDocDocumenter
+from gump.stats.statsdb import *
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
1.1.2.2 +1 -1 gump/python/gump/test/Attic/tasks.py
Index: tasks.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/Attic/tasks.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- tasks.py 17 May 2004 20:22:03 -0000 1.1.2.1
+++ tasks.py 19 May 2004 16:01:55 -0000 1.1.2.2
@@ -25,7 +25,7 @@
from gump import log
import gump.core.config
from gump.core.gumprun import GumpRun
-from gump.core.tasks import SequentialTaskRunner, GumpTaskList
+from gump.runner.tasks import SequentialTaskRunner, GumpTaskList
from gump.test.pyunit import UnitTestSuite
class TasksTestSuite(UnitTestSuite):
1.1.2.3 +1 -1 gump/python/gump/test/Attic/notifying.py
Index: notifying.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/Attic/notifying.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- notifying.py 17 May 2004 23:45:51 -0000 1.1.2.2
+++ notifying.py 19 May 2004 16:01:55 -0000 1.1.2.3
@@ -26,7 +26,7 @@
from gump.core.gumprun import GumpRun
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
-from gump.output.notify import notify,Notifier
+from gump.notify.notifier import notify,Notifier
from gump.net.smtp import *
class NotificationTestSuite(UnitTestSuite):
1.10.2.1 +7 -1 gump/python/gump/test/utils.py
Index: utils.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/utils.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- utils.py 15 May 2004 18:02:31 -0000 1.10
+++ utils.py 19 May 2004 16:01:55 -0000 1.10.2.1
@@ -138,7 +138,13 @@
def testUnicode(self):
getStringFromUnicode("Ceki G�lc�")
+ def testInitGarbageCollection(self):
+ initializeGarbageCollection()
+
+ def testInspectGarbageCollection(self):
+ invokeGarbageCollection('testInspect')
+
def testGarbageCollection(self):
- invokeGarbageCollection()
+ invokeGarbageCollection('testCollect')
1.30.2.2 +2 -2 gump/python/gump/test/pyunit.py
Index: pyunit.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/pyunit.py,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -r1.30.2.1 -r1.30.2.2
--- pyunit.py 17 May 2004 20:22:04 -0000 1.30.2.1
+++ pyunit.py 19 May 2004 16:01:55 -0000 1.30.2.2
@@ -231,8 +231,8 @@
# Record the problem
results.append(Problem(self,name,message))
- # Seems a nice place to clean up...
- invokeGarbageCollection()
+ # Seems a nice place to peek...
+ inspectGarbageCollection(self.__class__.__name__+':'+test.__name__)
if hasattr(self,'suiteTearDown'):
self.suiteTearDown()
No revision
No revision
1.6.2.2 +1 -1 gump/python/gump/core/commandLine.py
Index: commandLine.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/commandLine.py,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- commandLine.py 17 May 2004 20:22:03 -0000 1.6.2.1
+++ commandLine.py 19 May 2004 16:01:56 -0000 1.6.2.2
@@ -129,7 +129,7 @@
log.info("No workspace defined with -w or -workspace.")
log.info("Using default workspace: " + default.workspace)
- # Remove the XXX.PY
+ # Remove the XXXXXX.py
del argv[0]
# determine which modules the user desires (wildcards are permitted)
1.2.2.2 +6 -1 gump/python/gump/core/gumpinit.py
Index: gumpinit.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumpinit.py,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- gumpinit.py 17 May 2004 23:45:52 -0000 1.2.2.1
+++ gumpinit.py 19 May 2004 16:01:56 -0000 1.2.2.2
@@ -31,17 +31,22 @@
from gump import log
from gump.core.config import dir, default, setting, switch, basicConfig
+from gump.utils import initializeGarbageCollection
###############################################################################
# Initialize
###############################################################################
def gumpinit():
+
#set verbosity to show all messages of severity >= default.logLevel
log.setLevel(default.logLevel)
# Ensure dirs exists,
basicConfig()
+ # Initialize GC (sometimes w/ debug)
+ initializeGarbageCollection()
+
#
timestamp=os.path.join(dir.base,'.timestamp')
if os.path.exists(timestamp):
No revision
No revision
1.43.2.3 +17 -7 gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/module.py,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -u -r1.43.2.2 -r1.43.2.3
--- module.py 17 May 2004 21:41:21 -0000 1.43.2.2
+++ module.py 19 May 2004 16:01:56 -0000 1.43.2.3
@@ -287,9 +287,16 @@
# Determine source directory
- self.srcdir=self.xml.srcdir or self.xml.name
- self.absSrcDir=os.path.join(workspace.getBaseDirectory(),self.srcdir)
-
+ self.workdir=self.xml.srcdir or self.xml.name
+ self.absWorkingDir= \
+ os.path.abspath(
+ os.path.join(workspace.getBaseDirectory(), \
+ self.workdir))
+
+ self.absSrcCtlDir= \
+ os.path.abspath(
+ os.path.join( workspace.getSourceControlStagingDirectory(), \
+ self.name)) # todo allow override
# :TODO: Consolidate this code, less cut-n-paste but also
# check the 'type' of the repository is appropriate for the
@@ -494,11 +501,14 @@
def getTag(self):
return str(self.tag)
- def getSourceDirectory(self):
- return self.absSrcDir
+ def getSourceControlStagingDirectory(self):
+ return self.absSrcCtlDir
+
+ def getWorkingDirectory(self):
+ return self.absWorkingDir
- def getSourceDirName(self):
- return self.srcdir
+ def getModuleDirName(self):
+ return self.workdir
def hasURL(self):
return self.getURL()
1.48.2.3 +1 -1 gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -u -r1.48.2.2 -r1.48.2.3
--- workspace.py 17 May 2004 21:41:21 -0000 1.48.2.2
+++ workspace.py 19 May 2004 16:01:56 -0000 1.48.2.3
@@ -609,7 +609,7 @@
def getModuleIterator(self):
return AlphabeticDictionaryIterator(self.modules)
- def getCvsDirectory(self):
+ def getSourceControlStagingDirectory(self):
return self.cvsdir
1.23.2.3 +1 -1 gump/python/gump/model/object.py
Index: object.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/object.py,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -r1.23.2.2 -r1.23.2.3
--- object.py 18 May 2004 20:10:45 -0000 1.23.2.2
+++ object.py 19 May 2004 16:01:56 -0000 1.23.2.3
@@ -261,7 +261,7 @@
path=None
if self.xml.nested:
path=os.path.abspath( \
- os.path.join( self.owner.getModule().getSourceDirectory(), \
+ os.path.join( self.owner.getModule().getWorkingDirectory(), \
self.xml.nested))
elif self.xml.parent:
path=os.path.abspath( \
1.82.2.3 +5 -5 gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.82.2.2
retrieving revision 1.82.2.3
diff -u -r1.82.2.2 -r1.82.2.3
--- project.py 17 May 2004 21:41:22 -0000 1.82.2.2
+++ project.py 19 May 2004 16:01:56 -0000 1.82.2.3
@@ -380,7 +380,7 @@
# if one is set
if self.xml.basedir:
self.basedir = os.path.abspath(os.path.join( \
- self.getModule().getSourceDirectory() or dir.base, \
+ self.getModule().getWorkingDirectory() or dir.base, \
self.xml.basedir))
# Compute home directory
@@ -395,7 +395,7 @@
if self.xml.home.nested:
module=self.getModule()
self.home=os.path.abspath(\
- os.path.join(module.getSourceDirectory(),\
+ os.path.join(module.getWorkingDirectory(),\
self.xml.home.nested))
elif self.xml.home.parent:
self.home=os.path.abspath( \
@@ -408,7 +408,7 @@
elif not self.xml.home:
if self.module:
module=self.getModule()
- self.home=os.path.abspath(module.getSourceDirectory())
+ self.home=os.path.abspath(module.getWorkingDirectory())
else:
self.home=os.path.abspath(os.path.join(workspace.getBaseDirectory(),self.name))
else:
@@ -685,7 +685,7 @@
# Add this project's work directories (these go into
# CLASSPATH, never BOOTCLASSPATH)
#
- srcdir=self.getModule().getSourceDirectory()
+ workdir=self.getModule().getWorkingDirectory()
#
# Add the work directories
@@ -693,7 +693,7 @@
for work in self.xml.work:
path=None
if work.nested:
- path=os.path.abspath(os.path.join(srcdir,work.nested))
+ path=os.path.abspath(os.path.join(workdir,work.nested))
elif work.parent:
path=os.path.abspath(os.path.join(self.getWorkspace().getBaseDirectory(),work.parent))
else:
1.21.2.1 +1 -1 gump/python/gump/model/ant.py
Index: ant.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/ant.py,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- ant.py 28 Mar 2004 19:57:59 -0000 1.21
+++ ant.py 19 May 2004 16:01:57 -0000 1.21.2.1
@@ -168,7 +168,7 @@
# Set this up...
self.basedir = os.path.abspath(os.path.join( \
- self.project.getModule().getSourceDirectory() or dir.base, \
+ self.project.getModule().getWorkingDirectory() or dir.base, \
self.xml.basedir or self.project.getBaseDirectory() or ''))
self.setComplete(1)
1.20.2.1 +2 -2 gump/python/gump/model/property.py
Index: property.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/property.py,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- property.py 28 Mar 2004 21:37:23 -0000 1.20
+++ property.py 19 May 2004 16:01:57 -0000 1.20.2.1
@@ -52,7 +52,7 @@
if not workspace.hasProject(self.xml.project):
responsibleParty.addError('Cannot resolve srcdir of *unknown* [' + self.xml.project + ']')
else:
- self.setValue(workspace.getProject(self.xml.project).getModule().getSourceDirectory())
+ self.setValue(workspace.getProject(self.xml.project).getModule().getWorkingDirectory())
elif self.xml.reference=='jarpath' or self.xml.reference=='jar':
if not workspace.hasProject(self.xml.project):
@@ -111,7 +111,7 @@
# Path relative to module's srcdir (doesn't work in workspace)
#
self.value=os.path.abspath(os.path.join( \
- relativeProject.getModule().getSourceDirectory(), \
+ relativeProject.getModule().getWorkingDirectory(), \
self.xml.path))
else:
responsibleParty.addError('Can\'t have path on property on workspace: ' + \
No revision
No revision
1.19.2.4 +2 -2 gump/python/gump/syndication/syndicator.py
Index: syndicator.py
===================================================================
RCS file: /home/cvs/gump/python/gump/syndication/syndicator.py,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- syndicator.py 18 May 2004 22:51:00 -0000 1.19.2.3
+++ syndicator.py 19 May 2004 16:01:57 -0000 1.19.2.4
@@ -49,7 +49,7 @@
#
try:
from gump.syndication.rss import RSSSyndicator
- simple=RSSSyndicator(run)
+ simple=RSSSyndicator(self.run)
simple.syndicate()
except:
log.error('Failed to generate RSS Feeds', exc_info=1)
@@ -59,7 +59,7 @@
#
try:
from gump.syndication.atom import AtomSyndicator
- atom=AtomSyndicator(run)
+ atom=AtomSyndicator(self.run)
atom.syndicate()
except:
log.error('Failed to generate Atom Feeds', exc_info=1)
1.1.2.4 +4 -3 gump/python/gump/syndication/Attic/abstract.py
Index: abstract.py
===================================================================
RCS file: /home/cvs/gump/python/gump/syndication/Attic/abstract.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- abstract.py 18 May 2004 22:51:00 -0000 1.1.2.3
+++ abstract.py 19 May 2004 16:01:57 -0000 1.1.2.4
@@ -68,6 +68,7 @@
from xml.sax.saxutils import escape
from gump import log
+from gump.core.gumprun import *
from gump.model.state import *
from gump.model.project import ProjectStatistics
No revision
No revision
1.1.2.3 +45 -6 gump/python/gump/update/Attic/cvs.py
Index: cvs.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/cvs.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- cvs.py 17 May 2004 23:45:52 -0000 1.1.2.2
+++ cvs.py 19 May 2004 16:01:58 -0000 1.1.2.3
@@ -69,8 +69,37 @@
'] : ' + module.getName())
# Did we 'CVS checkout' already?
- exists = os.path.exists(module.getName())
+ exists = os.path.exists(module.getSourceControlStagingDirectory())
+ if exists:
+ self.performStatus(module)
+
+ self.performUpdate(module,exists)
+
+ return module.okToPerformWork()
+
+ def performStatus(self,module):
+ # Get the Update Command
+ (repository, root, cmd ) = self.getCvsUpdateCommand(module, 1, 1)
+
+ # Provide CVS logins, if not already there
+ loginToRepositoryOnDemand(repository,root,self.logins)
+
+ # Execute the command and capture results
+ cmdResult=execute(cmd, module.getWorkspace().tmpdir)
+
+ #
+ # Store this as work, on both the module and (cloned) on the repo
+ #
+ work=CommandWorkItem(WORK_TYPE_UPDATE,cmd,cmdResult)
+ module.performedWork(work)
+
+ if not cmdResult.state==CMD_STATE_SUCCESS:
+ log.error('Failed to checkout/update module: ' + module.name)
+
+
+
+ def performUpdate(self,module,exists):
# Get the Update Command
(repository, root, cmd ) = self.getCvsUpdateCommand(module, exists)
@@ -104,11 +133,10 @@
module.changeState(STATE_SUCCESS,REASON_UPDATE_FAILED)
else:
module.changeState(STATE_SUCCESS)
-
- return module.okToPerformWork()
+
- def getCvsUpdateCommand(self,module,exists=0):
+ def getCvsUpdateCommand(self,module,exists=0,nowork=0):
"""
Format a commandline for doing the CVS update
@@ -124,8 +152,16 @@
#
# Prepare CVS checkout/update command...
- #
- cmd=Cmd('cvs','update_'+module.getName(),module.getWorkspace().cvsdir)
+ #
+ prefix='update'
+ directory=module.getWorkspace().getSourceControlStagingDirectory()
+ if nowork:
+ prefix='status'
+ directory=module.getSourceControlStagingDirectory()
+
+ cmd=Cmd( 'cvs',
+ prefix+'_'+module.getName(),
+ directory)
#
# Be 'quiet' (but not silent) unless requested otherwise.
@@ -135,6 +171,9 @@
and not module.cvs.isDebug() \
and not module.cvs.isVerbose():
cmd.addParameter('-q')
+
+ if nowork:
+ cmd.addParameter('-n')
#
# Allow trace for debug
1.1.2.4 +11 -100 gump/python/gump/update/Attic/updater.py
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/updater.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- updater.py 17 May 2004 23:45:52 -0000 1.1.2.3
+++ updater.py 19 May 2004 16:01:58 -0000 1.1.2.4
@@ -28,6 +28,8 @@
from gump.core.config import dir, default, basicConfig
from gump.update.cvs import CvsUpdater
+from gump.update.svn import SvnUpdater
+from gump.update.jars import JarsUpdater
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -54,8 +56,8 @@
RunSpecific.__init__(self, run)
self.cvs=CvsUpdater(run)
- #self.svn=SvnUpdater(run)
- #self.jars=JarsUpdater(run)
+ self.svn=SvnUpdater(run)
+ self.jars=JarsUpdater(run)
"""
@@ -97,9 +99,7 @@
workspace = self.run.getWorkspace()
- # :TODO: A tad bogus to move here
- os.chdir(workspace.getCvsDirectory())
- log.debug("Workspace CVS Directory: " + workspace.getCvsDirectory())
+ log.debug("Workspace CVS|SVN|Jars Directory: " + workspace.getSourceControlStagingDirectory())
#log.debug('Modules to update:')
@@ -129,10 +129,10 @@
if module.hasCvs():
ok =self.cvs.updateModule(module)
- #elif module.hasSvn():
- # ok=self.svn.updateModule(module)
- #elif module.hasJars():
- # ok=self.jars.updateModule(module)
+ elif module.hasSvn():
+ ok=self.svn.updateModule(module)
+ elif module.hasJars():
+ ok=self.jars.updateModule(module)
else:
# :TODO: Now what?
pass
@@ -153,10 +153,8 @@
"""
workspace = module.getWorkspace()
- sourcedir = os.path.abspath( \
- os.path.join( workspace.getCvsDirectory(), \
- module.name)) # todo allow override
- destdir = module.getSourceDirectory()
+ sourcedir = module.getSourceControlStagingDirectory()
+ destdir = module.getWorkingDirectory()
# Perform the sync...
try:
@@ -188,90 +186,3 @@
log.error('Synchronize Failed ' + str(details), exc_info=1)
return module.okToPerformWork()
-
-
- def getSvnUpdateCommand(self,exists=0):
-
- log.debug("SubVersion Update Module " + self.getName() + \
- ", Repository Name: " + str(self.repository.getName()))
-
- url=self.svn.getRootUrl()
-
- log.debug("SVN URL: [" + url + "] on Repository: " + self.repository.getName())
-
- #
- # Prepare SVN checkout/update command...
- #
- cmd=Cmd('svn', 'update_'+self.getName(), self.getWorkspace().cvsdir)
-
- #
- # Be 'quiet' (but not silent) unless requested otherwise.
- #
- if not self.isDebug() \
- and not self.isVerbose() \
- and not self.svn.isDebug() \
- and not self.svn.isVerbose():
- cmd.addParameter('--quiet')
-
- #
- # Allow trace for debug
- #
- # SVN complains about -v|--verbose, don't ask me why
- #
- # if self.isDebug() or self.svn.isDebug():
- # cmd.addParameter('--verbose')
-
- if exists:
- # do an SVN update
- cmd.addParameter('update')
- else:
- # do an SVN checkout
- cmd.addParameter('checkout')
- cmd.addParameter(url)
-
- #
- # Request non-interactive
- #
- cmd.addParameter('--non-interactive')
-
- #
- # If module name != SVN directory, tell SVN to put it into
- # a directory named after our module
- #
- if self.svn.hasDir():
- if not self.svn.getDir() == self.getName():
- cmd.addParameter(self.getName())
-
-
- return (self.repository, url, cmd)
-
-
- def getJarsUpdateCommand(self,exists=0):
-
- log.debug("Jars Update Module " + self.getName() + \
- ", Repository Name: " + str(self.repository.getName()))
-
- url=self.jars.getRootUrl()
-
- log.debug("Jars URL: [" + url + "] on Repository: " + self.repository.getName())
-
- #
- # Prepare Jars checkout/update command...
- #
- cmd=Cmd('update.py', \
- 'update_'+self.getName(), \
- self.getWorkspace().cvsdir)
-
- cmd.addParameter(url)
-
- #
- # Be 'quiet' (but not silent) unless requested otherwise.
- #
- if not self.isDebug() \
- and not self.isVerbose() \
- and not self.jars.isDebug() \
- and not self.jars.isVerbose():
- cmd.addParameter('-q')
-
- return (self.repository, url, cmd)
-
No revision
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/updater.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- updater.py 17 May 2004 23:45:52 -0000 1.1.2.3
+++ updater.py 19 May 2004 16:01:58 -0000 1.1.2.4
@@ -28,6 +28,8 @@
from gump.core.config import dir, default, basicConfig
from gump.update.cvs import CvsUpdater
+from gump.update.svn import SvnUpdater
+from gump.update.jars import JarsUpdater
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -54,8 +56,8 @@
RunSpecific.__init__(self, run)
self.cvs=CvsUpdater(run)
- #self.svn=SvnUpdater(run)
- #self.jars=JarsUpdater(run)
+ self.svn=SvnUpdater(run)
+ self.jars=JarsUpdater(run)
"""
@@ -97,9 +99,7 @@
workspace = self.run.getWorkspace()
- # :TODO: A tad bogus to move here
- os.chdir(workspace.getCvsDirectory())
- log.debug("Workspace CVS Directory: " + workspace.getCvsDirectory())
+ log.debug("Workspace CVS|SVN|Jars Directory: " + workspace.getSourceControlStagingDirectory())
#log.debug('Modules to update:')
@@ -129,10 +129,10 @@
if module.hasCvs():
ok =self.cvs.updateModule(module)
- #elif module.hasSvn():
- # ok=self.svn.updateModule(module)
- #elif module.hasJars():
- # ok=self.jars.updateModule(module)
+ elif module.hasSvn():
+ ok=self.svn.updateModule(module)
+ elif module.hasJars():
+ ok=self.jars.updateModule(module)
else:
# :TODO: Now what?
pass
@@ -153,10 +153,8 @@
"""
workspace = module.getWorkspace()
- sourcedir = os.path.abspath( \
- os.path.join( workspace.getCvsDirectory(), \
- module.name)) # todo allow override
- destdir = module.getSourceDirectory()
+ sourcedir = module.getSourceControlStagingDirectory()
+ destdir = module.getWorkingDirectory()
# Perform the sync...
try:
@@ -188,90 +186,3 @@
log.error('Synchronize Failed ' + str(details), exc_info=1)
return module.okToPerformWork()
-
-
- def getSvnUpdateCommand(self,exists=0):
-
- log.debug("SubVersion Update Module " + self.getName() + \
- ", Repository Name: " + str(self.repository.getName()))
-
- url=self.svn.getRootUrl()
-
- log.debug("SVN URL: [" + url + "] on Repository: " + self.repository.getName())
-
- #
- # Prepare SVN checkout/update command...
- #
- cmd=Cmd('svn', 'update_'+self.getName(), self.getWorkspace().cvsdir)
-
- #
- # Be 'quiet' (but not silent) unless requested otherwise.
- #
- if not self.isDebug() \
- and not self.isVerbose() \
- and not self.svn.isDebug() \
- and not self.svn.isVerbose():
- cmd.addParameter('--quiet')
-
- #
- # Allow trace for debug
- #
- # SVN complains about -v|--verbose, don't ask me why
- #
- # if self.isDebug() or self.svn.isDebug():
- # cmd.addParameter('--verbose')
-
- if exists:
- # do an SVN update
- cmd.addParameter('update')
- else:
- # do an SVN checkout
- cmd.addParameter('checkout')
- cmd.addParameter(url)
-
- #
- # Request non-interactive
- #
- cmd.addParameter('--non-interactive')
-
- #
- # If module name != SVN directory, tell SVN to put it into
- # a directory named after our module
- #
- if self.svn.hasDir():
- if not self.svn.getDir() == self.getName():
- cmd.addParameter(self.getName())
-
-
- return (self.repository, url, cmd)
-
-
- def getJarsUpdateCommand(self,exists=0):
-
- log.debug("Jars Update Module " + self.getName() + \
- ", Repository Name: " + str(self.repository.getName()))
-
- url=self.jars.getRootUrl()
-
- log.debug("Jars URL: [" + url + "] on Repository: " + self.repository.getName())
-
- #
- # Prepare Jars checkout/update command...
- #
- cmd=Cmd('update.py', \
- 'update_'+self.getName(), \
- self.getWorkspace().cvsdir)
-
- cmd.addParameter(url)
-
- #
- # Be 'quiet' (but not silent) unless requested otherwise.
- #
- if not self.isDebug() \
- and not self.isVerbose() \
- and not self.jars.isDebug() \
- and not self.jars.isVerbose():
- cmd.addParameter('-q')
-
- return (self.repository, url, cmd)
-
No revision
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/updater.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- updater.py 17 May 2004 23:45:52 -0000 1.1.2.3
+++ updater.py 19 May 2004 16:01:58 -0000 1.1.2.4
@@ -28,6 +28,8 @@
from gump.core.config import dir, default, basicConfig
from gump.update.cvs import CvsUpdater
+from gump.update.svn import SvnUpdater
+from gump.update.jars import JarsUpdater
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -54,8 +56,8 @@
RunSpecific.__init__(self, run)
self.cvs=CvsUpdater(run)
- #self.svn=SvnUpdater(run)
- #self.jars=JarsUpdater(run)
+ self.svn=SvnUpdater(run)
+ self.jars=JarsUpdater(run)
"""
@@ -97,9 +99,7 @@
workspace = self.run.getWorkspace()
- # :TODO: A tad bogus to move here
- os.chdir(workspace.getCvsDirectory())
- log.debug("Workspace CVS Directory: " + workspace.getCvsDirectory())
+ log.debug("Workspace CVS|SVN|Jars Directory: " + workspace.getSourceControlStagingDirectory())
#log.debug('Modules to update:')
@@ -129,10 +129,10 @@
if module.hasCvs():
ok =self.cvs.updateModule(module)
- #elif module.hasSvn():
- # ok=self.svn.updateModule(module)
- #elif module.hasJars():
- # ok=self.jars.updateModule(module)
+ elif module.hasSvn():
+ ok=self.svn.updateModule(module)
+ elif module.hasJars():
+ ok=self.jars.updateModule(module)
else:
# :TODO: Now what?
pass
@@ -153,10 +153,8 @@
"""
workspace = module.getWorkspace()
- sourcedir = os.path.abspath( \
- os.path.join( workspace.getCvsDirectory(), \
- module.name)) # todo allow override
- destdir = module.getSourceDirectory()
+ sourcedir = module.getSourceControlStagingDirectory()
+ destdir = module.getWorkingDirectory()
# Perform the sync...
try:
@@ -188,90 +186,3 @@
log.error('Synchronize Failed ' + str(details), exc_info=1)
return module.okToPerformWork()
-
-
- def getSvnUpdateCommand(self,exists=0):
-
- log.debug("SubVersion Update Module " + self.getName() + \
- ", Repository Name: " + str(self.repository.getName()))
-
- url=self.svn.getRootUrl()
-
- log.debug("SVN URL: [" + url + "] on Repository: " + self.repository.getName())
-
- #
- # Prepare SVN checkout/update command...
- #
- cmd=Cmd('svn', 'update_'+self.getName(), self.getWorkspace().cvsdir)
-
- #
- # Be 'quiet' (but not silent) unless requested otherwise.
- #
- if not self.isDebug() \
- and not self.isVerbose() \
- and not self.svn.isDebug() \
- and not self.svn.isVerbose():
- cmd.addParameter('--quiet')
-
- #
- # Allow trace for debug
- #
- # SVN complains about -v|--verbose, don't ask me why
- #
- # if self.isDebug() or self.svn.isDebug():
- # cmd.addParameter('--verbose')
-
- if exists:
- # do an SVN update
- cmd.addParameter('update')
- else:
- # do an SVN checkout
- cmd.addParameter('checkout')
- cmd.addParameter(url)
-
- #
- # Request non-interactive
- #
- cmd.addParameter('--non-interactive')
-
- #
- # If module name != SVN directory, tell SVN to put it into
- # a directory named after our module
- #
- if self.svn.hasDir():
- if not self.svn.getDir() == self.getName():
- cmd.addParameter(self.getName())
-
-
- return (self.repository, url, cmd)
-
-
- def getJarsUpdateCommand(self,exists=0):
-
- log.debug("Jars Update Module " + self.getName() + \
- ", Repository Name: " + str(self.repository.getName()))
-
- url=self.jars.getRootUrl()
-
- log.debug("Jars URL: [" + url + "] on Repository: " + self.repository.getName())
-
- #
- # Prepare Jars checkout/update command...
- #
- cmd=Cmd('update.py', \
- 'update_'+self.getName(), \
- self.getWorkspace().cvsdir)
-
- cmd.addParameter(url)
-
- #
- # Be 'quiet' (but not silent) unless requested otherwise.
- #
- if not self.isDebug() \
- and not self.isVerbose() \
- and not self.jars.isDebug() \
- and not self.jars.isVerbose():
- cmd.addParameter('-q')
-
- return (self.repository, url, cmd)
-
1.1.2.1 +242 -0 gump/python/gump/update/Attic/svn.py
1.1.2.1 +130 -0 gump/python/gump/update/Attic/jars.py
No revision
No revision
1.1.2.2 +1 -1 gump/python/gump/test/resources/complete1/Attic/svn_repository1.xml
Index: svn_repository1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/Attic/svn_repository1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- svn_repository1.xml 17 May 2004 20:22:01 -0000 1.1.2.1
+++ svn_repository1.xml 19 May 2004 16:01:58 -0000 1.1.2.2
@@ -8,6 +8,6 @@
<redistributable/>
- <url>http://svn.apache.org/</url>
+ <url>http://svn.apache.org/repos/test/</url>
</repository>
1.1.2.2 +1 -1 gump/python/gump/test/resources/complete1/Attic/server1.xml
Index: server1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/Attic/server1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- server1.xml 17 May 2004 20:22:02 -0000 1.1.2.1
+++ server1.xml 19 May 2004 16:01:58 -0000 1.1.2.2
@@ -3,6 +3,6 @@
<server name="server1" type="python">
<title>Server 1</title>
<url>http://gump.apache.org</url>
- <url>http://gump.apache.org</url>
+ <site>http://gump.apache.org</site>
<note>Yada Yada Yada</note>
</server>
1.1.2.2 +13 -16 gump/python/gump/test/resources/complete1/Attic/maven1.xml
Index: maven1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/Attic/maven1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- maven1.xml 17 May 2004 20:22:02 -0000 1.1.2.1
+++ maven1.xml 19 May 2004 16:01:58 -0000 1.1.2.2
@@ -5,23 +5,20 @@
Test of Gump using Maven...
</description>
- <cvs repository="repository1"/>
-
+ <svn repository="svn_repository1" dir="gump-test"/>
+
<project name="maven1">
- <package>org.apache.maven</package>
-
- <maven target="gump"/>
-
- <depend project="alias1"/>
-
- <home nested="dist"/>
-
- <jar name="lib/maven1.jar" id="maven1"/>
-
- <license name="LICENSE"/>
-
- <nag from="Gump Integration Build <general@gump.apache.org>"
- to="general@gump.apache.org"/>
+ <maven target="dist" basedir="maven-project1" debug="true"/>
+ <home nested="maven-project1/target"/>
+ <jar name="gump-test-maven1-0.1.jar"/>
</project>
+
+ <project name="maven2">
+ <maven target="dist" basedir="maven-project2" debug="true"/>
+ <home nested="maven-project2/target"/>
+ <jar name="gump-test-maven2-0.1.jar"/>
+ <depend project="maven1"/>
+ </project>
+
</module>
No revision
No revision
1.1.2.3 +5 -13 gump/python/gump/build/Attic/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/maven.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- maven.py 18 May 2004 22:37:31 -0000 1.1.2.2
+++ maven.py 19 May 2004 16:01:59 -0000 1.1.2.3
@@ -26,6 +26,8 @@
from gump.core.gumprun import *
from gump.core.config import dir, default, basicConfig
+from gump.build.abstract import AbstractJavaBuilder
+
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
from gump.utils.note import Annotatable
@@ -50,22 +52,12 @@
def __init__(self,run):
AbstractJavaBuilder.__init__(self,run)
-
- def buildProject(self,project,stats)
+ def buildProject(self,project,stats):
workspace=self.run.getWorkspace()
- log.info(' Project: #[' + `project.getPosition()` + '] of [' + `projectCount` + '] : ' + project.getName())
-
- # Extract stats (in case we want to do conditional processing)
- stats=None
- if project.hasStats():
- stats=project.getStats()
-
- if project.isPackaged():
- self.performProjectPackageProcessing(project, stats)
- continue
-
+ log.info(' Project: #[' + `project.getPosition()` + '] : ' + project.getName())
+
# Do this even if not ok
self.performPreBuild(project, stats)
1.1.2.4 +15 -7 gump/python/gump/build/Attic/builder.py
Index: builder.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/builder.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- builder.py 18 May 2004 22:37:31 -0000 1.1.2.3
+++ builder.py 19 May 2004 16:01:59 -0000 1.1.2.4
@@ -27,7 +27,9 @@
from gump.core.gumprun import *
from gump.core.config import dir, default, basicConfig
+from gump.build.script import ScriptBuilder
from gump.build.ant import AntBuilder
+from gump.build.maven import MavenBuilder
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -54,7 +56,8 @@
RunSpecific.__init__(self,run)
self.ant=AntBuilder(run)
- #self.maven=MavenBuilder(run)
+ self.maven=MavenBuilder(run)
+ self.script=MavenBuilder(run)
# Place repository in jardir (to be renamed to repodir)
self.repository=self.run.getOutputsRepository()
@@ -160,8 +163,13 @@
project.addInfo('Enable "verbose" output, due to %s previous error(s).' % stats.sequenceInState)
project.setVerbose(1)
- if project.hasAnt():
+ # Pick your poison..
+ if project.hasScript():
+ self.script.buildProject(project, stats)
+ elif project.hasAnt():
self.ant.buildProject(project, stats)
+ if project.hasMaven():
+ self.maven.buildProject(project, stats)
# Do this even if not ok
self.performPostBuild( project, wasBuilt, stats )
@@ -176,7 +184,7 @@
def performDelete(self,project,delete,index=0):
""" Return the delete command for a <delete entry """
- basedir=os.path.abspath(project.getModule().getSourceDirectory() or dir.base)
+ basedir=os.path.abspath(project.getModule().getWorkingDirectory() or dir.base)
#
# Delete a directory and/or a file
@@ -207,7 +215,7 @@
def performMkDir(self,project,mkdir,index=0):
""" Return the mkdir comment for a <mkdir entry """
- basedir=os.path.abspath(project.getModule().getSourceDirectory() or dir.base)
+ basedir=os.path.abspath(project.getModule().getWorkingDirectory() or dir.base)
#
# Make a directory
@@ -313,7 +321,7 @@
# If we have a <license name='...
if project.hasLicense():
licensePath=os.path.abspath( \
- os.path.join( project.getModule().getSourceDirectory(), \
+ os.path.join( project.getModule().getWorkingDirectory(), \
project.getLicense() ) )
# Add to list of outputs, in case we
@@ -384,7 +392,7 @@
project.changeState(STATE_SUCCESS)
else:
# List source directory (when failed) in case it helps debugging...
- listDirectoryToFileHolder(project,project.getModule().getSourceDirectory(), \
+ listDirectoryToFileHolder(project,project.getModule().getWorkingDirectory(), \
FILE_TYPE_SOURCE, 'list_source_'+project.getName())
#
@@ -422,7 +430,7 @@
# If we have a <license name='...
if project.hasLicense():
licensePath=os.path.abspath( \
- os.path.join( project.getModule().getSourceDirectory(), \
+ os.path.join( project.getModule().getWorkingDirectory(), \
project.getLicense() ) )
# Add to list of outputs, in case we
1.1.2.3 +3 -12 gump/python/gump/build/Attic/script.py
Index: script.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/script.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- script.py 17 May 2004 23:45:52 -0000 1.1.2.2
+++ script.py 19 May 2004 16:01:59 -0000 1.1.2.3
@@ -45,25 +45,16 @@
# Classes
###############################################################################
-class AntBuilder(RunSpecific):
+class ScriptBuilder(RunSpecific):
def __init__(self,run):
RunSpecific.__init__(self,run)
- def buildProject(self,project,stats)
+ def buildProject(self,project,stats):
workspace=self.run.getWorkspace()
- log.info(' Project: #[' + `project.getPosition()` + '] of [' + `projectCount` + '] : ' + project.getName())
-
- # Extract stats (in case we want to do conditional processing)
- stats=None
- if project.hasStats():
- stats=project.getStats()
-
- if project.isPackaged():
- self.performProjectPackageProcessing(project, stats)
- continue
+ log.info(' Project: #[' + `project.getPosition()` + '] : ' + project.getName())
# Do this even if not ok
self.performPreBuild(project, stats)
No revision
No revision
1.1.2.2 +2 -2 gump/python/gump/stats/Attic/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/stats/Attic/__init__.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- __init__.py 17 May 2004 23:45:51 -0000 1.1.2.1
+++ __init__.py 19 May 2004 16:02:00 -0000 1.1.2.2
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# tell Python what modules make up the gump.output package
-__all__ = ["statsdb"]
+# tell Python what modules make up the gump.stats package
+__all__ = ["statsdb","statistician"]
No revision
No revision
1.3.2.1 +1 -1 gump/python/gump/test/resources/full1/server1.xml
Index: server1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/full1/server1.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- server1.xml 14 Apr 2004 22:12:58 -0000 1.3
+++ server1.xml 19 May 2004 16:02:01 -0000 1.3.2.1
@@ -3,6 +3,6 @@
<server name="server1" type="python">
<title>Server 1</title>
<url>http://gump.apache.org</url>
- <url>http://gump.apache.org</url>
+ <site>http://gump.apache.org</site>
<note>Yada Yada Yada</note>
</server>
No revision
No revision
1.4.2.1 +1 -1 gump/python/gump/results/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/results/__init__.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- __init__.py 15 Mar 2004 22:07:06 -0000 1.4
+++ __init__.py 19 May 2004 16:02:01 -0000 1.4.2.1
@@ -17,5 +17,5 @@
-# tell Python what modules make up the gump.output package
+# tell Python what modules make up the gump.results package
__all__ = ["resulter","module","loader"]
No revision
No revision
1.1.2.3 +1 -1 gump/python/gump/runner/Attic/tasks.py
Index: tasks.py
===================================================================
RCS file: /home/cvs/gump/python/gump/runner/Attic/tasks.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- tasks.py 18 May 2004 22:37:24 -0000 1.1.2.2
+++ tasks.py 19 May 2004 16:02:01 -0000 1.1.2.3
@@ -25,7 +25,7 @@
from gump import log
from gump.core.gumprun import *
-from gump.core.runner import *
+from gump.runner.runner import *
from gump.core.config import dir, default, basicConfig
from gump.utils import dump, display, getIndent, logResourceUtilization, \
No revision
No revision
1.40.2.2 +17 -1 gump/python/gump/utils/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/__init__.py,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -r1.40.2.1 -r1.40.2.2
--- __init__.py 18 May 2004 22:37:29 -0000 1.40.2.1
+++ __init__.py 19 May 2004 16:02:02 -0000 1.40.2.2
@@ -406,6 +406,22 @@
# log.error("Failed get resource utilization." \
#
+def initializeGarbageCollection():
+ tracked = 0
+ try:
+ import gc
+ enabled = gc.isenabled()
+ threshold = gc.get_threshold()
+ tracked = len(gc.get_objects())
+
+ log.info('GC: Enabled %s : Tracked %s : Threshold %s' \
+ % (`enabled`, `tracked`,`threshold`))
+
+ # gc.set_debug(gc.DEBUG_LEAK)
+ except:
+ pass
+ return tracked
+
def inspectGarbageCollection(marker=''):
tracked = 0
try:
@@ -432,7 +448,7 @@
# Curiousity..
if unreachable:
- log.debug('Objects Unreachable by GC : ' + `unreachable`)
+ log.warn('Objects Unreachable by GC : ' + `unreachable`)
# See what GC thinks afterwards...
# inspectGarbageCollection(marker)
No revision
No revision
1.1.2.2 +1 -1 gump/python/gump/guru/Attic/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/guru/Attic/__init__.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- __init__.py 18 May 2004 20:10:44 -0000 1.1.2.1
+++ __init__.py 19 May 2004 16:02:02 -0000 1.1.2.2
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# tell Python what modules make up the gump.output package
+# tell Python what modules make up the gump.guru package
__all__ = ["stats","xref"]
No revision
No revision
1.1.2.2 +1 -1 gump/python/gump/notify/Attic/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/notify/Attic/__init__.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- __init__.py 17 May 2004 23:45:50 -0000 1.1.2.1
+++ __init__.py 19 May 2004 16:02:02 -0000 1.1.2.2
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# tell Python what modules make up the gump.output package
+# tell Python what modules make up the gump.nofity package
__all__ = ["notifier"]
No revision
No revision
1.10.2.2 +4 -4 gump/python/gump/gui/view.py
Index: view.py
===================================================================
RCS file: /home/cvs/gump/python/gump/gui/view.py,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- view.py 17 May 2004 20:22:04 -0000 1.10.2.1
+++ view.py 19 May 2004 16:02:02 -0000 1.10.2.2
@@ -656,7 +656,7 @@
def Run(self):
module=Module.list[self.project.module]
- os.chdir(os.path.join(module.srcdir,self.project.ant.basedir or ''))
+ os.chdir(os.path.join(module.workdir,self.project.ant.basedir or ''))
os.environ['CLASSPATH']=os.pathsep.join(default.classpath+self.project.classpath())
cmd="java org.apache.tools.ant.Main"
for property in self.view.workspace.property+self.project.ant.property:
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org