Commits

Darrell Schiebel authored 36dd5a3a097 Merge
Merge branch 'master' into CAS-13460

Conflicts: casa-source

scripts/do-config

Modified
28 28 @java_version = ( );
29 29 open(JAVAVER, "$java -version 2>&1 |");
30 30 foreach ( <JAVAVER> ) {
31 31 if ( m|version "?(\d+)\.(\d+)|i ) {
32 32 @java_version = ($1,$2);
33 33 print "found java version ", join('.',@java_version), "\n";
34 34 }
35 35 }
36 36 close(JAVAVER);
37 37 die "cannot run $java" unless scalar(@java_version) > 0;
38 -die "java version 1.8 or greater is required\n" unless $java_version[0] == 1 && $java_version[1] >= 8;
38 +die "java version 1.8 or greater is required\n" unless $java_version[0] > 7 || ($java_version[0] == 1 && $java_version[1] >= 8);
39 39
40 40 ### install path
41 41 $distro_jarfile = $jarfile = "$path/java/$jarfile_name";
42 42 if ( ! -e $jarfile ) {
43 43 ### development path
44 44 $jarfile = "$path/../target/scala-2.12/$jarfile_name";
45 45 if ( ! -e $jarfile ) {
46 46 $jarfile = $distro_jarfile;
47 47 ### pull from download url
48 48 my $jardir = dirname($jarfile);

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut