jefft 02/03/23 17:01:35
Modified: . build.bat build.sh
Log:
Synch build scripts with jakarta-avalon
Revision Changes Path
1.8 +36 -23 jakarta-avalon-cornerstone/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/build.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.bat 14 Sep 2001 13:18:40 -0000 1.7
+++ build.bat 24 Mar 2002 01:01:35 -0000 1.8
@@ -1,23 +1,36 @@
[EMAIL PROTECTED] off
-
-echo ------------
-echo Build System
-echo ------------
-
-if not "%AVALON_TOOLS%"=="" goto runAnt
-
-if exist "..\jakarta-avalon\tools\bin\ant.bat" set
AVALON_TOOLS=..\jakarta-avalon\tools
-if exist "tools\bin\ant.bat" set AVALON_TOOLS=tools
-
-if not "%AVALON_TOOLS%"=="" goto runAnt
-
-echo "Unable to locate tools directory at "
-echo "../jakarta-avalon/tools/ or tools/. "
-echo "Aborting."
-goto end
-
-:runAnt
-set ANT_HOME=%AVALON_TOOLS%
-%AVALON_TOOLS%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger
-emacs -Dtools.dir=%AVALON_TOOLS% %1 -Dapps-target=%2 %3 %4 %5 %6 %7 %8
-
-:end
[EMAIL PROTECTED] off
+
+rem Script to invoke the Ant that comes with jakarta-avalon
+rem
+rem Tries to guess location of jakarta-avalon\tools directory containing Ant.
+rem To specify this directly, set the AVALON_TOOLS variable, eg:
+rem set AVALON_TOOLS=c:\Jakarta\jakarta-avalon
+rem
+rem This can also be called from other batch scripts. If so, the BASE
variable
+rem should be preset to the path from the caller to this script (generally
+rem '..\'s)
+
+
+if "%BASE%"=="" set BASE=.
+if exist "%BASE%\tools\bin\ant.bat" set LOCAL_AVALON_TOOLS=tools
+if exist "%BASE%\..\jakarta-avalon\tools\bin\ant.bat" set
LOCAL_AVALON_TOOLS=%BASE%\..\jakarta-avalon\tools
+if exist "%BASE%\..\..\jakarta-avalon\tools\bin\ant.bat" set
LOCAL_AVALON_TOOLS=%BASE%\..\..\jakarta-avalon\tools
+if not "%AVALON_TOOLS%"=="" set LOCAL_AVALON_TOOLS=%AVALON_TOOLS%
+
+if not "%LOCAL_AVALON_TOOLS%"=="" goto runAnt
+
+echo "Unable to locate tools directory at "
+echo "..\jakarta-avalon\tools or ..\..\jakarta-avalon\tools or tools\. "
+echo "Aborting."
+goto end
+
+:runAnt
+set OLD_ANT_HOME=%ANT_HOME%
+set ANT_HOME=%LOCAL_AVALON_TOOLS%
+%LOCAL_AVALON_TOOLS%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger
-emacs -Dtools.dir=%LOCAL_AVALON_TOOLS% %1 %2 %3 %4 %5 %6 %7 %8
+set ANT_HOME=%OLD_ANT_HOME%
+set OLD_ANT_HOME=
+
+:end
+set LOCAL_AVALON_TOOLS=
+set BASE=
1.7 +18 -11 jakarta-avalon-cornerstone/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 20 Sep 2001 19:37:48 -0000 1.6
+++ build.sh 24 Mar 2002 01:01:35 -0000 1.7
@@ -1,24 +1,31 @@
#!/bin/sh
-echo
-echo "Cornerstone Build System"
-echo "------------------------"
+# Script for invoking the Ant bundled with jakarta-avalon, from Avalon
+# projects. Location-independent; will run build.xml in whichever directory
+# you're in.
+BASE=`dirname $0` # Directory containing this script. Not the same as $PWD.
+ # The rest of this script assumes it's in a directory
+ # at the level of jakarta-avalon
+
+LOCAL_AVALON_TOOLS=$AVALON_TOOLS
if [ "$AVALON_TOOLS" = "" ] ; then
- if [ -d ../jakarta-avalon/tools ] ; then
- AVALON_TOOLS=../jakarta-avalon/tools
- elif [ -d tools ] ; then
- AVALON_TOOLS=tools
+ # Absolutize directory; it's not safe to pass relative dirs to buildfiles
+ MAYBE_TOOLS=$PWD/$BASE/../jakarta-avalon/tools
+ if [ -d $MAYBE_TOOLS ] ; then
+ LOCAL_AVALON_TOOLS=$MAYBE_TOOLS
+ elif [ -d tools ] ; then
+ LOCAL_AVALON_TOOLS=$PWD/$BASE/tools
else
echo "Unable to locate tools directory at "
- echo "../jakarta-avalon/tools/ or tools/. "
+ echo "$MAYBE_TOOLS or $BASE/tools/. "
echo "Aborting."
exit 1
fi
fi
-chmod u+x $AVALON_TOOLS/bin/antRun
-chmod u+x $AVALON_TOOLS/bin/ant
+chmod u+x $LOCAL_AVALON_TOOLS/bin/antRun
+chmod u+x $LOCAL_AVALON_TOOLS/bin/ant
-$AVALON_TOOLS/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs
-Dtools.dir=$AVALON_TOOLS $1 -Dapps-target=$2 $3 $4 $5 $6 $7 $8
+$LOCAL_AVALON_TOOLS/bin/ant -logger org.apache.tools.ant.NoBannerLogger
-emacs -Dtools.dir=$LOCAL_AVALON_TOOLS $@
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
