Changeset 28393 for main

Timestamp:

2013-10-14T09:57:33+13:00 (11 years ago)

Author:

davidb

Message:

Support for Cygwin added

File:

• main/trunk/greenstone2/perllib/FileUtils.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/FileUtils.pm

@@ -495 +495 @@
 
   # remove duplicate slashes and remove the last slash
-  if ($ENV{'GSDLOS'} =~ /^windows$/i)
+  if (($ENV{'GSDLOS'} =~ /^windows$/i) && ($^O ne "cygwin"))
   {
     $filename =~ s/[\\\/]+/\\/g;
@@ -509 +509 @@
 }
 ## filenameConcatenate()
+
+
+
+## @function javaFilenameConcatenate()
+#
+# Same as filenameConcatenate(), except because on Cygwin
+# the java we run is still Windows native, then this means
+# we want the generate filename to be in native Windows format
+sub javaFilenameConcatenate
+{
+  my (@filenames) = @_;
+
+  my $filename_cat = filenameConcatenate(@filenames);
+
+  if ($^O eq "cygwin") {
+      # java program, using a binary that is native to Windows, so need
+      # Windows directory and path separators
+
+      $filename_cat = `cygpath -wp "$filename_cat"`;
+      chomp($filename_cat);
+      $filename_cat =~ s%\\%\\\\%g;
+  }
+
+  return $filename_cat;
+}
+## javaFilenameConcatenate()
+
 
 ## @function filePutContents()
@@ -553 +580 @@
   my $exists = 0;
 
-  if ($ENV{'GSDLOS'} =~ m/^windows$/i)
+  if (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin"))
   {
     require Win32;
@@ -652 +679 @@
 {
   my ($filename) = @_;
-  if ($ENV{'GSDLOS'} =~ /^windows$/i)
+  if (($ENV{'GSDLOS'} =~ /^windows$/i) && ($^O ne "cygwin"))
   {
     return ($filename =~ m/^(\w:)?\\/);
@@ -1137 +1164 @@
   }
 
-  if ($ENV{'GSDLOS'} =~ /^windows$/i)
+  if (($ENV{'GSDLOS'} =~ /^windows$/i) && ($^O ne "cygwin"))
   {
     # symlink not supported on windows