Changeset 27972

Timestamp:

2013-08-05T17:44:10+12:00 (11 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.

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -38 +38 @@
 my $setup_script = "setup"; # needs to become gs3-setup for GS3
 my $use_blat = 0; # if we ever get blat to send mail/attachments on Windows working, set this to 1
+my $use_static_model = 0; # set to 1 (true) if working with a non-svn model-collection
 
 
@@ -448 +449 @@
     &File::Path::remove_tree("collect") || die "Error could not delete collect: $!";
     }
-    &File::Path::remove_tree("model-collect");
-
-    #copy to collect and strip .svn subfolders
-    &File::Path::make_path("collect"); # create the folder and copy contents across
-    &copy_recursively(&filename_concat("$ENV{'TASK_HOME'}","model-collect"), "collect", ".svn");
-
-    #make the model copy
-    &File::Path::make_path("model-collect"); 
-    &copy_recursively("collect", "model-collect"); # copy contents across
-    
+
+    if($use_static_model) {     
+    #copy to collect and strip .svn subfolders
+    &File::Path::make_path("collect"); # create the collect folder and copy contents from static model-collection across
+    &copy_recursively("model-collect", "collect", ".svn");
+
+    } else { # the default situation: where we check out the model-collect from svn
+    &File::Path::remove_tree("model-collect");
+    
+    #copy to collect and strip .svn subfolders
+    &File::Path::make_path("collect"); # create the folder and copy contents across
+    &copy_recursively(&filename_concat("$ENV{'TASK_HOME'}","model-collect"), "collect", ".svn");
+    
+    #make the model copy
+    &File::Path::make_path("model-collect"); 
+    &copy_recursively("collect", "model-collect"); # copy contents across
+    }
     print STDERR "done\n";    
     
@@ -465 +473 @@
     for my $collection (readdir $collect_handle) {
     next if ($collection eq "." || $collection eq "..");
-#   next if ($collection ne "Word-PDF-Basic"); ## TEMPORARY, FOR TESTING THIS SCRIPT
+    next if ($collection eq "modelcol");
+#   next if ($collection ne "Enhanced-PDF"); ## TEMPORARY, FOR TESTING THIS SCRIPT
 
     #escape the filename (in case of space)