ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant build.sh build.bat
Date Mon, 10 Nov 2003 16:51:18 GMT
antoine     2003/11/10 08:51:18

  Modified:    .        Tag: ANT_16_BRANCH build.sh build.bat
  Log:
  Merge from HEAD
  Allow ModifiedSelectorTest to pass when started from build.sh or build.bat
  PR: 24481
  Submitted by: Florian.G. Haas (f dot g dot haas at gmx dot net)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.35.2.2  +5 -1      ant/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/ant/build.sh,v
  retrieving revision 1.35.2.1
  retrieving revision 1.35.2.2
  diff -u -r1.35.2.1 -r1.35.2.2
  --- build.sh	23 Sep 2003 15:40:36 -0000	1.35.2.1
  +++ build.sh	10 Nov 2003 16:51:17 -0000	1.35.2.2
  @@ -16,7 +16,11 @@
   esac
   
   REALANTHOME=$ANT_HOME
  -ANT_HOME=bootstrap
  +if [ -z $PWD ]; then
  +    ANT_HOME=./bootstrap
  +else
  +    ANT_HOME=$PWD/bootstrap
  +fi
   export ANT_HOME
   
   if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun
; then
  
  
  
  1.38.2.3  +1 -1      ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/ant/build.bat,v
  retrieving revision 1.38.2.2
  retrieving revision 1.38.2.3
  diff -u -r1.38.2.2 -r1.38.2.3
  --- build.bat	25 Sep 2003 07:44:27 -0000	1.38.2.2
  +++ build.bat	10 Nov 2003 16:51:17 -0000	1.38.2.3
  @@ -4,7 +4,7 @@
   REM   reserved.
   
   set REAL_ANT_HOME=%ANT_HOME%
  -set ANT_HOME=bootstrap
  +set ANT_HOME=%~dp0\bootstrap
   if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist bootstrap\bin\lcp.bat
if exist bootstrap\bin\antRun.bat goto runAnt
   call bootstrap.bat
   if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist bootstrap\bin\lcp.bat
if exist bootstrap\bin\antRun.bat goto runAnt
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message