Changeset 1143

Timestamp:

2000-05-04T13:59:50+12:00 (24 years ago)

Author:

sjboddie

Message:

attempting to get end-user building stuff working under windows

File:

• trunk/gsdl/cgi-bin/GSDLHOME.pm (modified) (2 diffs)

trunk/gsdl/cgi-bin/GSDLHOME.pm

@@ -5 +5 @@
     # get arguments
     my $cgi = new CGI;
+
     $ENV{'GSDLHOME'} = $cgi->param("gsdlhome") if (!defined $ENV{'GSDLHOME'});
+
+    # delete this line once _gsdlhome macro is fixed
+    $ENV{'GSDLHOME'} =~ s/d:gsdl/d:\\gsdl/i;
 
     unless (defined $ENV{'GSDLHOME'})
@@ -18 +22 @@
     }
 
-    $ENV{'GSDLOS'} = $^O; # special perl variable set to OS
-                          ##### Need to check to see what this is set to
-                          ##### under Windows 
+    # just in case GSDLHOME has a slash on the end which would cause
+    # double slashes below
+    $ENV{'GSDLHOME'} =~ s/[\/\\]+$//;
 
-    $ENV{'PATH'} .= ":$ENV{'GSDLHOME'}/bin/script";
-    $ENV{'PATH'} .= ":$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
+    $ENV{'GSDLOS'} = $^O;
 
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
+    if ($ENV{'GSDLOS'} =~ /(win|dos)/i) {
+    $ENV{'GSDLOS'} = 'windows';
+    }
+
+    if ($ENV{'GSDLOS'} eq "windows") {
+    $ENV{'PATH'} .= ':' . $ENV{'GSDLHOME'} . '\bin\script';
+    $ENV{'PATH'} .= ':' . $ENV{'GSDLHOME'} . '\bin\windows';
+    unshift (@INC, $ENV{'GSDLHOME'} . '\perllib');
+    unshift (@INC, $ENV{'GSDLHOME'} . '\perllib\cpan');
+    } else {
+    $ENV{'PATH'} .= ":$ENV{'GSDLHOME'}/bin/script";
+    $ENV{'PATH'} .= ":$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
+    }
 }