Changeset 28375 for main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

Timestamp:

2013-10-10T13:57:59+13:00 (10 years ago)

Author:

davidb

Message:

A set of changes to help Greenstone building code (perl) run under Cygwin. The test is designed to be mutually to when run natively on Windows. In effect the refined test is saying: if you're windows but not cygwin then do as you used to do for Windows, otherwise go with Unix (as Cygwin is effectively giving you a Unix like operating system to run in)

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -671 +671 @@
     print $outhandle "Calling method: $cfilename:$cline $cpackage->$csubr\n";
 
-
     my ($filemeta) = $file =~ /([^\\\/]+)$/; # getting the tail of the filepath (skips all string parts containing slashes upto the end)
     $filemeta = $self->filepath_to_utf8($filemeta, $file_encoding);
@@ -891 +890 @@
     # Win32::GetLongFilePath() -- then the underlying file system is UTF16
 
-    if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
+    if (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin")) {
         # Can do better than working with the DOS character encoding returned by locale     
         $deduced_filename_encoding = "unicode";
@@ -963 +962 @@
     # abbreviated DOS form
 
-    if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
+    if (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin")) {
     if ((defined $filename_encoding) && ($filename_encoding eq "unicode")) {
         if (-e $raw_filename) {