Just find java in the path.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@448 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
+2
-21
@@ -16,26 +16,7 @@ my $root = join("/", @parts);
|
|||||||
$realroot = $root;
|
$realroot = $root;
|
||||||
$root = "$root/..";
|
$root = "$root/..";
|
||||||
|
|
||||||
# make sure JAVA_HOME is set
|
my $java = "java";
|
||||||
my $jhome = $ENV{"JAVA_HOME"};
|
|
||||||
if (!defined $jhome) {
|
|
||||||
warn "$0: Error: No JAVA_HOME specified!\n";
|
|
||||||
warn "\n";
|
|
||||||
warn "You must set your JAVA_HOME environment variable to the\n";
|
|
||||||
warn "the absolute path of your JDK installation. For example:\n";
|
|
||||||
warn "\n";
|
|
||||||
warn " % JAVA_HOME=/usr/local/jdk1.2\n";
|
|
||||||
warn " % export JAVA_HOME\n";
|
|
||||||
die "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
# make sure it's set to a directory
|
|
||||||
if (! -d $jhome) {
|
|
||||||
die "$0: Can't find a java interpreter in '$jhome'.\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
my $java = "$jhome/bin/java";
|
|
||||||
my $jlib = "$jhome/lib/classes.zip";
|
|
||||||
|
|
||||||
# determine our machine architecture
|
# determine our machine architecture
|
||||||
my $ostype = `uname -s`;
|
my $ostype = `uname -s`;
|
||||||
@@ -73,7 +54,7 @@ foreach $dir (@dirs) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# finally add the standard classes
|
# finally add the standard classes
|
||||||
$classpath = "$classpath:$jlib";
|
$classpath = "$classpath";
|
||||||
|
|
||||||
# specify our server root (this is for server code)
|
# specify our server root (this is for server code)
|
||||||
my $rootarg = "-Dresource_dir=$realroot/rsrc -Dtest_dir=$realroot";
|
my $rootarg = "-Dresource_dir=$realroot/rsrc -Dtest_dir=$realroot";
|
||||||
|
|||||||
Reference in New Issue
Block a user