gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: jakarta-gump/python/gump/model workspace.py
Date Fri, 21 Nov 2003 21:43:12 GMT
ajack       2003/11/21 13:43:12

  Modified:    python/gump engine.py
               python/gump/model workspace.py
  Log:
  Temporary Hack for <mkdir if rsynch doesn't cleanup dir (as it ought)
  
  Revision  Changes    Path
  1.12      +11 -0     jakarta-gump/python/gump/engine.py
  
  Index: engine.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- engine.py	21 Nov 2003 19:04:10 -0000	1.11
  +++ engine.py	21 Nov 2003 21:43:12 -0000	1.12
  @@ -343,6 +343,17 @@
           # MkDirs...
           mkdirs=0
           for mkdir in project.xml.mkdir:   
  +        
  +            # :TODO: HACK HACK HACK HACK HACK HACK HACK
  +            # Rsynch should delete these things, not allow
  +            # them to exist. We should NOT do this.
  +            basedir=os.path.abspath(project.getModule().getSourceDirectory() \
  +                                        or dir.base)
  +            dirToMake=os.path.abspath(os.path.join(basedir,mkdir.dir)
  +            if os.path.exists(dirToMake): continue
  +            # :TODO: HACK HACK HACK HACK HACK HACK HACK
  +            
  +        
               cmd=project.getMkDirCommand(mkdir,mkdirs)
       
               # Execute the command ....
  
  
  
  1.9       +10 -1     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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- workspace.py	21 Nov 2003 19:04:10 -0000	1.8
  +++ workspace.py	21 Nov 2003 21:43:12 -0000	1.9
  @@ -101,6 +101,8 @@
       	self.noRSync=0
       	self.noForrest=0    
       	self.noRuper=0    	
  +    	self.noSvn=0    	
  +    	self.noCvs=0    	
       	
       	#
       	# JAVACMD can override this, see checkEnvironment
  @@ -440,7 +442,14 @@
           self.checkExecutable(self.javaCommand,'-version',exitOnError,1)
           self.checkExecutable('javac','-help',exitOnError)
           self.checkExecutable('java com.sun.tools.javac.Main','-help',exitOnError,0,'check_java_compiler')
   
  -        self.checkExecutable('cvs','--version',exitOnError)
  +
  +        if not self.noCvs and not self.checkExecutable('cvs','--version',0):
  +            self.noCvs=1
  +            self.addWarning('"cvs" command not found, no CVS repository updates')
  +        
  +        if not self.noSvn and not self.checkExecutable('svn','--version',0):
  +            self.noSvn=1
  +            self.addWarning('"svn" command not found, no SVN repository updates')
           
           if not self.noForrest and not self.checkExecutable('forrest','-projecthelp',0):

               self.noForrest=1
  
  
  

Mime
View raw message