fix ant missing axis ant plugin

This commit is contained in:
Edison Su 2012-09-06 21:48:10 -07:00 committed by Alex Huang
parent c564e395ff
commit 81409f8160

View File

@ -105,6 +105,7 @@ def getrpmdeps():
yield "rpm-build" yield "rpm-build"
deps = set(rpmdeps(_glob("./*.spec"))) deps = set(rpmdeps(_glob("./*.spec")))
deps.add("ant")
return deps return deps
def getdebdeps(): def getdebdeps():
@ -122,6 +123,7 @@ def getdebdeps():
yield "debhelper" yield "debhelper"
deps = set(debdeps(["debian/control"])) deps = set(debdeps(["debian/control"]))
deps.add("ant")
return deps return deps
# CENTOS does not have this -- we have to put this here # CENTOS does not have this -- we have to put this here
@ -299,7 +301,7 @@ def runant(tsk):
else: else:
stanzas = [ stanzas = [
_join(environ["ANT_HOME"],"bin","ant"), _join(environ["ANT_HOME"],"bin","ant"),
"-Dthirdparty.classpath=%s"%(tsk.env.CLASSPATH.replace(os.pathsep,",")), "-Dthirdparty.classpath=./deps/*:%s"%(tsk.env.CLASSPATH.replace(os.pathsep,",")),
] ]
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)