ajack 2003/11/26 08:08:39
Modified: python/gump engine.py config.py
python/gump/model workspace.py repository.py
python/gump/test/resources/full1 workspace.xml module2.xml
python/gump/document forrest.py
Log:
Tweaks to try to track down <mkdir bug.
Revision Changes Path
1.25 +21 -18 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- engine.py 26 Nov 2003 01:38:11 -0000 1.24
+++ engine.py 26 Nov 2003 16:08:39 -0000 1.25
@@ -354,32 +354,33 @@
def performMkDir(self,project,mkdir,index=0):
""" Return the mkdir comment for a <mkdir entry """
basedir=os.path.abspath(self.getModule().getSourceDirectory() or dir.base)
-
- # ----------------------------------------------------------------
- # :TODO: HACK HACK HACK HACK HACK HACK HACK
- # :TODO: HACK HACK HACK HACK HACK HACK HACK
- # :TODO: HACK HACK HACK HACK HACK HACK HACK
- # Rsync should delete these things, not allow
- # them to exist. We should NOT do this.
- dirToMake=os.path.abspath(os.path.join(basedir,mkdir.dir))
- if not os.path.exists(dirToMake):
+
+ #
+ # Make a directory
+ #
+ if mkdir.dir:
+
+ # ----------------------------------------------------------------
# :TODO: HACK HACK HACK HACK HACK HACK HACK
# :TODO: HACK HACK HACK HACK HACK HACK HACK
# :TODO: HACK HACK HACK HACK HACK HACK HACK
- # ----------------------------------------------------------------
-
- #
- # Make a directory
- #
- if mkdir.dir:
+ # Rsync should delete these things, not allow
+ # them to exist. We should NOT do this.
+ dirToMake=os.path.abspath(os.path.join(basedir,mkdir.dir))
+ if not os.path.exists(dirToMake):
+ # :TODO: HACK HACK HACK HACK HACK HACK HACK
+ # :TODO: HACK HACK HACK HACK HACK HACK HACK
+ # :TODO: HACK HACK HACK HACK HACK HACK HACK
+ # ----------------------------------------------------------------
+
try:
os.makedirs(dirToMake)
except:
project.addError('Failed to make directory ['+dirToMake+']')
raise
- else:
- project.addError(' <mkdir without \'dir\' attribute.')
- raise RuntimeError('Bad <mkdir, missing \'dir\' attribute')
+ else:
+ project.addError(' <mkdir without \'dir\' attribute.')
+ raise RuntimeError('Bad <mkdir, missing \'dir\' attribute')
def performPreBuild( self, run, project ):
""" Perform pre-build Actions """
@@ -402,6 +403,7 @@
dels+=1
project.changeState(STATE_SUCCESS)
except:
+ log.error('PerformDelete Failed', exc_info=1)
project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
if project.okToPerformWork():
@@ -413,6 +415,7 @@
mkdirs+=1
project.changeState(STATE_SUCCESS)
except:
+ log.error('PerformMkdir Failed', exc_info=1)
project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
if not project.okToPerformWork():
1.7 +1 -1 jakarta-gump/python/gump/config.py
Index: config.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/config.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.py 24 Nov 2003 16:14:06 -0000 1.6
+++ config.py 26 Nov 2003 16:08:39 -0000 1.7
@@ -132,7 +132,7 @@
class switch:
"""Configuration of switches """
- optimize=1 # Optimize (at risk to exact correctness) anywhere one can
+ optimize=0 # Optimize (at risk to exact correctness) anywhere one can
optimizenetwork=1 # Do least network traffic
debugging=0 # Not debugging..
1.14 +5 -4 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- workspace.py 24 Nov 2003 23:05:37 -0000 1.13
+++ workspace.py 26 Nov 2003 16:08:39 -0000 1.14
@@ -189,7 +189,8 @@
self.tmpdir=self.xml.tmpdir
if not os.path.exists(self.tmpdir):
- os.mkdir(self.tmpdir)
+ print "TMPDIR: " + self.tmpdir
+ os.makedirs(self.tmpdir)
# Construct logdir on demand
if not self.xml.logdir:
@@ -197,7 +198,7 @@
else:
self.logdir=self.xml.logdir
- if not os.path.exists(self.logdir): os.mkdir(self.logdir)
+ if not os.path.exists(self.logdir): os.makedirs(self.logdir)
# Construct repository dir on demand
if not self.xml.jardir:
@@ -205,7 +206,7 @@
else:
self.jardir=self.xml.jardir
- if not os.path.exists(self.jardir): os.mkdir(self.jardir)
+ if not os.path.exists(self.jardir): os.makedirs(self.jardir)
# Construct CVS directory on demand
if not self.xml.cvsdir:
@@ -213,7 +214,7 @@
else:
self.cvsdir=self.xml.cvsdir
- if not os.path.exists(self.cvsdir): os.mkdir(self.cvsdir)
+ if not os.path.exists(self.cvsdir): os.makedirs(self.cvsdir)
# Package Dir Ought Exist
if not self.xml.pkgdir:
1.5 +14 -3 jakarta-gump/python/gump/model/repository.py
Index: repository.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/repository.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repository.py 21 Nov 2003 19:04:10 -0000 1.4
+++ repository.py 26 Nov 2003 16:08:39 -0000 1.5
@@ -73,9 +73,9 @@
"""A named repository"""
def __init__(self,xml,workspace):
NamedModelObject.__init__(self,xml.getName(),xml,workspace)
-
-
+
if 'cvs'==xml.type:
+ self.type='CVS'
if xml.root:
if xml.root.method:
self.method=xml.root.method
@@ -88,11 +88,15 @@
else:
raise RuntimeError, 'No XML <root on repository: ' + self.getName()
elif 'svn'==xml.type:
-
+ self.type='Subversion'
if xml.url:
self.url=str(xml.url)
else:
raise RuntimeError, 'No URL on SVN repository: ' + self.getName()
+ elif 'jars'==xml.type:
+ self.type='Java Arcvhives'
+ else:
+ raise RuntimeError, 'Invalid Repository Type'
# Modules referencing this repository
self.modules=[]
@@ -107,6 +111,13 @@
def hasModules(self):
if self.modules: return 1
return 0
+
+ def hasType(self):
+ if self.type: return 1
+ return 0
+
+ def getType(self):
+ return self.type
def getModules(self):
return self.modules
1.2 +4 -4 jakarta-gump/python/gump/test/resources/full1/workspace.xml
Index: workspace.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/workspace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.xml 21 Nov 2003 19:04:10 -0000 1.1
+++ workspace.xml 26 Nov 2003 16:08:39 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
-<workspace basedir="/data/gump"
- jardir="/data/gump/jars/latest"
- logdir="/data/gump/log"
- pkgdir="/data/package"
+<workspace basedir="./test/gump"
+ jardir="./test/gump/jars"
+ logdir="./test/gump/log"
+ pkgdir="./test/package"
sync="rsync -r -a --delete" version="0.3">
<property name="build.sysclasspath" value="only"/>
1.5 +2 -1 jakarta-gump/python/gump/test/resources/full1/module2.xml
Index: module2.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/module2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- module2.xml 26 Nov 2003 01:26:28 -0000 1.4
+++ module2.xml 26 Nov 2003 16:08:39 -0000 1.5
@@ -18,7 +18,8 @@
<option project="random"/>
<home nested="dist"/>
- <mkdir dir="mkdir"/>
+ <mkdir dir="mkdir2"/>
+ <mkdir dir="classes/stuff/mkdir2"/>
<jar name="lib/output2.jar" id="output2"/>
1.17 +4 -1 jakarta-gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- forrest.py 26 Nov 2003 01:26:28 -0000 1.16
+++ forrest.py 26 Nov 2003 16:08:39 -0000 1.17
@@ -650,12 +650,15 @@
if repo.hasTitle():
detailList.createEntry('Title: ', repo.getTitle())
+ if repo.hasType():
+ detailList.createEntry('Type: ', repo.getType())
+
if repo.hasHomePage():
detailList.createEntry('Homepage: ') \
.createLink(repo.getHomePage(),repo.getHomePage())
if repo.hasCvsWeb():
- detailList.createEntry('CVS Viewer: ') \
+ detailList.createEntry('Web Interface: ') \
.createLink(repo.getCvsWeb(),repo.getCvsWeb())
detailList.createEntry('State: ' + repo.getStateDescription())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
