Updated Branches: refs/heads/4.0 08c970a9c -> 9167f6992
another try to fix the deb build Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9167f699 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9167f699 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9167f699 Branch: refs/heads/4.0 Commit: 9167f6992d2a21532bd6e4d36ceda6d7da43acb7 Parents: 08c970a Author: Edison Su <[email protected]> Authored: Fri Sep 7 02:25:51 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Sep 7 02:25:51 2012 -0700 ---------------------------------------------------------------------- wscript | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9167f699/wscript ---------------------------------------------------------------------- diff --git a/wscript b/wscript index 290798b..17a11d3 100644 --- a/wscript +++ b/wscript @@ -290,8 +290,9 @@ 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) + depsclasspath = [ os.path.abspath(x) for x in _glob(_join(".","deps","*.jar")) ] environ["CATALINA_HOME"] = tsk.env.TOMCATHOME environ["ANT_HOME"] = _join("tools","ant","apache-ant-1.7.1") if tsk.generator.env.DISTRO == "Windows": @@ -302,7 +303,7 @@ def runant(tsk): else: stanzas = [ _join(environ["ANT_HOME"],"bin","ant"), - "-Dthirdparty.classpath=%s:%s"%(tsk.env.CLASSPATH.replace(os.pathsep,","), conf.env.DEPSCLASSPATH), + "-Dthirdparty.classpath=%s:%s"%(tsk.env.CLASSPATH.replace(os.pathsep,","), pathsep.join(depsclasspath)), ] stanzas += tsk.generator.antargs ret = Utils.exec_command(" ".join(stanzas),cwd=tsk.generator.bld.srcnode.abspath(),env=environ,log=True)
