Changeset 31973

Show
Ignore:
Timestamp:
15.09.2017 21:00:00 (2 years ago)
Author:
ak19
Message:

Related to previous commit which contained Dr Bainbridge's fix to bug noticed just now: IncrementalBuildUtils? determines the PATH separator based on whether the OS name contained the win substring for Windows. However, Mac OS is called darwin and contains the win substring too, so Dr Bainbridge fixed the test to check for win as OS name prefix. This part of the code will need to be reworked in future, such as to use util's envvar_prepend and append functions instead of concatenating something that may already be on the PATH. Also, check for any existing methods to test if OS is windows or not to put it all in one place.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

    r31972 r31973  
    7979# Ensure the collection specific binaries are on the search path 
    8080my $path_separator = ":"; 
    81 if($ENV{'GSDLOS'} =~ /^win/) { 
     81if($ENV{'GSDLOS'} =~ /^win/) { # beware to check that it starts with "win" for windows, since darwin also contains "win" but path separator for that should be : 
    8282  $path_separator = ";"; 
    8383}