Changeset 24612

Timestamp:

2011-09-20T15:09:21+12:00 (13 years ago)

Author:

ak19

Message:

Windows specific changes to gs-magick.pl and setup.bat: bat file used to add bin\windows\imagemagick to path (not bin\windows\imagemagick\bin). It no longer does that, and gs-magick.pl sets this.

Location:

main/trunk/greenstone2

Files:

• bin/script/gs-magick.pl (modified) (1 diff)
• setup.bat (modified) (2 diffs)

main/trunk/greenstone2/bin/script/gs-magick.pl

@@ -99 +99 @@
     # imagick to fall back on (and set MAGICK_HOME that way) we use that
     if(defined $ENV{'MAGICK_HOME'} && -d $ENV{'MAGICK_HOME'}) {
-    &util::envvar_prepend("PATH", &util::filename_cat($ENV{'MAGICK_HOME'}, "bin"));
-
-    my $magick_lib = &util::filename_cat($ENV{'MAGICK_HOME'}, "lib");
-    if($ENV{'GSDLOS'} eq "linux") {
-        &util::envvar_prepend("LD_LIBRARY_PATH", $magick_lib);
-    } elsif ($ENV{'GSDLOS'} eq "darwin") {
-        &util::envvar_prepend("DYLD_LIBRARY_PATH", $magick_lib);
+    if($ENV{'GSDLOS'} =~ m/windows/) {
+        &util::envvar_prepend("PATH", $ENV{'MAGICK_HOME'}); # the imagemagick folder (no bin therein)
+    }
+ 
+    else { # linux and mac
+        &util::envvar_prepend("PATH", &util::filename_cat($ENV{'MAGICK_HOME'}, "bin"));
+    
+        my $magick_lib = &util::filename_cat($ENV{'MAGICK_HOME'}, "lib");
+        if($ENV{'GSDLOS'} eq "linux") {
+        &util::envvar_prepend("LD_LIBRARY_PATH", $magick_lib);
+        } elsif ($ENV{'GSDLOS'} eq "darwin") {
+        &util::envvar_prepend("DYLD_LIBRARY_PATH", $magick_lib);
+        }
     }
 
     if($verbosity > 2) {
         print STDERR "\t*** MAGICK_HOME".$ENV{'MAGICK_HOME'}."\n";
-        print STDERR "\t*** LD_LIB_PATH".$ENV{'LD_LIBRARY_PATH'}."\n";
+        print STDERR "\t*** LD_LIB_PATH".$ENV{'LD_LIBRARY_PATH'}."\n" if defined $ENV{'LD_LIBRARY_PATH'};
+        print STDERR "\t*** DYLD_LIB_PATH".$ENV{'DYLD_LIBRARY_PATH'}."\n" if defined $ENV{'DYLD_LIBRARY_PATH'};
         print STDERR "\t*** PATH".$ENV{'PATH'}."\n\n";
     }

main/trunk/greenstone2/setup.bat

@@ -36 +36 @@
 if exist "!GSDLHOME!\bin\windows\ghostscript\lib\*.*" set GS_LIB=!GSDLHOME!\bin\windows\ghostscript\lib
 if exist "!GSDLHOME!\bin\windows\ghostscript\bin\*.*" set PATH=!GSDLHOME!\bin\windows\ghostscript\bin;!PATH!
-if exist "!GSDLHOME!\bin\windows\imagemagick\*.*" set PATH=!GSDLHOME!\bin\windows\imagemagick;!PATH!
+:: ImageMagick environment vars are now set in bin\script\gs-magick.pl
+::if exist "!GSDLHOME!\bin\windows\imagemagick\*.*" set PATH=!GSDLHOME!\bin\windows\imagemagick;!PATH!
 
 if "!GS_CP_SET!" == "yes" goto Success
@@ -63 +64 @@
 if exist "!GSDLHOME!\bin\windows\ghostscript\lib\*.*" set GS_LIB="!GSDLHOME!\bin\windows\ghostscript\lib"
 if exist "!GSDLHOME!\bin\windows\ghostscript\bin\*.*" set PATH="!GSDLHOME!\bin\windows\ghostscript\bin";"!PATH!"
-if exist "!GSDLHOME!\bin\windows\imagemagick\*.*" set PATH="!GSDLHOME!\bin\windows\imagemagick";"!PATH!"
+:: ImageMagick environment vars are now set in bin\script\gs-magick.pl
+::if exist "!GSDLHOME!\bin\windows\imagemagick\*.*" set PATH="!GSDLHOME!\bin\windows\imagemagick";"!PATH!"
 
 if "!GS_CP_SET!" == "yes" goto Success