Changeset 28620 for other-projects

Timestamp:

2013-11-13T16:29:21+13:00 (10 years ago)

Author:

sjm84

Message:

Do over of previous 2 commits: the new commandline arguments are more general.

File:

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

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

@@ -112 +112 @@
 my $action = "all";
 my $subaction = ""; # run_test can take subactions: --just_diff and --no_svn
-my @collections = ();
+my @collections = (); # list of collections that run_test should process
+
+if(scalar(@ARGV) == 0) {
+    $action="all";
+}
+
+# process any arguments that are --gs2|--gs3 and --bin|--svn, and delete them from the array
+# if none provided, it's gs2 and svn by default.
+for (my $i = $#ARGV; $i >= 0; --$i) { 
+    if($ARGV[$i] =~ m/--(bin|svn)/) {
+    $install_type = $1;
+    splice @ARGV, $i, 1; # remove the element from the argument array
+    } elsif($ARGV[$i] =~ m/--gs(2|3)/) {
+    $install_version = $1;
+    splice @ARGV, $i, 1; # remove the element from the argument array
+    }
+}
+
 
 # run_test can take any number of args
-if(scalar(@ARGV) > 1 && $ARGV[0] !~ m/run_test|setup_greenstone/) {
+if(scalar(@ARGV) > 1 && $ARGV[0] ne "run_test") {
     print STDERR "**** Wrong number of arguments\n";
     &printusage();
@@ -121 +138 @@
 }
 
-if(scalar(@ARGV) == 0) {
-    $action="all";
-}
-else {    
+if(scalar(@ARGV) > 0) {    
     switch ($ARGV[0]) {
     case qr/^(-h|--?help|help)$/i { &printusage; exit 0; }
@@ -135 +149 @@
     }
 
-    # 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)
     # nosvn: uses the model-collect as static and copies it over to collect, rebuilding what's currently in model-collect instead of copying 
     # 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 "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) {
+
+    if($action eq "run_test" && scalar(@ARGV) >= 2) {
         push(@collections, @ARGV);
         shift @collections; # remove action from array
@@ -197 +190 @@
 }
 
+#print STDERR "Install type $install_type\n";
+#print STDERR "Install version $install_version\n";
+
 
 #check key environment vars are set