Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 91512 invoked from network); 9 Apr 2009 13:47:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2009 13:47:58 -0000 Received: (qmail 84631 invoked by uid 500); 9 Apr 2009 13:47:58 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 84564 invoked by uid 500); 9 Apr 2009 13:47:58 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 84554 invoked by uid 99); 9 Apr 2009 13:47:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2009 13:47:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2009 13:47:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6334C2388A23; Thu, 9 Apr 2009 13:47:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r763652 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW contributors.xml src/script/ant Date: Thu, 09 Apr 2009 13:47:37 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090409134737.6334C2388A23@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Thu Apr 9 13:47:36 2009 New Revision: 763652 URL: http://svn.apache.org/viewvc?rev=763652&view=rev Log: support MSYS/MingW. Submitted by Clement OUDOT. PR 46936 Modified: ant/core/trunk/CONTRIBUTORS ant/core/trunk/WHATSNEW ant/core/trunk/contributors.xml ant/core/trunk/src/script/ant Modified: ant/core/trunk/CONTRIBUTORS URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=763652&r1=763651&r2=763652&view=diff ============================================================================== Binary files - no diff available. Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=763652&r1=763651&r2=763652&view=diff ============================================================================== --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Thu Apr 9 13:47:36 2009 @@ -360,6 +360,9 @@ symbolic links. Bugzilla Report 46747. + * The ant shell script should now support MSYS/MinGW as well. + Bugzilla Report 46936. + Other changes: -------------- * A HostInfo task was added performing information on hosts, including info on Modified: ant/core/trunk/contributors.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=763652&r1=763651&r2=763652&view=diff ============================================================================== --- ant/core/trunk/contributors.xml (original) +++ ant/core/trunk/contributors.xml Thu Apr 9 13:47:36 2009 @@ -203,6 +203,10 @@ Hammacher + Clement + OUDOT + + Conor MacNeill Modified: ant/core/trunk/src/script/ant URL: http://svn.apache.org/viewvc/ant/core/trunk/src/script/ant?rev=763652&r1=763651&r2=763652&view=diff ============================================================================== --- ant/core/trunk/src/script/ant (original) +++ ant/core/trunk/src/script/ant Thu Apr 9 13:47:36 2009 @@ -80,6 +80,7 @@ # OS specific support. $var _must_ be set to either true or false. cygwin=false; darwin=false; +mingw=false; case "`uname`" in CYGWIN*) cygwin=true ;; Darwin*) darwin=true @@ -87,6 +88,7 @@ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home fi ;; + MINGW*) mingw=true ;; esac if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then @@ -111,13 +113,20 @@ ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd` fi -# For Cygwin, ensure paths are in UNIX format before anything is touched +# For Cygwin and Mingw, ensure paths are in UNIX format before +# anything is touched if $cygwin ; then [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --unix "$ANT_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` fi +if $mingw ; then + [ -n "$ANT_HOME" ] && + ANT_HOME="`(cd "$ANT_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi # set ANT_LIB location ANT_LIB="${ANT_HOME}/lib"