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/src/resources/forrest-shbat/bin forrest forrest.bat
Date Wed, 30 Oct 2002 08:55:14 GMT
jefft       2002/10/30 00:55:14

  Modified:    src/resources/forrest-shbat/bin forrest forrest.bat
  Log:
  Use the embedded Ant, so users don't have to install it
  
  Revision  Changes    Path
  1.5       +31 -2     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- forrest	26 Oct 2002 15:38:23 -0000	1.4
  +++ forrest	30 Oct 2002 08:55:14 -0000	1.5
  @@ -19,7 +19,36 @@
   # set the ant file to use
   ANTFILE="$FORREST_HOME/forrest.build.xml"
   
  +# Save old ANT_HOME
  +OLD_ANT_HOME="$ANT_HOME"
  +unset ANT_HOME
  +
  +# ----- Set Up The Runtime Classpath ------------------------------------------
  +
  +if [ "$TERM" = "cygwin" ] ; then
  +  S=';'
  +else
  +  S=':'
  +fi
  +
  +CP="$CLASSPATH"
  +export CP
  +unset CLASSPATH
  +
  +CLASSPATH=`echo $FORREST_HOME/lib/endorsed/*.jar | tr ' ' $S`
  +export CLASSPATH
  +
   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 $@ 
  +"$FORREST_HOME/ant/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -Dproject.home="$PROJECT_HOME"
-Dforrest.home="$FORREST_HOME" -emacs $@ 
  +
  +# ---- Restore Classpath
  +unset CLASSPATH
  +CLASSPATH=$CP
  +export CLASSPATH
  +
  +# ---- Restore ANT_HOME
  +# Restore old ANT_HOME
  +ANT_HOME="$OLD_ANT_HOME"
  +export ANT_HOME
  +
  
  
  
  1.8       +8 -11     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- forrest.bat	26 Oct 2002 16:30:55 -0000	1.7
  +++ forrest.bat	30 Oct 2002 08:55:14 -0000	1.8
  @@ -1,12 +1,9 @@
   @echo off
   setlocal 
   
  -Rem ----- Test if ant is around ----------------------------------------
  -if "%ANT_HOME%a"=="a" goto noant
  -
   Rem ----- set the current working dir as the PROJECT_HOME variable  ----
   call "%FORREST_HOME%\bin\setpwdvar.bat"
  -set PROJECT_HOME=%PWD%
  +set PROJECT_HOME="%PWD%"
   
   Rem ----- use the location of this script to infer $FORREST_HOME -------
   set FORREST_HOME=%~dp0\..
  @@ -14,18 +11,18 @@
   Rem ----- set the ant file to use --------------------------------------
   set ANTFILE="%FORREST_HOME%\forrest.build.xml"
   
  +Rem ----- Save old ANT_HOME --------------------------------------------
  +set OLD_ANT_HOME=%ANT_HOME%
  +set ANT_HOME="%FORREST_HOME%\ant"
  +
   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
   
  -goto end
  -
  -:noant
  -echo You must install Ant (http://jakarta.apache.org/ant) 
  -echo and set ANT_HOME to point at your Ant Installation directory
  -goto end
  +Rem ---- Restore old ANT_HOME
  +set ANT_HOME=%OLD_ANT_HOME%
  +set CLASSPATH=%OLD_CLASSPATH%
   
  -:end
   endlocal
  
  
  

Mime
View raw message