Changeset 19791

Show
Ignore:
Timestamp:
10.06.2009 14:36:56 (10 years ago)
Author:
kjdon
Message:

more changes to do with images moved into web. Now just copy over whole web dir, don't need to do anything with images dir, and don't need to handle Phind.jar and GsdlCollageApplet?.jar individually as they are just included in web

Files:
1 modified

Legend:

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

    r19650 r19791  
    206206    my $etcdir = &util::filename_cat ($gsdldir, "etc"); 
    207207    &util::mk_all_dir ($etcdir); 
    208     my $webjavadir = &util::filename_cat ($gsdldir, "web", "java"); 
    209     &util::mk_all_dir ($webjavadir); 
    210208 
    211209    #create the config files 
     
    242240    print MANIFESTCFG "\n\n"; 
    243241    print MANIFESTCFG "collection:\n"; 
    244     print MANIFESTCFG "  collect etc macros mappings bin web images\n"; 
     242    print MANIFESTCFG "  collect etc macros mappings web\n"; 
    245243    close MANIFESTCFG; 
    246244     
     
    263261     
    264262    # copy the necessary stuff from GSDLHOME 
    265     my $imagesdir = &util::filename_cat ($ENV{'GSDLHOME'}, "web", "images"); 
     263    my $webdir = &util::filename_cat ($ENV{'GSDLHOME'}, "web"); 
    266264    my $macrosdir = &util::filename_cat ($ENV{'GSDLHOME'}, "macros"); 
    267265    my $mappingsdir = &util::filename_cat ($ENV{'GSDLHOME'}, "mappings"); 
     
    269267    my $serverexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "server.exe"); 
    270268    my $setupexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Setup.exe"); 
    271     my $phindjar = &util::filename_cat ($ENV{'GSDLHOME'}, "web", "java", "Phind.jar"); 
    272     my $gsdlcollageappletjar = &util::filename_cat ($ENV{'GSDLHOME'}, "web", "java", "GsdlCollageApplet.jar"); 
    273  
    274     if ((!-d $imagesdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) || 
    275     (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe) || (!-e $phindjar) || 
    276     (!-e $gsdlcollageappletjar)) { 
     269 
     270    if ((!-d $webdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) || 
     271    (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe)) { 
    277272    &gsprintf($out, "{exportcol.fail} {exportcol.non_exist_files}\n"); 
    278     &gsprintf($out, "  $imagesdir\n"); 
     273    &gsprintf($out, "  $webdir\n"); 
    279274    &gsprintf($out, "  $macrosdir\n"); 
    280275    &gsprintf($out, "  $mappingsdir\n"); 
     
    283278    &gsprintf($out, "  $gssetupexe\n"); 
    284279    &gsprintf($out, "  $setupexe\n"); 
    285     &gsprintf($out, "  $phindjar\n"); 
    286     &gsprintf($out, "  $gsdlcollageappletjar\n"); 
    287     die "\n"; 
    288     } 
    289  
    290     &util::cp_r ($imagesdir, $gsdldir); 
     280    die "\n"; 
     281    } 
     282 
     283    &util::cp_r ($webdir, $gsdldir); 
    291284    &util::cp_r ($macrosdir, $gsdldir); 
    292285    &util::cp_r ($mappingsdir, $gsdldir); 
    293286    &util::cp ($maincfg, $etcdir); 
    294287    &util::cp ($serverexe, $gsdldir); 
    295     &util::cp ($phindjar, $webjavadir); 
    296     &util::cp ($gsdlcollageappletjar, $webjavadir); 
    297288 
    298289    if (!$noinstall) { 
     
    316307    my $colindexdir = &util::filename_cat ($colldir, "index"); 
    317308    my $coletcdir = &util::filename_cat ($colldir, "etc"); 
     309    my $colmacrosdir = &util::filename_cat ($colldir, "macros"); 
    318310    my $colimagesdir = &util::filename_cat ($colldir, "images"); 
    319     my $colmacrosdir = &util::filename_cat ($colldir, "macros"); 
     311    my $colscriptdir = &util::filename_cat ($colldir, "script"); 
     312    my $coljavadir = &util::filename_cat ($colldir, "java"); 
     313    my $colstyledir = &util::filename_cat ($colldir, "style"); 
     314    my $colflashdir = &util::filename_cat ($colldir, "flash"); 
     315 
    320316    # new coll directory 
    321317    my $newcoldir = &util::filename_cat ($collectdir, $c); 
     
    325321    &util::rename_gdbm_file(&util::filename_cat ($newcoldir, "index", "text", $c)); 
    326322    &util::cp_r ($coletcdir, $newcoldir); 
     323    &util::cp_r ($colmacrosdir, $newcoldir) if (-e $colmacrosdir); 
    327324    &util::cp_r ($colimagesdir, $newcoldir) if (-e $colimagesdir); 
    328     &util::cp_r ($colmacrosdir, $newcoldir) if (-e $colmacrosdir); 
     325    &util::cp_r ($colscriptdir, $newcoldir) if (-e $colscriptdir); 
     326    &util::cp_r ($coljavadir, $newcoldir) if (-e $coljavadir); 
     327    &util::cp_r ($colstyledir, $newcoldir) if (-e $colstyledir); 
     328    &util::cp_r ($colflashdir, $newcoldir) if (-e $colflashdir); 
    329329 
    330330    # now we need to check the collect.cfg file to make sure it's public