forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 56287 - in forrest/trunk: bin main/bin
Date Mon, 01 Nov 2004 22:21:26 GMT
Author: nicolaken
Date: Mon Nov  1 14:21:25 2004
New Revision: 56287

Added:
   forrest/trunk/bin/
      - copied from rev 56282, forrest/trunk/main/bin/
Removed:
   forrest/trunk/main/bin/
Modified:
   forrest/trunk/bin/forrest
   forrest/trunk/bin/forrest.bat
Log:
Move bin dir up one level.

Modified: forrest/trunk/bin/forrest
==============================================================================
--- forrest/trunk/main/bin/forrest	(original)
+++ forrest/trunk/bin/forrest	Mon Nov  1 14:21:25 2004
@@ -59,7 +59,7 @@
 # Save old ANT_HOME
 OLD_ANT_HOME="$ANT_HOME"
 unset ANT_HOME
-ANT_HOME="$FORREST_HOME/../tools/ant"
+ANT_HOME="$FORREST_HOME/tools/ant"
 
 # ----- Set Up The Runtime Classpath ------------------------------------------
 
@@ -78,7 +78,7 @@
 export CP
 unset CLASSPATH
 
-for i in $FORREST_HOME/../lib/endorsed/*.jar; do
+for i in $FORREST_HOME/lib/endorsed/*.jar; do
   if [ "$cygwin" = "true" ] ; then
     LIB=`cygpath -w $i`
   else
@@ -92,7 +92,7 @@
 
 echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
 echo
-"$ANT_HOME/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -Dforrest.home="$FORREST_DOT_HOME"
-emacs $@
+"$ANT_HOME/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -Dforrest.home="$FORREST_DOT_HOME/main"
-emacs $@
 RESULT=$?
 
 # ---- Restore Classpath

Modified: forrest/trunk/bin/forrest.bat
==============================================================================
--- forrest/trunk/main/bin/forrest.bat	(original)
+++ forrest/trunk/bin/forrest.bat	Mon Nov  1 14:21:25 2004
@@ -29,17 +29,17 @@
 set PROJECT_HOME=%PWD%
 
 rem ----- set the ant file to use --------------------------------------
-set ANTFILE=%FORREST_HOME%\forrest.build.xml
+set ANTFILE=%FORREST_HOME%\main\forrest.build.xml
 
 rem ----- Save old ANT_HOME --------------------------------------------
 set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=%FORREST_HOME%\..\tools\ant
+set ANT_HOME=%FORREST_HOME%\tools\ant
 
 rem ----- Save and set CLASSPATH --------------------------------------------
 set OLD_CLASSPATH=%CLASSPATH%
 set CLASSPATH=
-cd /d "%FORREST_HOME%\..\lib\endorsed\"
-for %%i in ("*.jar") do call %FORREST_HOME%\bin\appendcp.bat "%FORREST_HOME%\..\lib\endorsed\%%i"
+cd /d "%FORREST_HOME%\lib\endorsed\"
+for %%i in ("*.jar") do call %FORREST_HOME%\bin\appendcp.bat "%FORREST_HOME%\lib\endorsed\%%i"
 cd /d %PWD%
 
 echo.
@@ -47,7 +47,7 @@
 echo.
 rem ----- call ant.. ---------------------------------------------------
 echo.
-call "%ANT_HOME%\bin\forrestant" -buildfile "%ANTFILE%" -Dbasedir="%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\forrestant" -buildfile "%ANTFILE%" -Dbasedir="%PROJECT_HOME%" -Dforrest.home="%FORREST_HOME%\main"
-emacs -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 rem ---- Restore old ANT_HOME
 set ANT_HOME=%OLD_ANT_HOME%

Mime
View raw message