Updated Branches: refs/heads/4.0 f1bd52917 -> c0d7c9863
fix ant build failed on jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c0d7c986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c0d7c986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c0d7c986 Branch: refs/heads/4.0 Commit: c0d7c9863e3682d9b6eed6f42e1ecd2bd07b1fae Parents: f1bd529 Author: Edison Su <[email protected]> Authored: Fri Sep 7 01:32:14 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Sep 7 01:32:14 2012 -0700 ---------------------------------------------------------------------- wscript | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c0d7c986/wscript ---------------------------------------------------------------------- diff --git a/wscript b/wscript index 2491a7d..290798b 100644 --- a/wscript +++ b/wscript @@ -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. # If you want to use it as a task function in a task generator, use a lambda x: runant("targetname") def runant(tsk): + conf = _getbuildcontext() environ = dict(os.environ) environ["CATALINA_HOME"] = tsk.env.TOMCATHOME environ["ANT_HOME"] = _join("tools","ant","apache-ant-1.7.1") @@ -301,7 +302,7 @@ def runant(tsk): else: stanzas = [ _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 ret = Utils.exec_command(" ".join(stanzas),cwd=tsk.generator.bld.srcnode.abspath(),env=environ,log=True)
