Author: ajack
Date: Mon Aug 2 14:51:57 2004
New Revision: 35602
Added:
gump/trunk/bin/gmp.bat
- copied unchanged from rev 35579, gump/trunk/bin/gump.bat
gump/trunk/bin/gmp.sh (props changed)
- copied unchanged from rev 35579, gump/trunk/bin/gump.sh
Removed:
gump/trunk/.cvsignore
gump/trunk/bin/gump.bat
gump/trunk/bin/gump.sh
gump/trunk/python/.cvsignore
gump/trunk/python/gump/.cvsignore
gump/trunk/python/gump/admin/.cvsignore
gump/trunk/python/gump/build/.cvsignore
gump/trunk/python/gump/core/.cvsignore
gump/trunk/python/gump/document/.cvsignore
gump/trunk/python/gump/document/text/.cvsignore
gump/trunk/python/gump/document/xdocs/.cvsignore
gump/trunk/python/gump/gui/.cvsignore
gump/trunk/python/gump/gui/images/.cvsignore
gump/trunk/python/gump/guru/.cvsignore
gump/trunk/python/gump/integration/.cvsignore
gump/trunk/python/gump/java/.cvsignore
gump/trunk/python/gump/loader/.cvsignore
gump/trunk/python/gump/model/.cvsignore
gump/trunk/python/gump/notify/.cvsignore
gump/trunk/python/gump/performance/.cvsignore
gump/trunk/python/gump/process/.cvsignore
gump/trunk/python/gump/repository/.cvsignore
gump/trunk/python/gump/results/.cvsignore
gump/trunk/python/gump/run/.cvsignore
gump/trunk/python/gump/runner/.cvsignore
gump/trunk/python/gump/shared/.cvsignore
gump/trunk/python/gump/stats/.cvsignore
gump/trunk/python/gump/storage/.cvsignore
gump/trunk/python/gump/svg/.cvsignore
gump/trunk/python/gump/syndication/.cvsignore
gump/trunk/python/gump/test/.cvsignore
gump/trunk/python/gump/test/resources/complete1/.cvsignore
gump/trunk/python/gump/test/resources/full1/.cvsignore
gump/trunk/python/gump/threads/.cvsignore
gump/trunk/python/gump/timing/.cvsignore
gump/trunk/python/gump/update/.cvsignore
gump/trunk/python/gump/utils/.cvsignore
gump/trunk/python/storage/random/.cvsignore
gump/trunk/python/tool/.cvsignore
gump/trunk/template/forrest/.cvsignore
Modified:
gump/trunk/ (props changed)
gump/trunk/bin/ (props changed)
gump/trunk/bin/gmp.py
gump/trunk/cron/gump.bat
gump/trunk/cron/gump.py
gump/trunk/python/ (props changed)
gump/trunk/python/gump/ (props changed)
gump/trunk/python/gump/admin/ (props changed)
gump/trunk/python/gump/core/config.py
gump/trunk/python/gump/process/launcher.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/test/resources/full1/ (props changed)
gump/trunk/python/tool/commitCheck.py
Log:
More migrating to SVN.
Modified: gump/trunk/bin/gmp.py
==============================================================================
--- gump/trunk/bin/gmp.py (original)
+++ gump/trunk/bin/gmp.py Mon Aug 2 14:51:57 2004
@@ -94,7 +94,7 @@
if not os.environ.has_key('GUMP_HOME'):
- print 'Please set GUMP_HOME to where Gump is installed.'
+ print 'Please set GUMP_HOME to where Gump (SVN code) is installed.'
sys.exit(1)
# Allow a lock
Modified: gump/trunk/cron/gump.bat
==============================================================================
Binary files. No diff available.
Modified: gump/trunk/cron/gump.py
==============================================================================
Binary files. No diff available.
Modified: gump/trunk/python/gump/core/config.py
==============================================================================
--- gump/trunk/python/gump/core/config.py (original)
+++ gump/trunk/python/gump/core/config.py Mon Aug 2 14:51:57 2004
@@ -36,7 +36,7 @@
"""Configuration of paths"""
cmdpath = os.path.abspath(sys.argv[0])
- base = os.path.abspath('%s/%s' % (os.path.dirname(cmdpath),'../..'))
+ base = os.path.abspath('%s/%s' % (os.path.dirname(cmdpath),'..'))
gump = os.path.abspath(os.path.dirname(cmdpath))
Modified: gump/trunk/python/gump/process/launcher.py
==============================================================================
--- gump/trunk/python/gump/process/launcher.py (original)
+++ gump/trunk/python/gump/process/launcher.py Mon Aug 2 14:51:57 2004
@@ -32,7 +32,7 @@
import gump.process.command
-LAUNCHER=os.path.join(os.path.join(os.path.join(os.path.join('..','python'),'gump'),'process'),'launcher.py')
+LAUNCHER=os.path.join(os.path.join(os.path.join('python','gump'),'process'),'launcher.py')
def execute(cmd,tmp=dir.tmp):
res=gump.process.command.CmdResult(cmd)
Modified: gump/trunk/python/gump/run/gumpenv.py
==============================================================================
--- gump/trunk/python/gump/run/gumpenv.py (original)
+++ gump/trunk/python/gump/run/gumpenv.py Mon Aug 2 14:51:57 2004
@@ -79,6 +79,9 @@
self.javaProperties=None
+ # GUMP_HOME
+ self.gumpHome = None
+
# JAVACMD can override this, see checkEnvironment
self.javaHome = None
self.javaCommand = 'java'
@@ -109,6 +112,10 @@
#
# Directories...
+
+ self._checkEnvVariable('GUMP_HOME')
+ self.gumpHome = os.environ['GUMP_HOME']
+
# JAVACMD can be set (perhaps for JRE verse JDK)
if os.environ.has_key('JAVACMD'):
self.javaCommand = os.environ['JAVACMD']
@@ -185,6 +192,11 @@
os.environ['CLASSPATH']=''
self.set=True
+
+ def getGumpHome(self):
+ # Ensure we've determined the Gump Home
+ self.checkEnvironment()
+ return self.gumpHome
def getJavaHome(self):
# Ensure we've determined the Java Home
Modified: gump/trunk/python/tool/commitCheck.py
==============================================================================
--- gump/trunk/python/tool/commitCheck.py (original)
+++ gump/trunk/python/tool/commitCheck.py Mon Aug 2 14:51:57 2004
@@ -107,7 +107,7 @@
line = input.readline()
# Allow a lock
-lockFile=os.path.abspath('gumpy_check.lock')
+lockFile=os.path.abspath('gump_check.lock')
if os.path.exists(lockFile):
# :TODO: Ought we look at the contents, get the PID of the
# supposed other Gump, and determine if it is still alive
@@ -133,7 +133,7 @@
lock.close()
# Enable a log
-logFile=os.path.abspath('gumpy_check_log.txt')
+logFile=os.path.abspath('gump_check_log.txt')
log=open(logFile,'w',0) # Unbuffered...
result=0
@@ -215,7 +215,7 @@
if not result:
# A test run...
- integrationExit = runCommand('gumpy')
+ integrationExit = runCommand('gump')
if integrationExit:
log.write('**************** Test Run Failed ***************\n')
result=1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
