Changeset 27972

Show
Ignore:
Timestamp:
05.08.2013 17:44:10 (6 years ago)
Author:
ak19
Message:

1. Skips any modelcol (template) folder in model-collect, 2. Flag for working with a static model-collect instead of the default case where it is checked out from svn every time we run task with the run_test option.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

    r27965 r27972  
    3838my $setup_script = "setup"; # needs to become gs3-setup for GS3 
    3939my $use_blat = 0; # if we ever get blat to send mail/attachments on Windows working, set this to 1 
     40my $use_static_model = 0; # set to 1 (true) if working with a non-svn model-collection 
    4041 
    4142 
     
    448449    &File::Path::remove_tree("collect") || die "Error could not delete collect: $!"; 
    449450    } 
    450     &File::Path::remove_tree("model-collect"); 
    451  
    452     #copy to collect and strip .svn subfolders 
    453     &File::Path::make_path("collect"); # create the folder and copy contents across 
    454     &copy_recursively(&filename_concat("$ENV{'TASK_HOME'}","model-collect"), "collect", ".svn"); 
    455  
    456     #make the model copy 
    457     &File::Path::make_path("model-collect");  
    458     &copy_recursively("collect", "model-collect"); # copy contents across 
    459      
     451 
     452    if($use_static_model) {      
     453    #copy to collect and strip .svn subfolders 
     454    &File::Path::make_path("collect"); # create the collect folder and copy contents from static model-collection across 
     455    &copy_recursively("model-collect", "collect", ".svn"); 
     456 
     457    } else { # the default situation: where we check out the model-collect from svn 
     458    &File::Path::remove_tree("model-collect"); 
     459     
     460    #copy to collect and strip .svn subfolders 
     461    &File::Path::make_path("collect"); # create the folder and copy contents across 
     462    &copy_recursively(&filename_concat("$ENV{'TASK_HOME'}","model-collect"), "collect", ".svn"); 
     463     
     464    #make the model copy 
     465    &File::Path::make_path("model-collect");  
     466    &copy_recursively("collect", "model-collect"); # copy contents across 
     467    } 
    460468    print STDERR "done\n";     
    461469     
     
    465473    for my $collection (readdir $collect_handle) { 
    466474    next if ($collection eq "." || $collection eq ".."); 
    467 #   next if ($collection ne "Word-PDF-Basic"); ## TEMPORARY, FOR TESTING THIS SCRIPT 
     475    next if ($collection eq "modelcol"); 
     476#   next if ($collection ne "Enhanced-PDF"); ## TEMPORARY, FOR TESTING THIS SCRIPT 
    468477 
    469478    #escape the filename (in case of space)