Changeset 9083


Ignore:
Timestamp:
2005-02-17T15:59:39+13:00 (19 years ago)
Author:
mdewsnip
Message:

Changed some stuff for the new installer.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/bin/script/create_distributions.pl

    r8887 r9083  
    172172    &edit_files();
    173173
    174     &create_windows_distribution();
    175     &create_unix_distribution();
    176     &create_source_distribution();
     174    # &create_windows_distribution();
     175    # &create_unix_distribution();
     176    # &create_source_distribution();
    177177    &create_cdrom_distribution() unless $no_cdrom;
    178178    }
    … …  
    287287
    288288    # We shouldn't distribute the GLI applet signed by us
    289     &util::rm (&util::filename_cat ($source_dist_dir, "gsdl", "bin", "java", "SignedGatherer.jar"));
     289    if (-e &util::filename_cat($source_dist_dir, "gsdl", "bin", "java", "SignedGatherer.jar")) {
     290    &util::rm(&util::filename_cat($source_dist_dir, "gsdl", "bin", "java", "SignedGatherer.jar"));
     291    }
    290292
    291293    # Remove the copied "images" and "macros" folders and copy over just the core languages
    … …  
    360362    my ($install_dir, $isweb) = @_;
    361363
    362     # docs directory, README*.txt, COPYING and Support.htm
    363     &util::cp_r (&util::filename_cat($docdir, "docs"), $install_dir);
     364    # COPYING, README*.txt and Support.htm
     365    &util::cp (&util::filename_cat($docdir, "COPYING"), $install_dir);
    364366    &util::cp (&util::filename_cat($docdir, "READMEen.txt"), $install_dir);
    365367    &util::cp (&util::filename_cat($docdir, "READMEes.txt"), $install_dir);
    … …  
    367369    &util::cp (&util::filename_cat($docdir, "READMEru.txt-cp1251"), $install_dir);
    368370    &util::cp (&util::filename_cat($docdir, "READMEru.txt-koi8-r"), $install_dir);
    369     &util::cp (&util::filename_cat($docdir, "COPYING"), $install_dir);
    370371    &util::cp (&util::filename_cat($docdir, "Support.htm"), $install_dir);
    371372
    372     # Don't want Kazakh manuals for either distribution
    373     # &util::rm(&util::filename_cat($install_dir, "docs", "Install-kz.pdf"));
    374     # &util::rm(&util::filename_cat($install_dir, "docs", "User-kz.pdf"));
    375     # &util::rm(&util::filename_cat($install_dir, "docs", "Paper-kz.pdf"));
    376 
    377     # don't want manuals for web distributions
    378     if ($isweb) {
    379     my @manuals =
    380         ("Install-en.pdf", "User-en.pdf", "Develop-en.pdf", "Paper-en.pdf", "Organize-en.pdf",
    381          "Install-fr.pdf", "User-fr.pdf", "Develop-fr.pdf", "Paper-fr.pdf", "Organize-fr.pdf",
    382          "Install-es.pdf", "User-es.pdf", "Develop-es.pdf", "Paper-es.pdf", "Organize-es.pdf",
    383          "Install-ru.pdf", "User-ru.pdf", "Develop-ru.pdf", "Paper-ru.pdf", "Organize-ru.pdf");
    384 
    385     foreach $manual (@manuals) {
    386         my $manualfile = &util::filename_cat ($install_dir, "docs", $manual);
    387         if (-e $manualfile) {
    388         &util::rm($manualfile);
    389         }
    390     }
    391     }
    392 
    393     # Don't want doc versions of manuals
    394     $rm_docs = "rm -r " . &util::filename_cat ($install_dir, "docs", "*.doc");
    395     `$rm_docs`;
    396 
    397     # Don't want latex versions of manuals
    398     $rm_latex = "rm -r " . &util::filename_cat($install_dir, "docs", "latex");
    399     `$rm_latex`;
     373    &force_windows_line_endings(&util::filename_cat($install_dir, "COPYING"));
     374    &force_windows_line_endings(&util::filename_cat($install_dir, "READMEen.txt"));
     375    &force_windows_line_endings(&util::filename_cat($install_dir, "READMEes.txt"));
     376    &force_windows_line_endings(&util::filename_cat($install_dir, "READMEfr.txt"));
     377
     378    # The web distributions don't have any of the manuals
     379    return if ($isweb);
     380
     381    # docs directory, but not any of the Word files or Latex files
     382    &util::cp_r (&util::filename_cat($docdir, "docs"), $install_dir);
     383    $en_docs = &util::filename_cat ($install_dir, "docs", "english", "*.doc");
     384    `rm $en_docs`;
     385    $es_docs = &util::filename_cat ($install_dir, "docs", "spanish", "*.doc");
     386    `rm $es_docs`;
     387    $ru_docs = &util::filename_cat ($install_dir, "docs", "russian", "*.doc");
     388    `rm $ru_docs`;
     389    $fr_latex = &util::filename_cat ($install_dir, "docs", "french", "latex");
     390    `rm -r $fr_latex`;
    400391}
    401392
    … …  
    415406    &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "etc"), $gsdldir);
    416407
     408    &force_windows_line_endings(&util::filename_cat($gsdldir, "cgi-bin", "gsdlsite.cfg"));
     409    &force_windows_line_endings(&util::filename_cat($gsdldir, "etc", "main.cfg"));
     410    &force_windows_line_endings(&util::filename_cat($gsdldir, "etc", "oai.cfg"));
     411
    417412    # We shouldn't distribute the GLI applet signed by us
    418     &util::rm (&util::filename_cat ($gsdlbindir, "java", "SignedGatherer.jar"));
     413    if (-e &util::filename_cat($gsdlbindir, "java", "SignedGatherer.jar")) {
     414    &util::rm(&util::filename_cat($gsdlbindir, "java", "SignedGatherer.jar"));
     415    }
    419416
    420417    my $gsdlimagesdir = &util::filename_cat ($gsdldir, "images");
    … …  
    430427
    431428    # Rename perllib/strings.rb to perllib/strings_en.rb
    432     &util::cp (&util::filename_cat ($gsdldir, "perllib", "strings.rb"),
    433            &util::filename_cat ($gsdldir, "perllib", "strings_en.rb"));
    434     &util::rm (&util::filename_cat ($gsdldir, "perllib", "strings.rb"));
     429    my $stringsrbfile = &util::filename_cat ($gsdldir, "perllib", "strings.rb");
     430    &util::cp ($stringsrbfile, &util::filename_cat ($gsdldir, "perllib", "strings_en.rb"));
     431    &util::rm ($stringsrbfile);
     432    `touch $stringsrbfile`;
    435433
    436434    # untar Ping.tgz
    … …  
    443441    # make sure that modelcol collection contains all the right
    444442    # empty directories
    445     my $modelindex = &util::filename_cat ($tmpdir, "gsdl", "collect", "modelcol", "index");
     443    my $modelindex = &util::filename_cat ($gsdldir, "collect", "modelcol", "index");
    446444    &util::mk_all_dir ($modelindex) unless -d $modelindex;
    447     my $modelbuilding = &util::filename_cat ($tmpdir, "gsdl", "collect", "modelcol", "building");
     445    my $modelbuilding = &util::filename_cat ($gsdldir, "collect", "modelcol", "building");
    448446    &util::mk_all_dir ($modelbuilding) unless -d $modelbuilding;
    449     my $modelarchives = &util::filename_cat ($tmpdir, "gsdl", "collect", "modelcol", "archives");
     447    my $modelarchives = &util::filename_cat ($gsdldir, "collect", "modelcol", "archives");
    450448    &util::mk_all_dir ($modelarchives) unless -d $modelarchives;
    451     my $modelimport = &util::filename_cat ($tmpdir, "gsdl", "collect", "modelcol", "import");
     449    my $modelimport = &util::filename_cat ($gsdldir, "collect", "modelcol", "import");
    452450    &util::mk_all_dir ($modelimport) unless -d $modelimport;
    453     my $modelperllib = &util::filename_cat ($tmpdir, "gsdl", "collect", "modelcol", "perllib");
     451    my $modelperllib = &util::filename_cat ($gsdldir, "collect", "modelcol", "perllib");
    454452    &util::mk_all_dir ($modelperllib) unless -d $modelperllib;
    455     my $modelimages = &util::filename_cat ($tmpdir, "gsdl", "collect", "modelcol", "images");
     453    my $modelimages = &util::filename_cat ($gsdldir, "collect", "modelcol", "images");
    456454    &util::mk_all_dir ($modelimages) unless -d $modelimages;
    457455
    … …  
    522520
    523521    my $gli_dir = &util::filename_cat($target_dir, "gli");
     522    &force_windows_line_endings(&util::filename_cat($gli_dir, "READMEen.txt"));
     523    &force_windows_line_endings(&util::filename_cat($gli_dir, "READMEes.txt"));
     524    &force_windows_line_endings(&util::filename_cat($gli_dir, "READMEfr.txt"));
    524525
    525526    # Make Unix scripts executable
    … …  
    543544    # Remove unwanted stuff - all distributions
    544545    &util::rm(&util::filename_cat($gli_dir, ".greenstonestore"));
    545     &util::rm_r(&util::filename_cat($gli_dir, "buglist"));
    546     &util::rm_r(&util::filename_cat($gli_dir, "prototype"));
    547546
    548547    # Don't need Greenstone 3 scripts
    … …  
    595594    &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "src"), $srcdir);
    596595    &util::cp (&util::filename_cat ($tmpdir, "gsdl", "Install.txt"), $srcdir);
     596    &force_windows_line_endings(&util::filename_cat($srcdir, "Install.txt"));
    597597
    598598    if ($type ne "unix") {
    … …  
    832832}
    833833
     834
     835sub force_windows_line_endings
     836{
     837    my ($filepath) = @_;
     838
     839    open(IN, "<$filepath");
     840    my $text = join('', <IN>);
     841    close(IN);
     842
     843    $text =~ s/\n\x0A/\n\x0D\x0A/g;
     844    $text =~ s/([^\x0D])\x0A/$1\x0D\x0A/g;
     845
     846    open(OUT, ">$filepath");
     847    print OUT "$text";
     848    close(OUT);
     849}
     850
     851
    834852sub create_changelog {
    835853
Note: See TracChangeset for help on using the changeset viewer.