Changeset 14365

Timestamp:

2007-08-13T13:42:34+12:00 (17 years ago)

Author:

qq6

Message:

the hard_link on windows didn't work, get back to the old version

File:

• gsdl/trunk/perllib/util.pm (modified) (3 diffs)

gsdl/trunk/perllib/util.pm

@@ -26 +26 @@
 package util;
 
-BEGIN {                                                             
-    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};       
-    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};           
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");                     
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");                
-}                                                                   
 use File::Copy;
 use File::Basename;
+
 
 # removes files (but not directories)
@@ -386 +381 @@
     # link not supported on windows 9x
     if (($ENV{'GSDLOS'} =~ /^windows$/i) && (Win32::FsType() !~ /^ntfs$/i)) {
-require Win32::Hardlink;
-        print STDERR "util::hard_link: win32: using copy for hard link.\n";
-        &File::Copy::copy ($src, $dest);
-    } else {
-        if (!link($src, $dest)) {
-            print STDERR "util::hard_link: unable to create hard link. ";
-            print STDERR " Attempting to copy file: $src -> $dest\n";
-            &File::Copy::copy ($src, $dest);
-        }
+    &File::Copy::copy ($src, $dest);
+
+    } elsif (!link($src, $dest)) {
+    print STDERR "util::hard_link: unable to create hard link. ";
+    print STDERR " Attempting to copy file: $src -> $dest\n";
+    &File::Copy::copy ($src, $dest);
     }
     return 0;
@@ -415 +407 @@
     my $dest_dir = &File::Basename::dirname($dest);
     mk_all_dir($dest_dir) if (!-e $dest_dir);
-        
-    # symlink not supported on windows
+
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-        if ( (Win32::FsType() =~ /^ntfs$/i) && 
-            ($src =~ /^.:\\.*/) && ($dest =~ /^.:\\.*/) &&
-            (substr($src,0,3) eq substr($dest,0,3)) ) {
-            # if filesystem is NTFS and both source and destination is on the same local drive,
-            # use hardlink instead of symlink
-            #print STDERR "util::soft_link: win32: using hard link instead of soft ink.\n";
-            hard_link($src,$dest);
-        } else {
-            #print STDERR "util::soft_link: win32: using copy for soft link.\n ";
-            &File::Copy::copy ($src, $dest);
-        }
+    # symlink not supported on windows
+    &File::Copy::copy ($src, $dest);
 
     } elsif (!eval {symlink($src, $dest)}) {