svn commit: r763652 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW contributors.xml src/script/ant

[bo...@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 @@
     <last>Hammacher</last>
   </name>
   <name>
+    <first>Clement</first>
+    <last>OUDOT</last>
+  </name>
+  <name>
     <first>Conor</first>
     <last>MacNeill</last>
   </name>

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"