Changeset 31972 for main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

Timestamp:

2017-09-15T20:55:51+12:00 (7 years ago)

Author:

ak19

Message:

GS2 on Mac now comes with a bundled JRE, since Maverick or Yosemite onwards, we're not guaranteed to have a system Java. So now GS2 needs to also set the Java env vars to the JAVA found (JRE_HOME or JAVA_HOME, and update PATH). This is necessary if GLI for instance needs to build a lucene collection, which requires java in the environment to launch it.

File:

• main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -79 +79 @@
 # Ensure the collection specific binaries are on the search path
 my $path_separator = ":";
-if($ENV{'GSDLOS'} =~ /win/) {
+if($ENV{'GSDLOS'} =~ /^win/) {
   $path_separator = ";";
 }