Changeset 24563

Timestamp:

2011-09-06T15:40:29+12:00 (13 years ago)

Author:

ak19

Message:

1. On Windows, Depositor needs env var OS for the call to util::setup_greenstone_env() from bin\script\build to work (it will try to run setup.bat; if OS is set, it will be Windows_NT and if it's not set, it will default to Win95 and try to run a COMMAND statement that conflicts with the Depositor's building process. The fix is to let Apache have access to the env var OS, by using PassEnv. 2. Fixed oversight of not closing filehandle in util::setup_greenstone_env().

Location:

main/trunk/greenstone2

Files:

• perllib/util.pm (modified) (2 diffs)
• runtime-src/packages/apache-httpd/windows-httpd.conf.in (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1590 +1590 @@
     if (!open(PIN, "$perl_command |")) {
         print STDERR ("Unable to execute command: $perl_command. $!\n");
-    }
+    }
 
     while (defined (my $perl_output_line = <PIN>)) {
@@ -1597 +1597 @@
         $ENV{$key}=$value;
     }
-    
+    close (PIN);
+
     # If any keys in $ENV don't occur in Greenstone's localised env 
     # (stored in $env_map), delete those entries from $ENV

main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

@@ -53 +53 @@
 # to the TEMP windows folder in case GS is installed on a non-writable media 
 # like a CD-ROM.
-PassEnv "USERPROFILE" "ProgramFiles" LANG "TEMP"
+# Need to pass OS too, so that when the depositor builds and 
+# util::setup_greenstone_env() is called, which then calls setup.bat, 
+# the %OS% var is set. If empty, it defaults to Win95 instead of being 
+# Windows_NT, and then things fail in a memory allocation line in setup.bat.
+PassEnv "USERPROFILE" "ProgramFiles" "TEMP" "OS" "LANG"
 
 #