Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2ED2CD46A for ; Mon, 10 Sep 2012 20:27:00 +0000 (UTC) Received: (qmail 58746 invoked by uid 500); 10 Sep 2012 20:26:59 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 58687 invoked by uid 500); 10 Sep 2012 20:26:59 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 58678 invoked by uid 99); 10 Sep 2012 20:26:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2012 20:26:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6ADAA351B1; Mon, 10 Sep 2012 20:26:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] CLOUDSTACK-63: remove ant Message-Id: <20120910202659.6ADAA351B1@tyr.zones.apache.org> Date: Mon, 10 Sep 2012 20:26:59 +0000 (UTC) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c14dcd2d/wscript ---------------------------------------------------------------------- diff --git a/wscript b/wscript index 60bc925..f1c9b62 100644 --- a/wscript +++ b/wscript @@ -275,15 +275,14 @@ def runant(tsk): environ = dict(os.environ) environ["CATALINA_HOME"] = tsk.env.TOMCATHOME - environ["ANT_HOME"] = _join("tools","ant","apache-ant-1.7.1") if tsk.generator.env.DISTRO == "Windows": stanzas = [ - _join(environ["ANT_HOME"],"bin","ant.bat"), + "ant", "-Dthirdparty.classpath=\"%s\""%(tsk.env.CLASSPATH.replace(os.pathsep,",")), ] else: stanzas = [ - _join(environ["ANT_HOME"],"bin","ant"), + "ant", "-Dthirdparty.classpath=%s"%(tsk.env.CLASSPATH.replace(os.pathsep,",")), ] stanzas += tsk.generator.antargs