Changeset 13474


Ignore:
Timestamp:
2006-12-11T10:10:03+13:00 (17 years ago)
Author:
nzdl
Message:

heaps of changes over the last year and a half, no one has done any committing. So I'll commit this as is - kjdon

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/for-distributions/bin/script/create_distributions.pl

    r9492 r13474  
    6161my $linuxbin = "$ENV{'GSDLHOME'}/bin/linux";
    6262
     63# ditto for Mac OS/X binaries
     64my $macosxbin = "$ENV{'GSDLHOME'}/bin/darwin";
     65
    6366my $cvsanon = ':pserver:[email protected]:2402/usr/local/global-cvs/gsdl-src';
    6467
    6568
     69use strict;
    6670use parsargv;
    6771use util;
    … …  
    8084    print STDERR "                          a tag will be set\n";
    8185    print STDERR "   -no_cdrom              don't create cd-rom version\n";
     86    print STDERR "   -unesco                create unesco style release, i.e. only 4 languages enabled\n";
    8287    print STDERR "   -no_cols               don't attempt to create any collection distributions\n";
    8388    print STDERR "   -only_cols             create collection distributions only\n";
    … …  
    96101&main ();
    97102
    98 sub main {
     103my $version_num;
     104my $cvs_tag;
     105my $no_cdrom;
     106my $unesco;
     107my $no_cols;
     108my $only_cols;
     109my $nochangelog;
     110my $useexistinglog;
     111my $changelogdate;
     112my $output_dir;
     113my @includecols;
     114my @ignorecols;
     115
     116sub main
     117{
    99118    if (!parsargv::parse(\@ARGV,
    100119             'version_num/\d\.\d\d[a-z]?', \$version_num,
    101120             'cvs_tag/.*/', \$cvs_tag,
    102121             'no_cdrom', \$no_cdrom,
     122             'unesco', \$unesco,
    103123             'no_cols', \$no_cols,
    104124             'only_cols', \$only_cols,
    … …  
    130150    if ($have_tag) {
    131151        # Tag gsdl repository
    132         chdir ($ENV{'GSDLHOME'});
    133         print STDERR "\ntagging gsdl with $cvs_tag\n";
     152        #chdir ($ENV{'GSDLHOME'});
     153        #print STDERR "\ntagging gsdl with $cvs_tag\n";
    134154        # `cvs tag -F $cvs_tag`;
    135155
    136156        # Tag gli repository
    137         chdir (&util::filename_cat($ENV{'GSDLHOME'}, "gli"));
    138         print STDERR "\ntagging gli with $cvs_tag\n";
     157        #chdir (&util::filename_cat($ENV{'GSDLHOME'}, "gli"));
     158        #print STDERR "\ntagging gli with $cvs_tag\n";
    139159        # `cvs tag -F $cvs_tag`;
    140160    }
    … …  
    145165    # `cvs -d $cvsanon export -r $cvs_tag gsdl`;
    146166    `cvs -d $cvsanon export -D "1 second ago" gsdl`;
     167    #`cvs -d $cvsanon export -r gsdl-2_70-distribution-branch gsdl`;
    147168
    148169    # Export gli to $tmpdir/gli
    … …  
    151172    # `cvs -d $cvsanon export -r $cvs_tag gli`;
    152173    `cvs -d $cvsanon export -D "1 second ago" gli`;
     174        #`cvs -d $cvsanon export -r gsdl-2_70-distribution-branch gli`;
    153175
    154176    # Compile gli
    155177    print STDERR "\ncompiling gli...\n";
    156178    chdir(&util::filename_cat($tmpdir, "gsdl", "gli"));
    157     `makegli.sh`;
     179    `./makegli.sh`;
    158180
    159181    # JAR up the gli, then delete the class files
    160182    print STDERR "jarring gli...\n";
    161     `makejar.sh`;
     183    `./makejar.sh`;
    162184    &util::rm_r(&util::filename_cat($tmpdir, "gsdl", "gli", "jar"));
    163185    &util::rm(&util::filename_cat($tmpdir, "gsdl", "gli", "metadata.zip"));
    164186    &util::rm_r(&util::filename_cat($tmpdir, "gsdl", "gli", "classes", "org"));
    165187
     188    # Move the GLIServer.jar file created by makejar.sh into bin/java
     189    &util::mv(&util::filename_cat($tmpdir, "gsdl", "gli", "GLIServer.jar"),
     190          &util::filename_cat($tmpdir, "gsdl", "bin", "java"));
     191
    166192    # Remove bits used by none of the distributions
    167193    &util::rm(&util::filename_cat($tmpdir, "gsdl", "packages", "cpan", "XML-Parser-2.27.tar.gz"));
    … …  
    174200    &edit_files();
    175201
    176     # &create_windows_distribution();
    177202    &create_unix_distribution();
    178203    &create_source_distribution();
    … …  
    182207    # &create_collection_distributions() unless $no_cols;
    183208}
    184 
    185 
    186 # sub create_windows_distribution {
    187 #     print STDERR "Creating Windows distribution...\n";
    188 
    189 #     my $windows_dist_dir = &util::filename_cat($output_dir, "gsdl-" . $version_num . "-win32");
    190 #     mkdir ($windows_dist_dir, 0777);
    191 
    192 #     # empty "collect" directory (just because all the other distributions have one)
    193 #     mkdir (&util::filename_cat($windows_dist_dir, "collect"), 0777);
    194 
    195 #     # docs directory (with none of the manuals), README.TXT, COPYING and Support.htm
    196 #     &install_docs ($windows_dist_dir, 1);
    197 
    198 #     # gsdl directory
    199 #     &install_gsdl ($windows_dist_dir);
    200 
    201 #     # gli directory (in gsdl)
    202 #     &install_gli($windows_dist_dir, "windows");
    203 
    204 #     # src directory
    205 #     &install_src ($windows_dist_dir, "windows");
    206 
    207 #     # Windows directory
    208 #     &install_windows_specific ($windows_dist_dir, 0);
    209 
    210 #     # we want to include the unbuilt bits of the demo collection too
    211 #     my $demodir = &util::filename_cat($windows_dist_dir, "gsdl", "collect", "demo");
    212 #     my $tmpdemo = &util::filename_cat($tmpdir, "gsdl", "collect", "demo");
    213 #     die "oops, no demo dir\n" unless -d $demodir;
    214 #     &util::cp (&util::filename_cat ($tmpdemo, "demo.col"), $demodir);
    215 #     &util::cp_r (&util::filename_cat ($tmpdemo, "import"), $demodir);
    216 #     &util::cp_r (&util::filename_cat ($tmpdemo, "metadata"), $demodir);
    217 # }
    218209
    219210
    … …  
    249240
    250241
    251 # sub create_unix_distribution_old {
    252 #     print STDERR "Creating Unix distribution...\n";
    253 
    254 #     my $unix_dist_dir = &util::filename_cat($output_dir, "gsdl-" . $version_num . "-unix");
    255 #     mkdir ($unix_dist_dir, 0777);
    256 
    257 #     # empty "collect" directory
    258 #     mkdir (&util::filename_cat($unix_dist_dir, "collect"), 0777);
    259 
    260 #     # docs directory (with none of the manuals), README.TXT, COPYING and Support.htm
    261 #     &install_docs ($unix_dist_dir, 1);
    262 
    263 #     # Don't need Windows README file
    264 #     &util::rm(&util::filename_cat($unix_dist_dir, "READMEru.txt-cp1251"));
    265 
    266 #     # Rename Unix README file
    267 #     &util::cp(&util::filename_cat($unix_dist_dir, "READMEru.txt-koi8-r"),
    268 #         &util::filename_cat($unix_dist_dir, "READMEru.txt"));
    269 #     &util::rm(&util::filename_cat($unix_dist_dir, "READMEru.txt-koi8-r"));
    270 
    271 #     # gsdl directory
    272 #     &install_gsdl ($unix_dist_dir);
    273 
    274 #     # gli directory (in gsdl)
    275 #     &install_gli($unix_dist_dir, "unix");
    276 
    277 #     # src directory
    278 #     &install_src ($unix_dist_dir, "unix");
    279 
    280 #     # Unix directory
    281 #     &install_unix_specific ($unix_dist_dir);
    282 
    283 #     # Make sure all configure scripts are executable
    284 #     `cd $unix_dist_dir; pwd; find -name "configure" -exec chmod a+x {} \\;`;
    285 
    286 #     # we want to include the unbuilt bits of the demo collection too
    287 #     my $demodir = &util::filename_cat($unix_dist_dir, "gsdl", "collect", "demo");
    288 #     my $tmpdemo = &util::filename_cat($tmpdir, "gsdl", "collect", "demo");
    289 #     die "oops, no demo dir\n" unless -d $demodir;
    290 #     &util::cp (&util::filename_cat ($tmpdemo, "demo.col"), $demodir);
    291 #     &util::cp_r (&util::filename_cat ($tmpdemo, "import"), $demodir);
    292 #     &util::cp_r (&util::filename_cat ($tmpdemo, "metadata"), $demodir);
    293 # }
    294 
    295 
    296 sub create_source_distribution {
     242sub create_source_distribution
     243{
    297244    print STDERR "Creating Source distribution...\n";
    298245
    … …  
    314261    }
    315262
    316     # Get the modified main.cfg file with only core language interfaces enabled
    317     &util::cp(&util::filename_cat($for_distributions_dir, "etc", "main.cfg"), &util::filename_cat($gsdldir, "etc"));
    318 
    319     # Remove the copied "images" and "macros" folders and copy over just the core languages
    320     my $gsdlimagesdir = &util::filename_cat($source_dist_dir, "gsdl", "images");
    321     &util::rm_r($gsdlimagesdir);
    322     &install_only_core_language_images(&util::filename_cat($tmpdir, "gsdl", "images"), $gsdlimagesdir);
    323     my $gsdlmacrosdir = &util::filename_cat($source_dist_dir, "gsdl", "macros");
    324     &util::rm_r($gsdlmacrosdir);
    325     &install_only_core_language_macros(&util::filename_cat($tmpdir, "gsdl", "macros"), $gsdlmacrosdir);
     263    # Don't need the "images/garish" directory for web releases
     264    #&util::rm_r(&util::filename_cat($gsdldir, "images", "garish"));
     265
     266    # Remove the copied "macros" folder and copy over just the core language macros
     267    #my $gsdlmacrosdir = &util::filename_cat($source_dist_dir, "gsdl", "macros");
     268    #&util::rm_r($gsdlmacrosdir);
     269    #&install_only_core_language_macros(&util::filename_cat($tmpdir, "gsdl", "macros"), $gsdlmacrosdir);
    326270
    327271    # We don't want the compiled GLI classes in the source distribution (or the GS3 scripts)
    … …  
    331275    &util::rm(&util::filename_cat($source_dist_dir, "gsdl", "gli", "gli4gs3.sh"));
    332276
    333     # Make sure there is a dictionary_en.properties to prevent GLI problems
    334     # &util::cp(&util::filename_cat($source_dist_dir, "gsdl", "gli", "classes", "dictionary.properties"),
    335     #       &util::filename_cat($source_dist_dir, "gsdl", "gli", "classes", "dictionary_en.properties"));
    336 
    337277    # (We don't include the built demo collection in the source distribution)
    338278}
    339279
    340280
    341 sub create_cdrom_distribution {
     281sub create_cdrom_distribution
     282{
    342283    print STDERR "Creating CD-ROM distribution...\n";
    343284
    344285    my $cdrom_dist_dir = &util::filename_cat ($output_dir, "gsdl-" . $version_num . "-cdrom");
    345286    mkdir ($cdrom_dist_dir, 0777);
    346 
    347     # collect directory, with customised home.dm file for documented example collections
    348     my $cdrom_collect_dir = &util::filename_cat ($cdrom_dist_dir, "collect");
    349     mkdir($cdrom_collect_dir, 0777);
    350     &util::cp(&util::filename_cat($for_distributions_dir, "macros", "home.dm"), $cdrom_collect_dir);
    351287
    352288    # docs directory
    … …  
    376312    &util::cp_r (&util::filename_cat ($tmpdemo, "metadata"), $demodir);
    377313
    378     # Include the documented example collections
     314    # collect directory, with documented example collections and customised home.dm file
     315    # no longer use customised home.dm
     316    my $cdrom_collect_dir = &util::filename_cat ($cdrom_dist_dir, "collect");
     317    mkdir($cdrom_collect_dir, 0777);
     318
    379319    my $source_collect_dir = &util::filename_cat($for_distributions_dir, "collect");
    380320    my $target_collect_dir = &util::filename_cat($cdrom_dist_dir, "collect");
    381321
     322# *****
    382323    &util::cp_r(&util::filename_cat($source_collect_dir, "MARC-e"), $target_collect_dir);
    383324    &util::cp_r(&util::filename_cat($source_collect_dir, "authen-e"), $target_collect_dir);
    … …  
    391332    &util::cp_r(&util::filename_cat($source_collect_dir, "oai-e"), $target_collect_dir);
    392333    &util::cp_r(&util::filename_cat($source_collect_dir, "wrdpdf-e"), $target_collect_dir);
     334    &util::cp_r(&util::filename_cat($source_collect_dir, "dspace-e"), $target_collect_dir);
     335    &util::cp_r(&util::filename_cat($source_collect_dir, "style-e"), $target_collect_dir);
     336    &util::cp_r(&util::filename_cat($source_collect_dir, "pagedimg-e"), $target_collect_dir);
     337    # The customised home.dm file must have a modified date after the gsdl/macros/home.dm file
     338    # no longer use customised home.dm
     339    #&util::cp(&util::filename_cat($for_distributions_dir, "macros", "home.dm"), $cdrom_collect_dir);
    393340
    394341    # Make sure the whole thing is user-writeable
    … …  
    423370    # docs directory, but not any of the Word files or Latex files
    424371    &util::cp_r (&util::filename_cat($docs_dir, "docs"), $install_dir);
    425     $en_docs = &util::filename_cat ($install_dir, "docs", "english", "*.doc");
     372    my $en_docs = &util::filename_cat ($install_dir, "docs", "english", "*.doc");
    426373    `rm $en_docs`;
    427     $es_docs = &util::filename_cat ($install_dir, "docs", "spanish", "*.doc");
     374    my $es_docs = &util::filename_cat ($install_dir, "docs", "spanish", "*.doc");
    428375    `rm $es_docs`;
    429     $ru_docs = &util::filename_cat ($install_dir, "docs", "russian", "*.doc");
     376    my $ru_docs = &util::filename_cat ($install_dir, "docs", "russian", "*.doc");
    430377    `rm $ru_docs`;
    431     $fr_latex = &util::filename_cat ($install_dir, "docs", "french", "latex");
     378    my $fr_latex = &util::filename_cat ($install_dir, "docs", "french", "latex");
    432379    `rm -r $fr_latex`;
    433380}
    … …  
    448395    &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "etc"), $gsdldir);
    449396
    450     # Get the modified main.cfg file with only core language interfaces enabled
    451     &util::cp(&util::filename_cat($for_distributions_dir, "etc", "main.cfg"), &util::filename_cat($gsdldir, "etc"));
    452 
     397    #Get the modified main.cfg file with only core language interfaces enabled
     398    if ($unesco) {
     399    &util::cp(&util::filename_cat($for_distributions_dir, "etc", "main.cfg"), &util::filename_cat($gsdldir, "etc"));
     400    }
    453401    # Make sure everything in bin/script is executable
    454402    my $bin_script_dir = &util::filename_cat($gsdldir, "bin", "script");
    455403    `chmod a+x $bin_script_dir/*`;
    456404
    457     # Make sure applet CGI scripts are executable
    458     my $launch_script = &util::filename_cat($gsdldir, "cgi-bin", "launch");
    459     `chmod a+x $launch_script`;
    460     my $download_script = &util::filename_cat($gsdldir, "cgi-bin", "download");
    461     `chmod a+x $download_script`;
    462     my $upload_script = &util::filename_cat($gsdldir, "cgi-bin", "upload");
    463     `chmod a+x $upload_script`;
     405    # Make sure cgi scripts are executable
     406    my $gliserver_script = &util::filename_cat($gsdldir, "cgi-bin", "gliserver.pl");
     407    `chmod a+x $gliserver_script`;
     408    # should we be doing these ones - usability feedback scripts ??
     409    #my $perl_script = &util::filename_cat($gsdldir, "cgi-bin", "perl.cgi");
     410    #`chmod a+x $perl_script`;
     411    #my $readresults_script = &util::filename_cat($gsdldir, "cgi-bin", "readresults.cgi");
     412    #`chmod a+x $readresults_script`;
     413    #my $trackreport_script = &util::filename_cat($gsdldir, "cgi-bin", "trackreport.cgi");
     414    #`chmod a+x $trackreport_script`;
    464415
    465416    &force_windows_line_endings(&util::filename_cat($gsdldir, "cgi-bin", "gsdlsite.cfg"));
    … …  
    486437    }
    487438
    488     my $gsdlimagesdir = &util::filename_cat ($gsdldir, "images");
    489     &install_only_core_language_images(&util::filename_cat($tmpdir, "gsdl", "images"), $gsdlimagesdir);
    490     # ...and garish images
    491     &util::cp_r(&util::filename_cat($tmpdir, "gsdl", "images", "garish"), $gsdlimagesdir);
    492 
    493     my $gsdlmacrosdir = &util::filename_cat ($gsdldir, "macros");
    494     &install_only_core_language_macros(&util::filename_cat($tmpdir, "gsdl", "macros"), $gsdlmacrosdir);
    495 
     439    # Install all images (non-core languages are now not included)
     440    &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "images"), $gsdldir);
     441
     442    #my $gsdlmacrosdir = &util::filename_cat ($gsdldir, "macros");
     443    #&install_only_core_language_macros(&util::filename_cat($tmpdir, "gsdl", "macros"), $gsdlmacrosdir);
     444    # Install all macrofiles now
     445    &util::cp_r(&util::filename_cat ($tmpdir, "gsdl", "macros"), $gsdldir);
    496446    &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "mappings"), $gsdldir);
    497447    &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "perllib"), $gsdldir);
    498448
    499     # Rename perllib/strings.rb to perllib/strings_en.rb
    500     my $stringsrbfile = &util::filename_cat ($gsdldir, "perllib", "strings.rb");
    501     &util::cp ($stringsrbfile, &util::filename_cat ($gsdldir, "perllib", "strings_en.rb"));
     449    # Rename perllib/strings.properties to perllib/strings_en.properties
     450    my $stringsrbfile = &util::filename_cat ($gsdldir, "perllib", "strings.properties");
     451    &util::cp ($stringsrbfile, &util::filename_cat ($gsdldir, "perllib", "strings_en.properties"));
    502452    &util::rm ($stringsrbfile);
    503453    `touch $stringsrbfile`;
    … …  
    535485    die "Couldn't get built version of demo collection\n";
    536486    }
    537 
    538     # Get modified version of demo collect.cfg file with only core language strings
    539     &util::cp(&util::filename_cat($for_distributions_dir, "collect", "demo", "etc", "collect.cfg"),
    540           &util::filename_cat($collectdir, "demo", "etc"));
    541 }
    542 
    543 
    544 sub install_only_core_language_images
    545 {
    546     my ($source_dir, $target_dir) = @_;
    547     mkdir($target_dir, 0777);
    548 
    549     # Copy all the English images (in the "images" directory)
    550     opendir(IMAGES_DIR, $source_dir) || die "Error: Could not open directory $source_dir\n";
    551     foreach $file (readdir(IMAGES_DIR)) {
    552     my $source_file = &util::filename_cat($source_dir, $file);
    553     if (-f $source_file) {  # Plain files only (ignore directories)
    554         &util::cp($source_file, $target_dir);
    555     }
    556     }
    557     closedir(IMAGES_DIR);
    558 
    559     # Copy the core language (French, Spanish, Russian) images
    560     &util::cp_r(&util::filename_cat($source_dir, "es"), $target_dir);
    561     &util::cp_r(&util::filename_cat($source_dir, "fr"), $target_dir);
    562     &util::cp_r(&util::filename_cat($source_dir, "ru"), $target_dir);
    563 }
    564 
    565 
     487#******
     488    if ($unesco) {
     489    # Get modified version of demo collect.cfg file with only core language strings
     490    &util::cp(&util::filename_cat($for_distributions_dir, "collect", "demo", "etc", "collect.cfg"),
     491          &util::filename_cat($collectdir, "demo", "etc"));
     492    }
     493}
     494
     495# no longer used!
    566496sub install_only_core_language_macros
    567497{
    … …  
    573503               "collect.dm", "dateqry.dm", "docs.dm", "document.dm",
    574504               "exported_home.dm", "extlink.dm", "extra.dm",
    575                "garish.dm", "gli.dm", "gsdl.dm", "help.dm", "home.dm", "html.dm",
     505               "garish.dm", "gli.dm", "gsdl.dm", "gti.dm", "help.dm", "home.dm", "html.dm", "nav_css.dm",
    576506               "nzdlhome.dm", "pref.dm", "query.dm", "status.dm", "style.dm",
    577                "tip.dm", "translang.dm", "users.dm", "yourhome.dm");
     507               "tip.dm", "users.dm", "yourhome.dm");
    578508
    579509    # Core language (English, French, Spanish, Russian) macrofiles
    … …  
    583513
    584514    # Copy the macrofiles
    585     foreach $file ((@basicmacrofiles, @corelanguagemacrofiles)) {
     515    foreach my $file ((@basicmacrofiles, @corelanguagemacrofiles)) {
    586516    &util::cp(&util::filename_cat($source_dir, $file), $target_dir);
    587517    }
    … …  
    606536    `chmod a+x $gli_dir/*.sh`;
    607537
    608     # Copy the customised languages.xml file with only core languages enabled
    609     &util::cp(&util::filename_cat($for_distributions_dir, "gli", "classes", "xml", "languages.xml"),
    610           &util::filename_cat($gli_dir, "classes", "xml"));
    611 
    612     # Make sure there is a dictionary_en.properties to prevent GLI problems
    613     # &util::cp(&util::filename_cat($gli_dir, "classes", "dictionary.properties"),
    614 #         &util::filename_cat($gli_dir, "classes", "dictionary_en.properties"));
    615 
     538    # Copy dictionary.properties to dictionary_en.properties to prevent problems with non-English machines
     539    &util::cp(&util::filename_cat($gli_dir, "classes", "dictionary.properties"),
     540          &util::filename_cat($gli_dir, "classes", "dictionary_en.properties"));
     541
     542    if ($unesco) {
     543    # Copy the customised languages.xml file with only core languages enabled
     544    &util::cp(&util::filename_cat($for_distributions_dir, "gli", "classes", "xml", "languages.xml"),
     545          &util::filename_cat($gli_dir, "classes", "xml"));
     546    }
    616547    # Remove unwanted stuff - all distributions
    617548    &util::rm(&util::filename_cat($gli_dir, ".greenstonestore"));
    … …  
    694625    &util::cp (&util::filename_cat ($tmpdir, "gsdl", "setup.csh"), $srcunixdir);
    695626    `chmod a+x $srcunixdir/setup.*`;
     627
     628    # get all the configure scripts
     629    `cd $srcdir; find -name "configure" -exec chmod a+x {} \\; ; cd -`
     630   
    696631    }
    697632}
    … …  
    732667    `chmod a+x $install_sh`;
    733668
     669    # Get Linux binaries, and make sure they're all executable
    734670    &util::cp_r ($linuxbin, $unixbindir);
    735     # make sure linux binaries are all executable
    736671    my $linuxbindir = &util::filename_cat($unixbindir, 'linux');
    737672    `chmod -R a+x $linuxbindir`;
    … …  
    739674    # remove the non-static mgquery_old program from distributions
    740675    &util::rm(&util::filename_cat($linuxbindir, "mgquery_old"));
    741    
     676
     677    # Get Mac OS/X binaries, and make sure they're all executable
     678    &util::cp_r ($macosxbin, $unixbindir);
     679    my $macosxbindir = &util::filename_cat($unixbindir, 'darwin');
     680    `chmod -R a+x $macosxbindir`;
     681
    742682    # make sure there aren't any CVS directories laying around
    743683    &remove_cvs_dirs ($unixdir);
    … …  
    758698    my %ignore = ();
    759699    map { $ignore{$_} = ""; } @ignorecols;
    760     foreach $d (@cdirs) {
     700    foreach my $d (@cdirs) {
    761701        if ((-d &util::filename_cat($collectdir, $d)) && ($d ne ".") && ($d ne "..") &&
    762702        ($d ne "modelcol") && ($d ne "CVS") && (!defined $ignore{$d})) {
    … …  
    769709
    770710    # create distributions
    771     foreach $collection (@cols) {
     711    foreach my $collection (@cols) {
    772712    if (&get_built_collection ($collection, $tmpdir)) {
    773713        &zip ("$collection-prebuilt", $collection, $tmpdir, 0);
    … …  
    876816    } else {
    877817
    878         print STDERR "$collection collection appears to have no valid\n";
     818        print STDERR "$colname collection appears to have no valid\n";
    879819        print STDERR "import or archives data\n";
    880820        &util::rm_r ($to_dir);
    … …  
    999939    my $line = ""; my $file = "";
    1000940    while (defined ($line = <FILE>)) {
    1001     $line =~ s/^((?:creator|maintainer)\s+\"?)\w+@\w+(\"?)/$1greenstone\@cs.waikato.ac.nz$2/ix;
     941    $line =~ s/^((?:creator|maintainer)\s+\"?)[\w\.]+@[\w\.]+(\"?)/$1greenstone\@cs.waikato.ac.nz$2/ix;
    1002942    # !! This will stuff up if there are handle language qualifiers eg. [l=en] !!
    1003943    # $line =~ s/^(collectionmeta\s+\"?iconcollection(?:small)?\"?\s+\"?).*?($collname\/images\/)/$1_httpprefix_\/collect\/$2/ix;
    … …  
    1048988    closedir DIR;
    1049989
    1050     foreach $file (@files) {
     990    foreach my $file (@files) {
    1051991    next if $file =~ /^\.\.?$/;
    1052992    my $fullpath = &util::filename_cat ($dir, $file);
Note: See TracChangeset for help on using the changeset viewer.