apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix ant build failed on jenkins

Browse Source
This commit is contained in:
Edison Su 2012-09-07 01:32:14 -07:00
parent b88033ff2a
commit 1a23464868
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wscript
View File

@ -290,6 +290,7 @@ Utils.discover_ant_targets_and_properties = discover_ant_targets_and_properties
# this is NOT a task for a task generator -- it is a plain function. # this is NOT a task for a task generator -- it is a plain function.
# If you want to use it as a task function in a task generator, use a lambda x: runant("targetname") # If you want to use it as a task function in a task generator, use a lambda x: runant("targetname")
def runant(tsk): def runant(tsk):
conf = _getbuildcontext()
environ = dict(os.environ) environ = dict(os.environ)
environ["CATALINA_HOME"] = tsk.env.TOMCATHOME environ["CATALINA_HOME"] = tsk.env.TOMCATHOME
environ["ANT_HOME"] = _join("tools","ant","apache-ant-1.7.1") environ["ANT_HOME"] = _join("tools","ant","apache-ant-1.7.1")
@ -301,7 +302,7 @@ def runant(tsk):
else: else:
stanzas = [ stanzas = [
_join(environ["ANT_HOME"],"bin","ant"), _join(environ["ANT_HOME"],"bin","ant"),
"-Dthirdparty.classpath=./deps/*:%s"%(tsk.env.CLASSPATH.replace(os.pathsep,",")), "-Dthirdparty.classpath=%s:%s"%(tsk.env.CLASSPATH.replace(os.pathsep,","), conf.env.DEPSCLASSPATH),
] ]
stanzas += tsk.generator.antargs stanzas += tsk.generator.antargs
ret = Utils.exec_command(" ".join(stanzas),cwd=tsk.generator.bld.srcnode.abspath(),env=environ,log=True) ret = Utils.exec_command(" ".join(stanzas),cwd=tsk.generator.bld.srcnode.abspath(),env=environ,log=True)