Changeset 2023


Ignore:
Timestamp:
2001-02-20T14:58:17+13:00 (23 years ago)
Author:
sjboddie
Message:

Changed pdftohtml.pl and gsConvert.pl to reflect the fact that their
respective binary files are now always installed to bin/$GSDLOS

Location:
trunk/gsdl/bin/script
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/bin/script/gsConvert.pl

    r2012 r2023  
    327327    ($input_filename, $output_filestem) = @_;
    328328
    329     my $wvWare = "";
    330     my $wv_conf = "";
    331 
    332     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
    333     $wvWare = "$ENV{'GSDLHOME'}\\bin\\windows\\wvWare.exe";
    334     $wv_conf = "$ENV{'GSDLHOME'}\\bin\\windows\\wvHtml.xml";
    335 
    336     } else {
    337     # formulate the command
    338     my $wv_home = &util::filename_cat($ENV{'GSDLHOME'}, "packages", "wv");
    339     $wv_conf = &util::filename_cat($wv_home, "lib", "wv", "wvHtml.xml");
    340     $wvWare = &util::filename_cat($wv_home, "bin", "wvWare");
    341     }
     329    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin",
     330                     $ENV{'GSDLOS'}, "wvWare");
     331    $wvWare .= ".exe" if ($ENV{'GSDLOS'} =~ /^windows$/i);
    342332    return 0 unless (-e "$wvWare");
     333
     334    my $wv_conf = &util::filename_cat($ENV{'GSDLHOME'}, "packages",
     335                      "wv", "wvHtml.xml");
    343336   
    344337    $cmd = "";
  • trunk/gsdl/bin/script/pdftohtml.pl

    r1997 r2023  
    103103
    104104    # formulate the command
    105     my ($p_home, $pdftohtml);
    106 
    107     if ($ENV{'GSDLOS'} =~ /^windows/i) {
    108     $p_home = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "windows");
    109     $pdftohtml = &util::filename_cat($p_home, "pdftohtml.bin");
    110     }
    111     else  {
    112     $p_home = &util::filename_cat($ENV{'GSDLHOME'}, "packages", "pdftohtml");
    113     $pdftohtml = &util::filename_cat($p_home, "bin", "pdftohtml.bin");
    114     }
     105    my $pdftohtml = &util::filename_cat($ENV{'GSDLHOME'}, "bin",
     106                    $ENV{'GSDLOS'}, "pdftohtml.bin");
    115107    return 0 unless (-e "$pdftohtml");
    116108   
Note: See TracChangeset for help on using the changeset viewer.