Updated Branches: refs/heads/4.0 cef962664 -> 80b5030e8
fix ant missing axis ant plugin Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/80b5030e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/80b5030e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/80b5030e Branch: refs/heads/4.0 Commit: 80b5030e853682247710d63d44cd0f6d9a9dc62c Parents: cef9626 Author: Edison Su <[email protected]> Authored: Thu Sep 6 21:48:10 2012 -0700 Committer: Edison Su <[email protected]> Committed: Thu Sep 6 21:48:25 2012 -0700 ---------------------------------------------------------------------- wscript | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/80b5030e/wscript ---------------------------------------------------------------------- diff --git a/wscript b/wscript index 76df17a..2491a7d 100644 --- a/wscript +++ b/wscript @@ -105,6 +105,7 @@ def getrpmdeps(): yield "rpm-build" deps = set(rpmdeps(_glob("./*.spec"))) + deps.add("ant") return deps def getdebdeps(): @@ -122,6 +123,7 @@ def getdebdeps(): yield "debhelper" deps = set(debdeps(["debian/control"])) + deps.add("ant") return deps # CENTOS does not have this -- we have to put this here @@ -299,7 +301,7 @@ def runant(tsk): else: stanzas = [ _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 ret = Utils.exec_command(" ".join(stanzas),cwd=tsk.generator.bld.srcnode.abspath(),env=environ,log=True)
