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/09/04 20:09:54 UTC
svn commit: rev 43344 - in gump/trunk/python/gump: build model run test
Author: ajack
Date: Sat Sep 4 11:09:53 2004
New Revision: 43344
Modified:
gump/trunk/python/gump/build/nant.py
gump/trunk/python/gump/model/project.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/test/model.py
Log:
1) Added a check for Mono (to run NAnt)
2) A hasJars -> hasOutputs fix.
Modified: gump/trunk/python/gump/build/nant.py
==============================================================================
--- gump/trunk/python/gump/build/nant.py (original)
+++ gump/trunk/python/gump/build/nant.py Sat Sep 4 11:09:53 2004
@@ -118,9 +118,15 @@
# Library Path
libpath=languageHelper.getAssemblyPath(project)
+
+ # Launch with mono if available
+ exe=''
+ if not self.run.getEnvironment().noMono:
+ exe='mono '
+ exe+='NAnt.exe'
# Run java on apache NAnt...
- cmd=Cmd('NAnt.exe','build_'+project.getModule().getName()+'_'+project.getName(),
+ cmd=Cmd(exe,'build_'+project.getModule().getName()+'_'+project.getName(),
basedir,{'LIBPATH':libpath})
# These are workspace + project system properties
Modified: gump/trunk/python/gump/model/project.py
==============================================================================
--- gump/trunk/python/gump/model/project.py (original)
+++ gump/trunk/python/gump/model/project.py Sat Sep 4 11:09:53 2004
@@ -238,7 +238,7 @@
"""
Does this project generate outputs (currently JARs)
"""
- return self.hasJars() or self.hasLicense()
+ return self.hasOutputs() or self.hasLicense()
def hasPackageNames(self):
if self.packageNames: return True
Modified: gump/trunk/python/gump/run/gumpenv.py
==============================================================================
--- gump/trunk/python/gump/run/gumpenv.py (original)
+++ gump/trunk/python/gump/run/gumpenv.py Sat Sep 4 11:09:53 2004
@@ -69,6 +69,7 @@
self.checked=False
self.set=False
+ self.noMono=False
self.noNAnt=False
self.noMaven=False
self.noDepot=False
@@ -188,6 +189,11 @@
not self._checkExecutable('NAnt','-help',False,False,'check_NAnt'):
self.noNAnt=True
self.addWarning('"NAnt" command not found, no NAnt builds')
+
+ if not self.noMono and \
+ not self._checkExecutable('mono','--help',False,False,'check_mono'):
+ self.noMono=True
+ self.addWarning('"Mono" command not found, no Mono runtime')
self.checked=True
Modified: gump/trunk/python/gump/test/model.py
==============================================================================
--- gump/trunk/python/gump/test/model.py (original)
+++ gump/trunk/python/gump/test/model.py Sat Sep 4 11:09:53 2004
@@ -80,7 +80,7 @@
self.assertTrue('Is a package marked', self.package1.isPackageMarked())
self.assertTrue('Is a package', self.package1.isPackaged())
- self.assertTrue('Has Jars', self.package1.hasJars())
+ self.assertTrue('Has Outputs', self.package1.hasOutputs())
self.assertTrue('Is a package', self.packagedModule1.isPackaged())
def testNotifys(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org