forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/tools/antipede/bin ant ant.bat
Date Sat, 26 Oct 2002 15:38:23 GMT
jefft       2002/10/26 08:38:23

  Modified:    .        build.sh build.xml
               src/resources/forrest-shbat/bin forrest forrest.bat
               tools/antipede/bin ant ant.bat
  Log:
  Get Forrest compiling and working when its directory contains spaces.
  
  Revision  Changes    Path
  1.6       +1 -1      xml-forrest/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.sh	23 Sep 2002 07:47:41 -0000	1.5
  +++ build.sh	26 Oct 2002 15:38:23 -0000	1.6
  @@ -30,7 +30,7 @@
   export CLASSPATH
   
   echo Using classpath: \"$CLASSPATH\"
  -$PWD/./tools/antipede/bin/ant -emacs  $@
  +"$PWD/./tools/antipede/bin/ant" -emacs  $@
   
   unset CLASSPATH
   
  
  
  
  1.29      +1 -1      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml	16 Oct 2002 07:27:16 -0000	1.28
  +++ build.xml	26 Oct 2002 15:38:23 -0000	1.29
  @@ -4,7 +4,7 @@
   <!--<!DOCTYPE project SYSTEM "./tools/antipede/build.dtd" >-->
   <!DOCTYPE project [
     <!-- antipede -->
  -  <!ENTITY import-antipede  SYSTEM "./tools/antipede/build.xtarget">
  +  <!ENTITY import-antipede  SYSTEM "file:./tools/antipede/build.xtarget">
   
   ]>
   <project default="interactive" basedir="." name="project build file">
  
  
  
  1.4       +4 -4      xml-forrest/src/resources/forrest-shbat/bin/forrest
  
  Index: forrest
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/bin/forrest,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- forrest	12 Oct 2002 13:20:56 -0000	1.3
  +++ forrest	26 Oct 2002 15:38:23 -0000	1.4
  @@ -12,14 +12,14 @@
   
   
   # set the current working dir as the PROJECT_HOME variable 
  -PROJECT_HOME=$PWD
  +PROJECT_HOME="$PWD"
   # use the location of this script to infer $FORREST_HOME
  -FORREST_HOME=`dirname $0`/..
  +FORREST_HOME=`dirname "$0"`/..
   
   # set the ant file to use
  -ANTFILE=$FORREST_HOME/forrest.build.xml
  +ANTFILE="$FORREST_HOME/forrest.build.xml"
   
   echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
   echo
   # call ant.
  -ant -buildfile $ANTFILE -Dbasedir=$PROJECT_HOME -Dproject.home=$PROJECT_HOME -Dforrest.home=$FORREST_HOME
-emacs $@ 
  +ant -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -Dproject.home="$PROJECT_HOME" -Dforrest.home="$FORREST_HOME"
-emacs $@ 
  
  
  
  1.6       +2 -2      xml-forrest/src/resources/forrest-shbat/bin/forrest.bat
  
  Index: forrest.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/bin/forrest.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- forrest.bat	12 Oct 2002 13:20:57 -0000	1.5
  +++ forrest.bat	26 Oct 2002 15:38:23 -0000	1.6
  @@ -12,13 +12,13 @@
   set FORREST_HOME=%~dp0\..
   
   Rem ----- set the ant file to use --------------------------------------
  -set ANTFILE=%FORREST_HOME%\forrest.build.xml
  +set ANTFILE="%FORREST_HOME%\forrest.build.xml"
   
   echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
   echo
   
   Rem ----- call ant.. ---------------------------------------------------
  -call %ANT_HOME%\bin\ant -buildfile %ANTFILE% -Dbasedir=%PROJECT_HOME% -Dproject.home=%PROJECT_HOME%
-Dforrest.home=%FORREST_HOME% -emacs -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3
%4 %5 %6 %7 %8 %9
  +call %ANT_HOME%\bin\ant -buildfile "%ANTFILE%" -Dbasedir="%PROJECT_HOME%" -Dproject.home="%PROJECT_HOME%"
-Dforrest.home="%FORREST_HOME%" -emacs -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3
%4 %5 %6 %7 %8 %9
   
   goto end
   
  
  
  
  1.2       +8 -9      xml-forrest/tools/antipede/bin/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/antipede/bin/ant,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant	7 Jul 2002 09:53:25 -0000	1.1
  +++ ant	26 Oct 2002 15:38:23 -0000	1.2
  @@ -4,7 +4,7 @@
   #   reserved.
   
   if [ -f "$HOME/.antrc" ] ; then 
  -  . $HOME/.antrc
  +  . "$HOME/.antrc"
   fi
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -21,17 +21,17 @@
       ANT_HOME=/opt/ant
     fi
   
  -  if [ -d ${HOME}/opt/ant ] ; then 
  -    ANT_HOME=${HOME}/opt/ant
  +  if [ -d "${HOME}/opt/ant" ] ; then 
  +    ANT_HOME="${HOME}/opt/ant"
     fi
   
     ## resolve links - $0 may be a link to ant's home
  -  PRG=$0
  -  progname=`basename $0`
  +  PRG="$0"
  +  progname=`basename "$0"`
     saveddir=`pwd`
   
     # need this for relative symlinks
  -  cd `dirname $PRG`
  +  cd `dirname "$PRG"`
     
     while [ -h "$PRG" ] ; do
       ls=`ls -ld "$PRG"`
  @@ -39,7 +39,7 @@
       if expr "$link" : '.*/.*' > /dev/null; then
   	PRG="$link"
       else
  -	PRG="`dirname $PRG`/$link"
  +	PRG=`dirname "$PRG"`"/$link"
       fi
     done
     
  @@ -114,11 +114,10 @@
       if [ -d ${OSXHACK} ] ; then
         for i in ${OSXHACK}/*.jar
         do
  -        JIKESPATH=$JIKESPATH:$i
  +        JIKESPATH="$JIKESPATH:$i"
         done
       fi
     fi
  -
   else
     echo "Warning: JAVA_HOME environment variable is not set."
     echo "  If build fails because sun.* classes could not be found"
  
  
  
  1.2       +2 -2      xml-forrest/tools/antipede/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/antipede/bin/ant.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.bat	7 Jul 2002 09:53:25 -0000	1.1
  +++ ant.bat	26 Oct 2002 15:38:23 -0000	1.2
  @@ -9,7 +9,7 @@
   :winNTStart
   @setlocal
   
  -rem %~dp0 is name of current script under NT
  +rem %~dp0 is expanded pathname of the current script under NT
   set DEFAULT_ANT_HOME=%~dp0
   
   rem : operator works similar to make : operator
  @@ -36,7 +36,7 @@
   set ANT_CMD_LINE_ARGS=
   
   :setupArgs
  -if %1a==a goto doneStart
  +if "%1a"=="a" goto doneStart
   set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
   shift
   goto setupArgs
  
  
  

Mime
View raw message