|
From: Michael R. <mr...@us...> - 2002-01-10 23:06:48
|
Update of /cvsroot/openorb/ConcurrencyControlService In directory usw-pr-cvs1:/tmp/cvs-serv27066 Modified Files: build.sh test.bat test.sh Log Message: #501914: Removed the sub sir: src Fixed several problems with the bash scripts. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 23:06:42 1.3 @@ -1,34 +1,31 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + Index: test.bat =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/test.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- test.bat 2002/01/09 12:24:21 1.1.1.1 +++ test.bat 2002/01/10 23:06:42 1.2 @@ -1,10 +1,11 @@ @echo off REM $Id$ set JAVA=%JAVA_HOME%\bin\java +set JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" set cp=%CLASSPATH% for %%i in (lib\*.jar) do call cp.bat %%i for %%i in (dist\*.jar) do call cp.bat %%i set CP="%JAVA_HOME%\lib\tools.jar;%CP%;src\test\src" -%JAVA% -classpath %CP% org.openorb.ccs.test.CCSTestHarness -execute +%JAVA% %JAVA_FLAGS% -classpath %CP% org.openorb.ccs.test.CCSTestHarness -execute Index: test.sh =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/test.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- test.sh 2002/01/09 12:24:21 1.1.1.1 +++ test.sh 2002/01/10 23:06:42 1.2 @@ -1,32 +1,32 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH - - -# -# Execute the build tool passing the build.xml file -# -echo $JAVAC -cp $CLASSPATH org.openorb.ccs.test.CCSTestHarness -execute -$JAVAC -cp $CLASSPATH org.openorb.ccs.test.CCSTestHarness -execute +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java +JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC $JAVA_FLAGS -cp $CLASSPATH org.openorb.ccs.test.CCSTest -execute + |