Merged branch JAVADEV_PR3_20001002 into trunk.

git-svn-id: svn://10.0.0.236/trunk@82247 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2000-11-02 23:33:21 +00:00
parent 19a05b26cb
commit aee4ebbf93
71 changed files with 1537 additions and 521 deletions

View File

@@ -28,10 +28,13 @@
# Verification, usage checking
#
$ARGC = $#ARGV + 1;
$MIN_ARGC = 3;
$MIN_ARGC = 2;
if ($MIN_ARGC > $ARGC) {
print "usage runem.pl <mozilla bin dir> <class name> <depth>\n";
if ($MIN_ARGC > $ARGC || !($ENV{"MOZILLA_FIVE_HOME"})) {
if (!($ENV{"MOZILLA_FIVE_HOME"})) {
print "MOZILLA_FIVE_HOME must be set to the absolute path\nto the mozilla bin directory.\n";
}
print "usage runem.pl <class name> <depth>\n";
exit -1;
}
@@ -39,8 +42,8 @@ if ($MIN_ARGC > $ARGC) {
# Constant definitions
#
$CLASSNAME = $ARGV[1];
$DEPTH = $ARGV[2];
$CLASSNAME = $ARGV[0];
$DEPTH = $ARGV[1];
# determine the path separator
$_ = $ENV{PATH};
@@ -57,31 +60,14 @@ if ($SEP eq "/") {
$IS_UNIX = 1;
}
if ($IS_UNIX) {
# Under red hat linux $ENV{"PWD"} is undefined,
# so it only appends a '/' to argv[0].
if ( $ENV{"PWD"} == "" ) {
$BINDIR = $ARGV[0];
}
else {
$BINDIR = $ENV{"PWD"} . $SEP . $ARGV[0];
}
}
else {
open(CD, "cd |");
$_ = <CD>;
chop;
close(CD);
$BINDIR = $_ . $SEP . $ARGV[0];
}
$BINDIR = $ENV{"MOZILLA_FIVE_HOME"};
$JAVA_CMD = $ENV{"JDKHOME"} . $SEP . "bin" . $SEP . "java";
#
# set up environment vars
#
$ENV{"MOZILLA_FIVE_HOME"} = $BINDIR;
# prepend mozilla dist to path
$ENV{PATH} = $BINDIR . $CPSEP . $ENV{PATH};

View File

@@ -28,10 +28,13 @@
# Verification, usage checking
#
$ARGC = $#ARGV + 1;
$MIN_ARGC = 2;
$MIN_ARGC = 1;
if ($MIN_ARGC > $ARGC) {
print "usage runem.pl <mozilla bin dir> <class name>\n";
if ($MIN_ARGC > $ARGC || !($ENV{"MOZILLA_FIVE_HOME"})) {
if (!($ENV{"MOZILLA_FIVE_HOME"})) {
print "MOZILLA_FIVE_HOME must be set to the absolute path\nto the mozilla bin directory.\n";
}
print "usage runem.pl <class name>\n";
exit -1;
}
@@ -39,7 +42,7 @@ if ($MIN_ARGC > $ARGC) {
# Constant definitions
#
$CLASSNAME = $ARGV[1];
$CLASSNAME = $ARGV[0];
# determine the path separator
$_ = $ENV{PATH};
@@ -56,31 +59,14 @@ if ($SEP eq "/") {
$IS_UNIX = 1;
}
if ($IS_UNIX) {
# Under red hat linux $ENV{"PWD"} is undefined,
# so it only appends a '/' to argv[0].
if ( $ENV{"PWD"} == "" ) {
$BINDIR = $ARGV[0];
}
else {
$BINDIR = $ENV{"PWD"} . $SEP . $ARGV[0];
}
}
else {
open(CD, "cd |");
$_ = <CD>;
chop;
close(CD);
$BINDIR = $_ . $SEP . $ARGV[0];
}
$BINDIR = $ENV{"MOZILLA_FIVE_HOME"};
$JAVA_CMD = $ENV{"JDKHOME"} . $SEP . "bin" . $SEP . "java";
#
# set up environment vars
#
$ENV{"MOZILLA_FIVE_HOME"} = $BINDIR;
# prepend mozilla dist to path
$ENV{PATH} = $BINDIR . $CPSEP . $ENV{PATH};
@@ -113,11 +99,12 @@ $ENV{"CLASSPATH"} = $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "tools.jar" .
$CPSEP . $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "rt.jar" . $CPSEP .
$ENV{"CLASSPATH"};
if ($IS_UNIX) {
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . ".." .
$SEP . "classes";
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . "javadev" .
$SEP . "lib" . $SEP . "blackwood.jar";
}
else {
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP ."../lib" . $SEP . "blackwood.jar";
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . "javadev" .
$SEP . "lib" . $SEP . "blackwood.jar";
}
# build up the command invocation string
@@ -128,7 +115,8 @@ if ($SEP eq "/") {
$cmd = $cmd . " -native";
}
#tack on the java library path
$cmd = $cmd . " -Djava.library.path=" . $BINDIR;
$cmd = $cmd . " -Djava.library.path=" . $BINDIR . $CPSEP . $BINDIR . $SEP .
"javadev" . $SEP . "lib";
#tack on the classpath, class name, and bin dir
$cmd = $cmd . " -classpath " . $ENV{"CLASSPATH"} . " " . $CLASSNAME . " " .
$BINDIR;

View File

@@ -0,0 +1,47 @@
#!/bin/sh
#
script_args=""
if [ $# -gt 0 ]; then
script_args=$1
else
script_args="auto.blank"
fi
echo "args = $script_args"
JDKHOME=`pwd`/../../java
MOZILLA_FIVE_HOME=`pwd`/../..
ARCH=`uname -p`
LD_LIBRARY_PATH=$JDKHOME/lib/$ARCH/client:$JDKHOME/lib/$ARCH:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=$JDKHOME/lib:$JDKHOME/lib/$ARCH/native_threads:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../lib:`pwd`/../..:`pwd`/../../components:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../../dist/lib:$LD_LIBRARY_PATH
echo "LD_LIBRARY_PATH =" $LD_LIBRARY_PATH
if [ "$CLASSPATH" = "" ]; then
CLASSPATH=$JDKHOME/lib/tools.jar:$JDKHOME/lib/rt.jar:`pwd`/../lib/blackwood.jar
else
CLASSPATH=$JDKHOME/lib/tools.jar:$JDKHOME/lib/rt.jar:`pwd`/../lib/blackwood.jar:$CLASSPATH
fi
echo "CLASSPATH =" $CLASSPATH
libpath=`pwd`/../..:`pwd`/../../components:`pwd`/../lib
testclass="org.mozilla.webclient.test.EmbeddedMozilla"
bindir=`pwd`/../..
export LD_LIBRARY_PATH
export CLASSPATH
export JDKHOME
export MOZILLA_FIVE_HOME
args="-native -Djava.library.path=$libpath -classpath $CLASSPATH $testclass $bindir $script_args"
cmd="$JDKHOME/bin/java $args"
echo "CMD = " $cmd
eval $cmd