sebb 2004/02/13 18:04:16 Modified: . build.sh build.bat Log: ASF L2; build.xml sets up the required classpath; check ANT_HOME set Revision Changes Path 1.4 +37 -13 jakarta-jmeter/build.sh Index: build.sh =================================================================== RCS file: /home/cvs/jakarta-jmeter/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.sh 25 Apr 2003 20:50:55 -0000 1.3 +++ build.sh 14 Feb 2004 02:04:16 -0000 1.4 @@ -1,5 +1,20 @@ #!/bin/sh +## $Id$ +## Copyright 2001-2004 The Apache Software Foundation +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. + #-------------------------------------------- # No need to edit anything past here #-------------------------------------------- @@ -10,27 +25,36 @@ exit fi +if test -z "$ANT_HOME" ; then + echo "ERROR: ANT_HOME not found in your environment." + exit +fi + if test -f $JAVA_HOME/lib/tools.jar ; then CLASSPATH=$CLASSPATH:${JAVA_HOME}/lib/tools.jar fi +CLASSPATH=$CLASSPATH:${ANT_HOME}/lib/ant.jar + # convert the existing path to unix if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi -for i in ./lib/*.jar -do - if [ i != "./lib/jorphan.jar" ] - then - CLASSPATH=$CLASSPATH:$i - fi -done - -for i in ../jakarta-site2/lib/*.jar -do - CLASSPATH=$CLASSPATH:$i -done +## The build.xml file now sets up the required classpath + +## for i in ./lib/*.jar +## do +## if [ i != "./lib/jorphan.jar" ] +## then +## CLASSPATH=$CLASSPATH:$i +## fi +## done + +## for i in ../jakarta-site2/lib/*.jar +## do +## CLASSPATH=$CLASSPATH:$i +## done # convert the unix path to windows if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then @@ -41,4 +65,4 @@ echo $JAVA_HOME/bin/java -classpath $CLASSPATH org.apache.tools.ant.Main -buildfile $BUILDFILE "$@" $JAVA_HOME/bin/java -classpath $CLASSPATH org.apache.tools.ant.Main \ - -buildfile $BUILDFILE "$@" + -buildfile $BUILDFILE "$@" \ No newline at end of file 1.10 +24 -3 jakarta-jmeter/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/jakarta-jmeter/build.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.bat 7 May 2003 15:23:14 -0000 1.9 +++ build.bat 14 Feb 2004 02:04:16 -0000 1.10 @@ -1,16 +1,37 @@ @echo off +rem $Id$ +rem Copyright 2001-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +if not "%ANT_HOME%" == "" goto java: +echo ANT_HOME is not set, please set it +goto eof: + +:java if not "%JAVA_HOME%" == "" goto start: echo JAVA_HOME not set, please set goto eof: :start -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\ant.jar set OLDPATH=%PATH% set PATH=%JAVA_HOME%\bin;%PATH% -for %%i in (".\lib\*.jar") do if not "%%i" == ".\lib\jorphan.jar" CALL lcp %%i -for %%i in (".\ext\*.jar") do CALL lcp %%i +rem All the jars are now resolved in build.xml +rem for %%i in (".\lib\*.jar") do if not "%%i" == ".\lib\jorphan.jar" CALL lcp %%i +rem for %%i in (".\ext\*.jar") do CALL lcp %%i SET BUILDFILE=build.xml echo %LOCALCLASSPATH%
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
