diff --git a/wscript b/wscript index 2491a7de90f..290798b5984 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)