Changeset 28616 for other-projects/nightly-tasks/diffcol/trunk/task.pl

Timestamp:

2013-11-12T19:39:41+13:00 (10 years ago)

Author:

sjm84

Message:

Beginnings of adding further cmdline args (svn/bin, gs2/gs3).

File:

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

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

@@ -50 +50 @@
 my $use_blat = 0; # if we ever get blat to send mail/attachments on Windows working, set this to 1
 
+my $install_type = "svn";
+my $install_version = "2";
+
 my $use_local_rebuild = 0; # set to 1 (true) if just diffing and so we needn't copy model-collection over to the test collection again nor rebuild it (This is useful when having built the collection locally once before)
 my $use_static_model = 0; # set to 1 (true) if working with a non-svn model-collection. Defaults to 1 if $use_local_rebuild is turned on
@@ -112 +115 @@
 
 # run_test can take any number of args
-if(scalar(@ARGV) > 1 && $ARGV[0] ne "run_test") {
+if(scalar(@ARGV) > 1 && $ARGV[0] !~ m/run_test|setup_greenstone/) {
     print STDERR "**** Wrong number of arguments\n";
     &printusage();
@@ -131 +134 @@
     }
     }
+
+    # setup_greenstone can take gs2|gs3 and bin|svn. gs2 and svn by default
     
     # run_test action can take a subaction: nosvn|justdiff. It can also take --modelOS (windows|linux|darwin)
@@ -136 +141 @@
     # it out from the svn model-collect again.
     # justdiff: same as nosvn, but doesn't copy over model-collection to collect, and doesn't rebuild either of them. Just does the diff part.
-    if($action eq "run_test" && scalar(@ARGV) >= 2) {
+    if($action eq "setup_greenstone" && scalar(@ARGV) >= 2) {
+                
+        for (my $i=0; $i < scalar(@ARGV); $i++) { 
+            if($ARGV[$i] =~ m@^--@) {                   
+            $subaction = $ARGV[$i];
+            if($subaction =~ m/--gs(2|3)/) {
+                $install_version = $1;
+            } elsif ($subaction =~ m/--(bin|svn)/) {
+                $install_type = $1;
+            } else {
+                print STDERR "**** Bad subaction: ".$ARGV[$i]."\n"; 
+                &printusage; 
+                exit -1;
+            }
+            }
+        }
+        
+        #print STDERR "Install type $install_type\n";
+        #print STDERR "Install version $install_version\n";
+
+    } elsif($action eq "run_test" && scalar(@ARGV) >= 2) {
         push(@collections, @ARGV);
         shift @collections; # remove action from array
@@ -270 +295 @@
     print STDERR "\t--justdiff|--nosvn\n";
     print STDERR "\t<col1 col2 ...>\n";
+    print STDERR "where setup_greenstone can further take the following optional parameters:\n";
+    print STDERR "\t--gs2|--gs3\n";
+    print STDERR "\t--svn|--bin\n";
 }