Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 78668 invoked from network); 10 Feb 2004 22:13:35 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 10 Feb 2004 22:13:35 -0000 Received: (qmail 99129 invoked by uid 500); 10 Feb 2004 22:12:47 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 99071 invoked by uid 500); 10 Feb 2004 22:12:46 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 98805 invoked from network); 10 Feb 2004 22:12:45 -0000 Received: from unknown (HELO relay.t-online-com.de) (62.156.147.74) by daedalus.apache.org with SMTP; 10 Feb 2004 22:12:44 -0000 Received: from antbuild.com (internet-cafe-167.sapinternetcafe.de [155.56.24.167]) by relay.t-online-com.de (SMTPSVC(1.0.0.1)) with ESMTP id C72F81500E5 for ; Tue, 10 Feb 2004 22:50:43 +0100 (CET) Message-ID: <402956E1.7090203@antbuild.com> Date: Tue, 10 Feb 2004 23:10:41 +0100 From: =?ISO-8859-1?Q?Antoine_L=E9vy-Lambert?= User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Ant Developers List Subject: Re: Any feedback on the shell script changes? References: In-Reply-To: X-Enigmail-Version: 0.82.4.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/mixed; boundary="------------020706010500090702010002" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N --------------020706010500090702010002 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Stefan Bodewig wrote: >Hi, > >I'd like to merge the modifications I made to the Unix wrapper script >and the Launcher to the 1.6. branch so that it gets released in >1.6.1. Has anybody found time to try the changed script on Cygwin or >even AIX? > > > > I have tested the script under cygwin. I only have one small modification, which is attached and that I reproduce inline below. The script is working for me with : $ANT_HOME set to a dir with space and also $ANT_HOME set to a dir with space and one lib directory containing an embedded space. I have also done the test of Matt Benson concerning setting HOME in cygwin to /cygdrive/c. I have also included a fix for this special case in the patch, and also for 3 other variables possibly ending with a backslash. Cheers, Antoine Index: src/script/ant =================================================================== RCS file: /home/cvs/ant/src/script/ant,v retrieving revision 1.44 diff -u -r1.44 ant --- src/script/ant 9 Feb 2004 21:05:40 -0000 1.44 +++ src/script/ant 10 Feb 2004 22:10:47 -0000 @@ -27,11 +27,11 @@ use_jikes_default=true elif [ "$arg" = "--execdebug" ] ; then ant_exec_debug=true - elif [ "$arg" = "--h" -o "$arg" = "--help" ] ; then + elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then show_help=true ant_exec_args="$ant_exec_args -h" else - if [ "$arg" = "-h" -o "$arg" = "-help" ] ; then + if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then show_help=true fi ant_exec_args="$ant_exec_args \"$arg\"" @@ -243,7 +243,29 @@ echo ' launch script' echo ' ' fi - +# add a second backslash to variables terminated by a backslash under cygwin +if $cygwin; then + case "$CYGHOME" in + *\\ ) + CYGHOME="$CYGHOME\\" + ;; + esac + case "$JIKESPATH" in + *\\ ) + JIKESPATH="$JIKESPATH\\" + ;; + esac + case "$LOCALCLASSPATH" in + *\\ ) + LOCALCLASSPATH="LOCALCLASSPATH\\" + ;; + esac + case "$CLASSPATH" in + *\\ ) + CLASSPATH="$CLASSPATH\\" + ;; + esac +fi # Execute ant using eval/exec to preserve spaces in paths, # java options, and ant args ant_sys_opts= --------------020706010500090702010002 Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch.txt" Index: src/script/ant =================================================================== RCS file: /home/cvs/ant/src/script/ant,v retrieving revision 1.44 diff -u -r1.44 ant --- src/script/ant 9 Feb 2004 21:05:40 -0000 1.44 +++ src/script/ant 10 Feb 2004 22:10:47 -0000 @@ -27,11 +27,11 @@ use_jikes_default=true elif [ "$arg" = "--execdebug" ] ; then ant_exec_debug=true - elif [ "$arg" = "--h" -o "$arg" = "--help" ] ; then + elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then show_help=true ant_exec_args="$ant_exec_args -h" else - if [ "$arg" = "-h" -o "$arg" = "-help" ] ; then + if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then show_help=true fi ant_exec_args="$ant_exec_args \"$arg\"" @@ -243,7 +243,29 @@ echo ' launch script' echo ' ' fi - +# add a second backslash to variables terminated by a backslash under cygwin +if $cygwin; then + case "$CYGHOME" in + *\\ ) + CYGHOME="$CYGHOME\\" + ;; + esac + case "$JIKESPATH" in + *\\ ) + JIKESPATH="$JIKESPATH\\" + ;; + esac + case "$LOCALCLASSPATH" in + *\\ ) + LOCALCLASSPATH="LOCALCLASSPATH\\" + ;; + esac + case "$CLASSPATH" in + *\\ ) + CLASSPATH="$CLASSPATH\\" + ;; + esac +fi # Execute ant using eval/exec to preserve spaces in paths, # java options, and ant args ant_sys_opts= --------------020706010500090702010002 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org --------------020706010500090702010002--