AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some modifications to make runjava behave more like we want it to.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@89 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-07-20 17:33:09 +00:00
parent db91329aff
commit bf466db2e1
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/runjava
+5 -8
View File
@@ -2,7 +2,7 @@
use Getopt::Std; use Getopt::Std;
my $usage = "Usage: $0 [-p pid_file] [-r server_root] args\n"; my $usage = "Usage: $0 [-p pid_file] [-r root_directory] args\n";
# locations of stuff # locations of stuff
chomp($location = `dirname $0`); chomp($location = `dirname $0`);
@@ -52,7 +52,7 @@ if (defined $libpath) {
} }
# put everything in our class path # put everything in our class path
my $classpath = "-classpath $jlib:$root/dist/classes"; my $classpath = "-classpath $jlib:$root/dist/classes:$root/dist/rsrc";
# any zip or jar files in our lib/ directory get added to the class path # any zip or jar files in our lib/ directory get added to the class path
if (opendir(DIR, "$root/lib")) { if (opendir(DIR, "$root/lib")) {
@@ -63,10 +63,7 @@ if (opendir(DIR, "$root/lib")) {
} }
# specify our server root (this is for server code) # specify our server root (this is for server code)
my $serverroot = "-Dserver.root=$root"; my $rootarg = "-Droot=$root";
# specify our base directory (this is for client code)
my $basedir = "-Dbase.dir=$root/src/java";
my $pid_file = undef; my $pid_file = undef;
my $i = 0; my $i = 0;
@@ -89,7 +86,7 @@ for ($i = 0; $i < @ARGV; $i++) {
$i -= 1; # decrement i so that things stay in sync $i -= 1; # decrement i so that things stay in sync
} elsif ($arg eq "-r") { } elsif ($arg eq "-r") {
$serverroot = "-Dserver.root=" . $ARGV[$i+1]; $rootarg = "-Droot=" . $ARGV[$i+1];
splice(@ARGV, $i, 2); splice(@ARGV, $i, 2);
$i -= 1; # decrement i so that things stay in sync $i -= 1; # decrement i so that things stay in sync
} }
@@ -98,6 +95,6 @@ for ($i = 0; $i < @ARGV; $i++) {
# log the pid file if requested to do so # log the pid file if requested to do so
print `echo $$ > $pid_file` if (defined $pid_file); print `echo $$ > $pid_file` if (defined $pid_file);
my $cmd = "$java -mx256M $classpath $serverroot $basedir " . join(" ", @ARGV); my $cmd = "$java -mx256M $classpath $rootarg " . join(" ", @ARGV);
# print "$cmd\n"; # print "$cmd\n";
exec($cmd); exec($cmd);